Changeset 454 for branches


Ignore:
Timestamp:
03/10/14 16:25:53 (6 years ago)
Author:
jls17
Message:
  • where possible removed the objCountPerLetter parameter from all the CDocMain functions
Location:
branches/work_304
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/work_304/ARInside.cpp

    r452 r454  
    700700        docMain->ServerInfoList(); 
    701701 
    702         // container object count per first char 
    703         vector<int> algObjCount; algObjCount.resize(38); 
    704         vector<int> appObjCount; appObjCount.resize(38); 
    705         vector<int> pklObjCount; pklObjCount.resize(38); 
    706         vector<int> ftgObjCount; ftgObjCount.resize(38); 
    707         vector<int> wbsObjCount; wbsObjCount.resize(38); 
    708  
    709702        CDocSummaryInfo indexSummary(*this, "");        // this is the object for the summary start page (it's written at the end of this function) 
    710703 
    711704        //ContainerList 
    712         indexSummary.alguideCount = docMain->ContainerList(ARCON_GUIDE, "ContainerList (ActiveLinkGuide)", "*", algObjCount); 
    713         indexSummary.applicationCount = docMain->ContainerList(ARCON_APP, "ContainerList (Application)", "*", appObjCount); 
    714         indexSummary.packlistCount = docMain->ContainerList(ARCON_PACK, "ContainerList (PackingList)", "*", pklObjCount); 
    715         indexSummary.fltguideCount = docMain->ContainerList(ARCON_FILTER_GUIDE, "ContainerList (FilterGuide)", "*", ftgObjCount); 
    716         indexSummary.webserviceCount = docMain->ContainerList(ARCON_WEBSERVICE, "ContainerList (Webservice)", "*", wbsObjCount); 
     705        indexSummary.alguideCount = docMain->ContainerList(ARCON_GUIDE, "ContainerList (ActiveLinkGuide)", "*"); 
     706        indexSummary.applicationCount = docMain->ContainerList(ARCON_APP, "ContainerList (Application)", "*"); 
     707        indexSummary.packlistCount = docMain->ContainerList(ARCON_PACK, "ContainerList (PackingList)", "*"); 
     708        indexSummary.fltguideCount = docMain->ContainerList(ARCON_FILTER_GUIDE, "ContainerList (FilterGuide)", "*"); 
     709        indexSummary.webserviceCount = docMain->ContainerList(ARCON_WEBSERVICE, "ContainerList (Webservice)", "*"); 
    717710 
    718711        //Application Details 
     
    791784        } 
    792785 
    793         // active link object count per first char 
    794         vector<int> alObjCount; alObjCount.resize(38); 
    795786 
    796787        //ActiveLink List 
    797         indexSummary.activelinkCount = docMain->ActiveLinkList(alObjCount); 
     788        indexSummary.activelinkCount = docMain->ActiveLinkList(); 
    798789        docMain->ActiveLinkActionList(); 
    799790 
     
    809800 
    810801 
    811         // filter object count per first char 
    812         vector<int> fltObjCount; fltObjCount.resize(38); 
    813  
    814802        //Filter List 
    815         indexSummary.filterCount = docMain->FilterList("*", fltObjCount); 
     803        indexSummary.filterCount = docMain->FilterList("*"); 
    816804        docMain->FilterActionList(); 
    817805        docMain->FilterErrorHandlers(); 
     
    828816 
    829817 
    830         // escalation object count per first char 
    831         vector<int> escObjCount; escObjCount.resize(38); 
    832  
    833818        //Escalation List 
    834         indexSummary.escalationCount = docMain->EscalationList("*", escObjCount); 
     819        indexSummary.escalationCount = docMain->EscalationList("*"); 
    835820        docMain->EscalationActionList(); 
    836821 
     
    846831 
    847832 
    848         // char menu object count per first char 
    849         vector<int> mnuObjCount; mnuObjCount.resize(38); 
    850  
    851833        //CharMenus 
    852         indexSummary.menuCount = docMain->CharMenuList("*", mnuObjCount); 
     834        indexSummary.menuCount = docMain->CharMenuList("*"); 
    853835 
    854836        // Char Menu Details 
     
    862844        } 
    863845 
    864         // schema types object first char count 
    865         vector<int> allObjCount; allObjCount.resize(38); 
    866846 
    867847        //Schema List 
    868         indexSummary.schemaCount = docMain->SchemaList(AR_SCHEMA_NONE,    CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_SCHEMA)      , "Formlist (All)"    , "*", allObjCount); 
     848        indexSummary.schemaCount = docMain->SchemaList(AR_SCHEMA_NONE, CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_SCHEMA), "Formlist (All)", "*"); 
    869849 
    870850        //Schema and field Details 
  • branches/work_304/doc/DocMain.cpp

    r453 r454  
    129129} 
    130130 
    131 unsigned int CDocMain::SchemaList(int nType, const CPageParams &file, string title, string searchChar, std::vector<int>& objCountPerLetter) 
     131unsigned int CDocMain::SchemaList(int nType, const CPageParams &file, string title, string searchChar) 
    132132{ 
    133133        unsigned int objCount = 0; 
     
    224224} 
    225225 
    226 unsigned int CDocMain::ActiveLinkList(std::vector<int>& objCountPerLetter) 
     226unsigned int CDocMain::ActiveLinkList() 
    227227{ 
    228228        CPageParams file(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_ACTIVE_LINK); 
     
    241241                { 
    242242                        CARActiveLink actLink(alIdx); 
    243                         bool bInsert = false; 
    244243 
    245244#if AR_CURRENT_API_VERSION >= AR_API_VERSION_764 
     
    462461 
    463462 
    464 unsigned int CDocMain::FilterList(string searchChar, std::vector<int> &objCountPerLetter) 
     463unsigned int CDocMain::FilterList(string searchChar) 
    465464{ 
    466465        CPageParams file((unsigned int)searchChar.at(0), AR_STRUCT_ITEM_XML_FILTER); 
     
    765764} 
    766765 
    767 unsigned int CDocMain::EscalationList(string searchChar, std::vector<int> &objCountPerLetter) 
     766unsigned int CDocMain::EscalationList(string searchChar) 
    768767{ 
    769768        CPageParams file(searchChar.at(0), AR_STRUCT_ITEM_XML_ESCALATION); 
     
    10401039 
    10411040 
    1042 unsigned int CDocMain::CharMenuList(string searchChar, std::vector<int> &objCountPerLetter) 
     1041unsigned int CDocMain::CharMenuList(string searchChar) 
    10431042{ 
    10441043        CPageParams file(searchChar[0], AR_STRUCT_ITEM_XML_CHAR_MENU); 
     
    11811180} 
    11821181 
    1183 unsigned int CDocMain::ContainerList(int nType, string title, string searchChar, std::vector<int>& objCountPerLetter) 
     1182unsigned int CDocMain::ContainerList(int nType, string title, string searchChar) 
    11841183{ 
    11851184        unsigned int page = (unsigned int)searchChar[0]; 
  • branches/work_304/doc/DocMain.h

    r452 r454  
    4242        int Index(); 
    4343        void ServerInfoList(); 
    44         unsigned int SchemaList(int nType, const CPageParams &file, string title, string searchChar, std::vector<int>& objCountPerLetter);       
    45         unsigned int CharMenuList(string searchChar, std::vector<int> &objCountPerLetter); 
    46         unsigned int ContainerList(int nType, string title, string searchChar, std::vector<int>& objCountPerLetter); 
     44        unsigned int SchemaList(int nType, const CPageParams &file, string title, string searchChar);    
     45        unsigned int CharMenuList(string searchChar); 
     46        unsigned int ContainerList(int nType, string title, string searchChar); 
    4747        void GlobalFieldList(); 
    4848        void MessageList(); 
    4949        void NotificationList(); 
    5050 
    51         unsigned int ActiveLinkList(std::vector<int>& objCountPerLetter);        
     51        unsigned int ActiveLinkList();   
    5252        void ActiveLinkActionList(); 
    5353        void ActiveLinkActionDetails(int nActionType, int &ifCount, int &elseCount); 
    54         unsigned int FilterList(string searchChar, std::vector<int> &objCountPerLetter);         
     54        unsigned int FilterList(string searchChar);      
    5555        void FilterActionList(); 
    5656        void FilterActionDetails(int nActionType, int &ifCount, int &elseCount); 
    5757        void FilterErrorHandlers(); 
    58         unsigned int EscalationList(string searchChar, std::vector<int> &objCountPerLetter); 
     58        unsigned int EscalationList(string searchChar); 
    5959        void EscalationActionList(); 
    6060        void EscalationActionDetails(int nActionType, int &ifCount, int &elseCount); 
Note: See TracChangeset for help on using the changeset viewer.