Changeset 522 for branches


Ignore:
Timestamp:
04/10/14 17:06:27 (5 years ago)
Author:
jls17
Message:
  • replaced most of the inter-page-links with the new URLLink class (links are easier to create and read in the source code)
Location:
branches/work_311
Files:
16 edited

Legend:

Unmodified
Added
Removed
  • branches/work_311/ARInside.cpp

    r515 r522  
    5353#include "output/IFileStructure.h" 
    5454#include "output/FileNaming.h" 
     55#include "output/URLLink.h" 
    5556 
    5657#include "scan/ScanMain.h" 
     
    10931094        } 
    10941095 
    1095         return CWebUtil::Link(CAREnum::SchemaType(schemaType), CPageParams(page), "", rootLevel); 
     1096        return URLLink(CAREnum::SchemaType(schemaType), page, rootLevel); 
    10961097} 
    10971098 
     
    11011102        CARSchema schema(schemaInsideId); 
    11021103        CPageParams file(PAGE_SCHEMA_INDEXES, &schema); 
    1103         return CWebUtil::Link(indexName, file, "", fromRootLevel); 
     1104        return URLLink(indexName, file, fromRootLevel); 
    11041105} 
    11051106 
     
    11441145 
    11451146        if (user.Exists()) 
    1146                 return CWebUtil::Link(loginName, CPageParams(PAGE_DETAILS, &user), "", rootLevel); 
     1147                return URLLink(loginName, CPageParams(PAGE_DETAILS, &user), rootLevel); 
    11471148 
    11481149        return loginName; 
     
    12741275        if(strcmp(srvName.c_str(), "")==0) 
    12751276        { 
    1276                 return CWebUtil::Link(appConfig.serverName, CPageParams(PAGE_SERVER_INFO), "", rootLevel); 
     1277                return URLLink(appConfig.serverName, PAGE_SERVER_INFO, rootLevel); 
    12771278        } 
    12781279        else if(strcmp(srvName.c_str(), AR_CURRENT_SERVER_TAG)==0 || strcmp(srvName.c_str(), AR_CURRENT_SCREEN_TAG)==0) 
    12791280        { 
    1280                 return CWebUtil::Link(appConfig.serverName, CPageParams(PAGE_SERVER_INFO), "", rootLevel); 
     1281                return URLLink(appConfig.serverName, PAGE_SERVER_INFO, rootLevel); 
    12811282        } 
    12821283        else 
    12831284        { 
    1284                 return CWebUtil::Link(srvName, CPageParams(PAGE_SERVER_INFO), "", rootLevel); 
     1285                return URLLink(srvName, PAGE_SERVER_INFO, rootLevel); 
    12851286        } 
    12861287 
  • branches/work_311/doc/DocAlActionStruct.cpp

    r515 r522  
    2020#include "DocActionOpenWindowHelper.h" 
    2121#include "../output/ImageTag.h" 
     22#include "../output/URLLink.h" 
    2223 
    2324CDocAlActionStruct::CDocAlActionStruct(CARInside &arIn, CARActiveLink &obj, string schemaName, int rootLevel) 
     
    5859 
    5960                        CPageParams file(PAGE_ACTION_OBJLIST, AR_STRUCT_ITEM_XML_ACTIVE_LINK, action.action); 
    60                         row.AddCell(CTableCell(CWebUtil::Link(CAREnum::ActiveLinkAction(action.action), file, "", rootLevel)));                  
     61                        row.AddCell(CTableCell(URLLink(CAREnum::ActiveLinkAction(action.action), file, rootLevel)));                     
    6162 
    6263                        stringstream actionDesc; 
  • branches/work_311/doc/DocFieldDetails.cpp

    r516 r522  
    2222#include "../core/ARQualification.h" 
    2323#include "../output/ImageTag.h" 
     24#include "../output/URLLink.h" 
    2425#include "../output/WorkflowReferenceTable.h" 
    2526#include "../util/RefItem.h" 
     
    5758                if (overlayHelper.IsOriginal() || overlayHelper.IsCustom()) 
    5859                        contHeadStrm << CAREnum::GetOverlayTypeString(schemaOverlayType); 
    59                 contHeadStrm << MenuSeparator << CAREnum::DataType(this->field.GetDataType()) << " " << CWebUtil::Link("Field",  CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_FIELD, &field), "", rootLevel) << endl; 
     60                contHeadStrm << MenuSeparator << CAREnum::DataType(this->field.GetDataType()) << " " << URLLink("Field",  CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_FIELD, &field), rootLevel) << endl; 
    6061                contHeadStrm << MenuSeparator << CWebUtil::ObjName(this->field.GetName()) << endl; 
    6162                contHeadStrm << " (Id: " << this->field.GetFieldId() << ")" << CAREnum::GetOverlayTypeString(overlayType) << endl; 
     
    844845                        stringstream viewTmpDesc; 
    845846                        viewTmpDesc.str(""); 
    846                         viewTmpDesc << "Display Properties in " << CWebUtil::Link("Schema",CPageParams(PAGE_DETAILS, &schema), "", rootLevel) << ", View: " << endl; 
     847                        viewTmpDesc << "Display Properties in " << URLLink("Schema", CPageParams(PAGE_DETAILS, &schema), rootLevel) << ", View: " << endl; 
    847848                        viewTmpDesc << this->schema.LinkToVui(dispList.dInstanceList[i].vui, rootLevel); 
    848849                        viewTmpDesc << " (Id: " << dispList.dInstanceList[i].vui << ", Label: " << this->schema.VuiGetLabel(dispList.dInstanceList[i].vui) << ")" << endl; 
  • branches/work_311/doc/DocFilterActionStruct.cpp

    r515 r522  
    1919#include "DocAllMatchingIdsTable.h" 
    2020#include "../output/ImageTag.h" 
     21#include "../output/URLLink.h" 
    2122 
    2223CDocFilterActionStruct::CDocFilterActionStruct(CARInside &arIn, CARServerObject &obj, string schemaName, int rootLevel, int structItemType) 
     
    5960                        { 
    6061                                CPageParams file(PAGE_ACTION_OBJLIST, AR_STRUCT_ITEM_XML_FILTER, action.action); 
    61                                 tmpActionType = CWebUtil::Link(CAREnum::FilterAction(action.action), file, "", rootLevel); 
     62                                tmpActionType = URLLink(CAREnum::FilterAction(action.action), file, rootLevel); 
    6263                        } 
    6364                        CTableCell cellActionType(tmpActionType.c_str(), "");                    
  • branches/work_311/doc/DocGroupDetails.cpp

    r516 r522  
    1818#include "DocGroupDetails.h" 
    1919#include "../output/ImageTag.h" 
     20#include "../output/URLLink.h" 
    2021 
    2122CDocGroupDetails::CDocGroupDetails(CARGroup &arGroup) 
     
    143144                strmTmp.str("No Form Access"); 
    144145        else 
    145                 strmTmp << CWebUtil::Link("Form Access", CPageParams(PAGE_GROUP_SCHEMA_LIST, &group), "", rootLevel) << " (" << nResult << ")<br/>"; 
     146                strmTmp << URLLink("Form Access", CPageParams(PAGE_GROUP_SCHEMA_LIST, &group), rootLevel) << " (" << nResult << ")<br/>"; 
    146147 
    147148        CTableRow row("");               
     
    156157                strmTmp.str("No Field Permission"); 
    157158        else 
    158                 strmTmp << CWebUtil::Link("Field Permission", CPageParams(PAGE_GROUP_FIELD_LIST, &group), "", rootLevel) << " (" << nResult << ")<br/>"; 
     159                strmTmp << URLLink("Field Permission", CPageParams(PAGE_GROUP_FIELD_LIST, &group), rootLevel) << " (" << nResult << ")<br/>"; 
    159160 
    160161        row.ClearCells(); 
     
    169170                strmTmp.str("No Active Link Permission"); 
    170171        else 
    171                 strmTmp << CWebUtil::Link("Active Link Permission", CPageParams(PAGE_GROUP_ACTIVELINK_LIST, &group), "", rootLevel) << " (" << nResult << ")<br/>"; 
     172                strmTmp << URLLink("Active Link Permission", CPageParams(PAGE_GROUP_ACTIVELINK_LIST, &group), rootLevel) << " (" << nResult << ")<br/>"; 
    172173 
    173174        row.ClearCells(); 
     
    182183                strmTmp.str("No Group Members"); 
    183184        else 
    184                 strmTmp << CWebUtil::Link("Group Members", CPageParams(PAGE_GROUP_USER_LIST, &group), "", rootLevel) << " (" << nResult << ")<br/>"; 
     185                strmTmp << URLLink("Group Members", CPageParams(PAGE_GROUP_USER_LIST, &group), rootLevel) << " (" << nResult << ")<br/>"; 
    185186 
    186187        row.ClearCells(); 
     
    195196                strmTmp.str("No Packing List Permission"); 
    196197        else 
    197                 strmTmp << CWebUtil::Link("Packing List Permission", CPageParams(PAGE_GROUP_CONTAINER_LIST, ARCON_PACK, &group), "", rootLevel) << " (" << nResult << ")<br/>"; 
     198                strmTmp << URLLink("Packing List Permission", CPageParams(PAGE_GROUP_CONTAINER_LIST, ARCON_PACK, &group), rootLevel) << " (" << nResult << ")<br/>"; 
    198199 
    199200        row.ClearCells(); 
     
    208209                strmTmp.str("No Active Link Guide Permission"); 
    209210        else 
    210                 strmTmp << CWebUtil::Link("Active Link Guide Permission", CPageParams(PAGE_GROUP_CONTAINER_LIST, ARCON_GUIDE, &group), "", rootLevel) << " (" << nResult << ")<br/>"; 
     211                strmTmp << URLLink("Active Link Guide Permission", CPageParams(PAGE_GROUP_CONTAINER_LIST, ARCON_GUIDE, &group), rootLevel) << " (" << nResult << ")<br/>"; 
    211212 
    212213        row.ClearCells(); 
     
    221222                strmTmp.str("No Webservice Permission"); 
    222223        else 
    223                 strmTmp << CWebUtil::Link("Webservice Permission", CPageParams(PAGE_GROUP_CONTAINER_LIST, ARCON_WEBSERVICE, &group), "", rootLevel) << " (" << nResult << ")<br/>"; 
     224                strmTmp << URLLink("Webservice Permission", CPageParams(PAGE_GROUP_CONTAINER_LIST, ARCON_WEBSERVICE, &group), rootLevel) << " (" << nResult << ")<br/>"; 
    224225 
    225226        row.ClearCells(); 
     
    244245                stringstream contHeadStrm; 
    245246                contHeadStrm << CWebUtil::LinkToUserIndex(rootLevel); 
    246                 contHeadStrm << MenuSeparator << CWebUtil::Link(group.GetName(), CPageParams(PAGE_DETAILS, &this->group), "", rootLevel); 
     247                contHeadStrm << MenuSeparator << URLLink(group.GetName(), CPageParams(PAGE_DETAILS, &this->group), rootLevel); 
    247248                contHeadStrm << MenuSeparator << CWebUtil::ObjName(title) << endl; 
    248249                webPage.AddContentHead(contHeadStrm.str()); 
     
    266267                        { 
    267268                                CTableRow row(""); 
    268                                 row.AddCell(CTableCell(CWebUtil::Link(user.GetName(), CPageParams(PAGE_DETAILS, &user),"", rootLevel))); 
     269                                row.AddCell(CTableCell(URLLink(user.GetName(), CPageParams(PAGE_DETAILS, &user), rootLevel))); 
    269270                                row.AddCell(CTableCell(CUtil::DateTimeToHTMLString(user.GetTimestamp()))); 
    270271                                row.AddCell(CTableCell(this->pInside->LinkToUser(user.GetLastChanged(), rootLevel))); 
     
    299300                stringstream contHeadStrm; 
    300301                contHeadStrm << CWebUtil::LinkToGroupIndex(rootLevel); 
    301                 contHeadStrm << MenuSeparator << CWebUtil::Link(group.GetName(), CPageParams(PAGE_DETAILS, &group), "", rootLevel); 
     302                contHeadStrm << MenuSeparator << URLLink(group.GetName(), CPageParams(PAGE_DETAILS, &group), rootLevel); 
    302303                contHeadStrm << MenuSeparator << CWebUtil::ObjName(title) << endl; 
    303304                webPage.AddContentHead(contHeadStrm.str()); 
     
    401402                stringstream contHeadStrm; 
    402403                contHeadStrm << CWebUtil::LinkToGroupIndex(rootLevel); 
    403                 contHeadStrm << MenuSeparator << CWebUtil::Link(group.GetName(), CPageParams(PAGE_DETAILS, &group), "", rootLevel); 
     404                contHeadStrm << MenuSeparator << URLLink(group.GetName(), CPageParams(PAGE_DETAILS, &group), rootLevel); 
    404405                contHeadStrm << MenuSeparator << CWebUtil::ObjName(title) << endl; 
    405406                webPage.AddContentHead(contHeadStrm.str()); 
     
    454455                stringstream contHeadStrm; 
    455456                contHeadStrm << CWebUtil::LinkToGroupIndex(rootLevel); 
    456                 contHeadStrm << MenuSeparator << CWebUtil::Link(group.GetName(), CPageParams(PAGE_DETAILS, &group), "", rootLevel); 
     457                contHeadStrm << MenuSeparator << URLLink(group.GetName(), CPageParams(PAGE_DETAILS, &group), rootLevel); 
    457458                contHeadStrm << MenuSeparator << CWebUtil::ObjName(title) << endl; 
    458459                webPage.AddContentHead(contHeadStrm.str()); 
     
    562563                stringstream contHeadStrm; 
    563564                contHeadStrm << CWebUtil::LinkToGroupIndex(rootLevel); 
    564                 contHeadStrm << MenuSeparator << CWebUtil::Link(group.GetName(), CPageParams(PAGE_DETAILS, &group), "", rootLevel); 
     565                contHeadStrm << MenuSeparator << URLLink(group.GetName(), CPageParams(PAGE_DETAILS, &group), rootLevel); 
    565566                contHeadStrm << MenuSeparator << CWebUtil::ObjName("Field Permissions") << endl; 
    566567                webPage.AddContentHead(contHeadStrm.str()); 
  • branches/work_311/doc/DocMain.cpp

    r517 r522  
    2020#include "../output/ImageTag.h" 
    2121#include "../output/LetterFilterControl.h" 
     22#include "../output/URLLink.h" 
    2223#include "../core/ARServerInfo.h" 
    2324 
     
    106107                                { 
    107108                                        strm << "<td>"; 
    108                                         strm << CWebUtil::Link( std::string(1, strValue.at(i)), linkTo , "", curPage->GetRootLevel()); 
     109                                        strm << URLLink( std::string(1, strValue.at(i)), linkTo , curPage->GetRootLevel()); 
    109110                                } 
    110111                                else 
     
    314315 
    315316                stringstream strmTmp; 
    316                 strmTmp << ImageTag(ImageTag::ActiveLink, rootLevel) << CWebUtil::Link("Active Links", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_ACTIVE_LINK), "", rootLevel) << " with a specified action in If/Else list:"; 
     317                strmTmp << URLLink("Active Links", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_ACTIVE_LINK), ImageTag::ActiveLink, rootLevel) << " with a specified action in If/Else list:"; 
    317318 
    318319                tbl.description = strmTmp.str(); 
     
    547548 
    548549                stringstream strmTmp; 
    549                 strmTmp << ImageTag(ImageTag::Filter, rootLevel) << CWebUtil::Link("Filter", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_FILTER), "", rootLevel) << " with a specified action in If/Else list:"; 
     550                strmTmp << URLLink("Filter", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_FILTER), ImageTag::Filter, rootLevel) << " with a specified action in If/Else list:"; 
    550551 
    551552                tbl.description = strmTmp.str(); 
     
    825826 
    826827                stringstream strmTmp; 
    827                 strmTmp << ImageTag(ImageTag::Escalation, rootLevel) << CWebUtil::Link("Escalation", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_ESCALATION), "", rootLevel) << " with a specified action in If/Else list:"; 
     828                strmTmp << URLLink("Escalation", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_ESCALATION), ImageTag::Escalation, rootLevel) << " with a specified action in If/Else list:"; 
    828829 
    829830                tbl.description = strmTmp.str(); 
  • branches/work_311/doc/DocRoleDetails.cpp

    r516 r522  
    1818#include "DocRoleDetails.h" 
    1919#include "../output/ImageTag.h" 
     20#include "../output/URLLink.h" 
    2021 
    2122CDocRoleDetails::CDocRoleDetails(CARRole &arRole) 
     
    9899                strmTmp.str("No Form Access"); 
    99100        else 
    100                 strmTmp << CWebUtil::Link("Form Access", CPageParams(PAGE_ROLE_SCHEMA_LIST, pRole), "", rootLevel) << " (" << nResult << ")<br/>"; 
     101                strmTmp << URLLink("Form Access", CPageParams(PAGE_ROLE_SCHEMA_LIST, pRole), rootLevel) << " (" << nResult << ")<br/>"; 
    101102 
    102103        CTableRow row("");               
     
    112113                strmTmp.str("No Field Permission"); 
    113114        else 
    114                 strmTmp << CWebUtil::Link("Field Permission", CPageParams(PAGE_ROLE_FIELD_LIST, pRole), "", rootLevel) << " (" << nResult << ")<br/>"; 
     115                strmTmp << URLLink("Field Permission", CPageParams(PAGE_ROLE_FIELD_LIST, pRole), rootLevel) << " (" << nResult << ")<br/>"; 
    115116 
    116117        row.ClearCells(); 
     
    126127                strmTmp.str("No Active Link Permission"); 
    127128        else 
    128                 strmTmp << CWebUtil::Link("Active Link Permission", CPageParams(PAGE_ROLE_ACTIVELINK_LIST, pRole), "", rootLevel) << " (" << nResult << ")<br/>"; 
     129                strmTmp << URLLink("Active Link Permission", CPageParams(PAGE_ROLE_ACTIVELINK_LIST, pRole), rootLevel) << " (" << nResult << ")<br/>"; 
    129130 
    130131        row.ClearCells(); 
     
    140141                strmTmp.str("No Packing List Permission"); 
    141142        else 
    142                 strmTmp << CWebUtil::Link("Packing List Permission", CPageParams(PAGE_ROLE_CONTAINER_LIST, ARCON_PACK, pRole), "", rootLevel) << " (" << nResult << ")<br/>"; 
     143                strmTmp << URLLink("Packing List Permission", CPageParams(PAGE_ROLE_CONTAINER_LIST, ARCON_PACK, pRole), rootLevel) << " (" << nResult << ")<br/>"; 
    143144 
    144145        row.ClearCells(); 
     
    154155                strmTmp.str("No Active Link Guide Permission"); 
    155156        else 
    156                 strmTmp << CWebUtil::Link("Active Link Guide Permission", CPageParams(PAGE_ROLE_CONTAINER_LIST, ARCON_GUIDE, pRole), "", rootLevel) << " (" << nResult << ")<br/>"; 
     157                strmTmp << URLLink("Active Link Guide Permission", CPageParams(PAGE_ROLE_CONTAINER_LIST, ARCON_GUIDE, pRole), rootLevel) << " (" << nResult << ")<br/>"; 
    157158 
    158159        row.ClearCells(); 
     
    168169                strmTmp.str("No Webservice Permission"); 
    169170        else 
    170                 strmTmp << CWebUtil::Link("Webservice Permission", CPageParams(PAGE_ROLE_CONTAINER_LIST, ARCON_WEBSERVICE, pRole), "", rootLevel) << " (" << nResult << ")<br/>"; 
     171                strmTmp << URLLink("Webservice Permission", CPageParams(PAGE_ROLE_CONTAINER_LIST, ARCON_WEBSERVICE, pRole), rootLevel) << " (" << nResult << ")<br/>"; 
    171172 
    172173        row.ClearCells(); 
     
    192193                stringstream contHeadStrm; 
    193194                contHeadStrm << CWebUtil::LinkToRoleIndex(rootLevel); 
    194                 contHeadStrm << MenuSeparator << CWebUtil::Link(pRole->GetName(), CPageParams(PAGE_DETAILS, pRole), "", rootLevel); 
     195                contHeadStrm << MenuSeparator << URLLink(pRole->GetName(), CPageParams(PAGE_DETAILS, pRole), rootLevel); 
    195196                contHeadStrm << MenuSeparator << CWebUtil::ObjName(title) << endl; 
    196197                webPage.AddContentHead(contHeadStrm.str()); 
     
    293294                stringstream contHeadStrm; 
    294295                contHeadStrm << CWebUtil::LinkToRoleIndex(rootLevel); 
    295                 contHeadStrm << MenuSeparator << CWebUtil::Link(pRole->GetName(), CPageParams(PAGE_DETAILS, pRole), "", rootLevel); 
     296                contHeadStrm << MenuSeparator << URLLink(pRole->GetName(), CPageParams(PAGE_DETAILS, pRole), rootLevel); 
    296297                contHeadStrm << MenuSeparator << CWebUtil::ObjName(title) << endl; 
    297298                webPage.AddContentHead(contHeadStrm.str()); 
     
    349350                stringstream contHeadStrm; 
    350351                contHeadStrm << CWebUtil::LinkToRoleIndex(rootLevel); 
    351                 contHeadStrm << MenuSeparator << CWebUtil::Link(pRole->GetName(), CPageParams(PAGE_DETAILS, pRole), "", rootLevel); 
     352                contHeadStrm << MenuSeparator << URLLink(pRole->GetName(), CPageParams(PAGE_DETAILS, pRole), rootLevel); 
    352353                contHeadStrm << MenuSeparator << CWebUtil::ObjName(title) << endl; 
    353354                webPage.AddContentHead(contHeadStrm.str()); 
     
    471472                stringstream contHeadStrm; 
    472473                contHeadStrm << CWebUtil::LinkToRoleIndex(rootLevel); 
    473                 contHeadStrm << MenuSeparator << CWebUtil::Link(pRole->GetName(), CPageParams(PAGE_DETAILS, pRole), "", rootLevel); 
     474                contHeadStrm << MenuSeparator << URLLink(pRole->GetName(), CPageParams(PAGE_DETAILS, pRole), rootLevel); 
    474475                contHeadStrm << MenuSeparator << CWebUtil::ObjName("Field Permissions") << endl; 
    475476                webPage.AddContentHead(contHeadStrm.str()); 
  • branches/work_311/doc/DocSchemaDetails.cpp

    r516 r522  
    2121#include "../output/ImageTag.h" 
    2222#include "../output/TabControl.h" 
     23#include "../output/URLLink.h" 
    2324#include "../output/WorkflowReferenceTable.h" 
    2425#include "../core/ARDayStructHelper.h" 
     
    575576        AllFieldsJson(outputStrm); 
    576577        outputStrm << "<div><span class='clearable'><input type=\"text\" class='data_field' id=\"fieldNameFilter\" placeholder=\"search by name or id\"/></span><button id=\"execFieldFilter\">Filter</button></div>" << endl; 
    577         outputStrm << ImageTag(ImageTag::Document, rootLevel) << "<span id='fieldListFilterResultCount'></span>" << tbl.NumRows() << " fields (" << CWebUtil::Link("data", CPageParams(PAGE_SCHEMA_FIELDS_CSV, &this->schema), "", rootLevel) << ")" << endl; 
     578        outputStrm << ImageTag(ImageTag::Document, rootLevel) << "<span id='fieldListFilterResultCount'></span>" << tbl.NumRows() << " fields (" << URLLink("data", CPageParams(PAGE_SCHEMA_FIELDS_CSV, &this->schema), rootLevel) << ")" << endl; 
    578579        outputStrm << "<div id=\"result\"></div>"; 
    579580        return outputStrm.str(); 
  • branches/work_311/doc/DocSummaryInfo.cpp

    r266 r522  
    1717#include "stdafx.h" 
    1818#include "DocSummaryInfo.h" 
     19#include "../output/URLLink.h" 
    1920 
    2021extern int nFilesCreated; 
     
    4950                CTableRow row("cssStdRow"); 
    5051                row.AddCell(CTableCell((int)this->activelinkCount)); 
    51                 row.AddCell(CTableCell(CWebUtil::Link("Active Links", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_ACTIVE_LINK) , "", 0))); 
     52                row.AddCell(CTableCell(URLLink("Active Links", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_ACTIVE_LINK), 0))); 
    5253                tblListObjectInfo.AddRow(row); 
    5354 
     
    5556                row.ClearCells(); 
    5657                row.AddCell(CTableCell((int)this->webserviceCount)); 
    57                 row.AddCell(CTableCell(CWebUtil::Link("Web Services", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_CONTAINER, ARCON_WEBSERVICE), "", 0))); 
     58                row.AddCell(CTableCell(URLLink("Web Services", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_CONTAINER, ARCON_WEBSERVICE), 0))); 
    5859                tblListObjectInfo.AddRow(row); 
    5960 
    6061                row.ClearCells(); 
    6162                row.AddCell(CTableCell((int)this->alguideCount)); 
    62                 row.AddCell(CTableCell(CWebUtil::Link("Active Link Guides", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_CONTAINER, ARCON_GUIDE), "", 0))); 
     63                row.AddCell(CTableCell(URLLink("Active Link Guides", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_CONTAINER, ARCON_GUIDE), 0))); 
    6364                tblListObjectInfo.AddRow(row); 
    6465 
    6566                row.ClearCells(); 
    6667                row.AddCell(CTableCell((int)this->fltguideCount)); 
    67                 row.AddCell(CTableCell(CWebUtil::Link("Filter Guides", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_CONTAINER, ARCON_FILTER_GUIDE), "", 0))); 
     68                row.AddCell(CTableCell(URLLink("Filter Guides", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_CONTAINER, ARCON_FILTER_GUIDE), 0))); 
    6869                tblListObjectInfo.AddRow(row); 
    6970 
    7071                row.ClearCells(); 
    7172                row.AddCell(CTableCell((int)this->packlistCount)); 
    72                 row.AddCell(CTableCell(CWebUtil::Link("Packing Lists", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_CONTAINER, ARCON_PACK), "", 0))); 
     73                row.AddCell(CTableCell(URLLink("Packing Lists", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_CONTAINER, ARCON_PACK), 0))); 
    7374                tblListObjectInfo.AddRow(row); 
    7475 
    7576                row.ClearCells(); 
    7677                row.AddCell(CTableCell((int)this->applicationCount)); 
    77                 row.AddCell(CTableCell(CWebUtil::Link("Applications", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_CONTAINER, ARCON_APP), "", 0))); 
     78                row.AddCell(CTableCell(URLLink("Applications", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_CONTAINER, ARCON_APP), 0))); 
    7879                tblListObjectInfo.AddRow(row); 
    7980 
    8081                row.ClearCells(); 
    8182                row.AddCell(CTableCell((int)this->escalationCount)); 
    82                 row.AddCell(CTableCell(CWebUtil::Link("Escalations", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_ESCALATION), "", 0))); 
     83                row.AddCell(CTableCell(URLLink("Escalations", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_ESCALATION), 0))); 
    8384                tblListObjectInfo.AddRow(row); 
    8485 
    8586                row.ClearCells(); 
    8687                row.AddCell(CTableCell((int)this->filterCount)); 
    87                 row.AddCell(CTableCell(CWebUtil::Link("Filters", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_FILTER), "", 0))); 
     88                row.AddCell(CTableCell(URLLink("Filters", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_FILTER), 0))); 
    8889                tblListObjectInfo.AddRow(row); 
    8990 
    9091                row.ClearCells(); 
    9192                row.AddCell(CTableCell((int)this->pInside->groupList.GetCount())); 
    92                 row.AddCell(CTableCell(CWebUtil::Link("Groups", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_GROUP), "", 0))); 
     93                row.AddCell(CTableCell(URLLink("Groups", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_GROUP), 0))); 
    9394                tblListObjectInfo.AddRow(row); 
    9495 
    9596                row.ClearCells(); 
    9697                row.AddCell(CTableCell((int)this->menuCount)); 
    97                 row.AddCell(CTableCell(CWebUtil::Link("Menus", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_CHAR_MENU), "", 0))); 
     98                row.AddCell(CTableCell(URLLink("Menus", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_CHAR_MENU), 0))); 
    9899                tblListObjectInfo.AddRow(row); 
    99100 
    100101                row.ClearCells(); 
    101102                row.AddCell(CTableCell((int)this->pInside->roleList.GetCount())); 
    102                 row.AddCell(CTableCell(CWebUtil::Link("Roles", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_ROLE), "", 0))); 
     103                row.AddCell(CTableCell(URLLink("Roles", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_ROLE), 0))); 
    103104                tblListObjectInfo.AddRow(row); 
    104105 
    105106                row.ClearCells(); 
    106107                row.AddCell(CTableCell((int)this->schemaCount)); 
    107                 row.AddCell(CTableCell(CWebUtil::Link("Forms", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_SCHEMA), "", 0))); 
     108                row.AddCell(CTableCell(URLLink("Forms", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_SCHEMA), 0))); 
    108109                tblListObjectInfo.AddRow(row); 
    109110 
    110111                row.ClearCells(); 
    111112                row.AddCell(CTableCell((int)this->pInside->userList.GetCount())); 
    112                 row.AddCell(CTableCell(CWebUtil::Link("Users", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_USER), "", 0))); 
     113                row.AddCell(CTableCell(URLLink("Users", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_USER), 0))); 
    113114                tblListObjectInfo.AddRow(row); 
    114115 
     
    118119                        row.ClearCells(); 
    119120                        row.AddCell(CTableCell(this->imageCount)); 
    120                         row.AddCell(CTableCell(CWebUtil::Link("Images", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_IMAGE), "", 0))); 
     121                        row.AddCell(CTableCell(URLLink("Images", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_IMAGE), 0))); 
    121122                        tblListObjectInfo.AddRow(row); 
    122123                } 
  • branches/work_311/doc/DocValidator.cpp

    r495 r522  
    1717#include "stdafx.h" 
    1818#include "DocValidator.h" 
     19#include "../output/URLLink.h" 
    1920#include "../output/WorkflowReferenceTable.h" 
    2021 
     
    101102                        webPage.AddContent("Missing Objects referenced by Workflow:<br/>"); 
    102103                        cout << "Field reference validation" << endl; 
    103                         webPage.AddContent(CWebUtil::Link("Fields", CPageParams(PAGE_VALIDATOR_MISSING_FIELDS), "doc.gif", rootLevel)); 
     104                        webPage.AddContent(URLLink("Fields", PAGE_VALIDATOR_MISSING_FIELDS, ImageTag::Document, rootLevel)); 
    104105                        this->FieldReferenceValidator(); 
    105106                        webPage.AddContent("<br/>"); 
     
    107108                        //Menu reference check 
    108109                        cout << "Menu reference validation" << endl; 
    109                         webPage.AddContent(CWebUtil::Link("Menus", CPageParams(PAGE_VALIDATOR_MISSING_MENUS), "doc.gif", rootLevel)); 
     110                        webPage.AddContent(URLLink("Menus", PAGE_VALIDATOR_MISSING_MENUS, ImageTag::Document, rootLevel)); 
    110111                        this->MenuReferenceValidator(); 
    111112 
     
    114115 
    115116                        cout << "Form access group validation" << endl; 
    116                         webPage.AddContent(CWebUtil::Link("Forms", CPageParams(PAGE_VALIDATOR_FORM_GROUPS), "doc.gif", rootLevel)); 
     117                        webPage.AddContent(URLLink("Forms", PAGE_VALIDATOR_FORM_GROUPS, ImageTag::Document, rootLevel)); 
    117118                        this->FormGroupValidator(); 
    118119 
    119120                        cout << "Field access group validation" << endl; 
    120121                        webPage.AddContent("<br/>"); 
    121                         webPage.AddContent(CWebUtil::Link("Fields", CPageParams(PAGE_VALIDATOR_FIELD_GROUPS), "doc.gif", rootLevel)); 
     122                        webPage.AddContent(URLLink("Fields", PAGE_VALIDATOR_FIELD_GROUPS, ImageTag::Document, rootLevel)); 
    122123                        this->FieldGroupValidator(); 
    123124 
    124125                        cout << "Active Link access group validation" << endl; 
    125126                        webPage.AddContent("<br/>"); 
    126                         webPage.AddContent(CWebUtil::Link("Active Links", CPageParams(PAGE_VALIDATOR_ACTIVELINKS_GROUPS), "doc.gif", rootLevel)); 
     127                        webPage.AddContent(URLLink("Active Links", PAGE_VALIDATOR_ACTIVELINKS_GROUPS, ImageTag::Document, rootLevel)); 
    127128                        this->AlGroupValidator(); 
    128129 
    129130                        cout << "Container access group validation" << endl; 
    130131                        webPage.AddContent("<br/>"); 
    131                         webPage.AddContent(CWebUtil::Link("Container", CPageParams(PAGE_VALIDATOR_CONTAINER_GROUPS), "doc.gif", rootLevel)); 
     132                        webPage.AddContent(URLLink("Container", PAGE_VALIDATOR_CONTAINER_GROUPS, ImageTag::Document, rootLevel)); 
    132133                        this->ContainerGroupValidator(); 
    133134 
     
    158159                        //ContentHead informations 
    159160                        stringstream contHeadStrm; 
    160                         contHeadStrm << CWebUtil::Link("Validation", CPageParams(PAGE_VALIDATOR_MAIN), "", rootLevel) << MenuSeparator; 
     161                        contHeadStrm << URLLink("Validation", PAGE_VALIDATOR_MAIN, rootLevel) << MenuSeparator; 
    161162                        contHeadStrm << "Container with no or unknown group permission:" << endl; 
    162163                        webPage.AddContentHead(contHeadStrm.str()); 
     
    218219                        //ContentHead informations 
    219220                        stringstream contHeadStrm; 
    220                         contHeadStrm << CWebUtil::Link("Validation", CPageParams(PAGE_VALIDATOR_MAIN), "", rootLevel) << MenuSeparator; 
     221                        contHeadStrm << URLLink("Validation", PAGE_VALIDATOR_MAIN, rootLevel) << MenuSeparator; 
    221222                        contHeadStrm << "Active Links with no or unknown group permission:" << endl; 
    222223                        webPage.AddContentHead(contHeadStrm.str()); 
     
    272273                        //ContentHead informations 
    273274                        stringstream contHeadStrm; 
    274                         contHeadStrm << CWebUtil::Link("Validation", CPageParams(PAGE_VALIDATOR_MAIN), "", rootLevel) << MenuSeparator; 
     275                        contHeadStrm << URLLink("Validation", PAGE_VALIDATOR_MAIN, rootLevel) << MenuSeparator; 
    275276                        contHeadStrm << "Fields with no or unknown group permission:" << endl; 
    276277                        webPage.AddContentHead(contHeadStrm.str()); 
     
    322323                        //ContentHead informations 
    323324                        stringstream contHeadStrm; 
    324                         contHeadStrm << CWebUtil::Link("Validation", CPageParams(PAGE_VALIDATOR_MAIN), "", rootLevel) << MenuSeparator; 
     325                        contHeadStrm << URLLink("Validation", PAGE_VALIDATOR_MAIN, rootLevel) << MenuSeparator; 
    325326                        contHeadStrm << "Fields with no or unknown group permission:" << endl; 
    326327                        webPage.AddContentHead(contHeadStrm.str()); 
     
    357358                                        CTableRow row("");               
    358359                                        row.AddCell(nEmptyFields); 
    359                                         row.AddCell(CWebUtil::Link(schema.GetName(), CPageParams(PAGE_VALIDATOR_FIELD_GROUP_DETAILS, &schema), "", rootLevel)); 
     360                                        row.AddCell(URLLink(schema.GetName(), CPageParams(PAGE_VALIDATOR_FIELD_GROUP_DETAILS, &schema), rootLevel)); 
    360361                                        tblObj.AddRow(row);                      
    361362 
     
    391392                        //ContentHead informations 
    392393                        stringstream contHeadStrm; 
    393                         contHeadStrm << CWebUtil::Link("Validation", CPageParams(PAGE_VALIDATOR_MAIN), "", rootLevel) << MenuSeparator; 
     394                        contHeadStrm << URLLink("Validation", PAGE_VALIDATOR_MAIN, rootLevel) << MenuSeparator; 
    394395                        contHeadStrm << "Forms with no or unknown group permission:" << endl; 
    395396                        webPage.AddContentHead(contHeadStrm.str()); 
     
    445446                        //ContentHead informations 
    446447                        stringstream contHeadStrm; 
    447                         contHeadStrm << CWebUtil::Link("Validation", CPageParams(PAGE_VALIDATOR_MAIN), "", rootLevel) << MenuSeparator; 
     448                        contHeadStrm << URLLink("Validation", PAGE_VALIDATOR_MAIN, rootLevel) << MenuSeparator; 
    448449                        contHeadStrm << "List of missing fields that are referenced in ARSystem workflow:" << endl; 
    449450                        webPage.AddContentHead(contHeadStrm.str()); 
     
    558559                        //ContentHead informations 
    559560                        stringstream contHeadStrm; 
    560                         contHeadStrm << CWebUtil::Link("Validation", CPageParams(PAGE_VALIDATOR_MAIN), "", rootLevel) << MenuSeparator; 
     561                        contHeadStrm << URLLink("Validation", PAGE_VALIDATOR_MAIN, rootLevel) << MenuSeparator; 
    561562                        contHeadStrm << "List of missing menus that are referenced in ARSystem workflow:" << endl; 
    562563                        webPage.AddContentHead(contHeadStrm.str()); 
  • branches/work_311/doc/DocVuiDetails.cpp

    r498 r522  
    2020#include "../core/ARImage.h" 
    2121#include "DocOverlayHelper.h" 
     22#include "../output/URLLink.h" 
    2223 
    2324CDocVuiDetails::CDocVuiDetails(unsigned int SchemaInsideId, const CARVui& vuiObj, int rootLevel) 
     
    4950                if (overlayHelper.IsOriginal() || overlayHelper.IsCustom()) 
    5051                        contHeadStrm << CAREnum::GetOverlayTypeString(schema.GetOverlayType()); 
    51                 contHeadStrm << MenuSeparator << CWebUtil::Link("View", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_VUI, &this->schema), "", rootLevel) << endl; 
     52                contHeadStrm << MenuSeparator << URLLink("View", CPageParams(PAGE_OVERVIEW, AR_STRUCT_ITEM_XML_VUI, &this->schema), rootLevel) << endl; 
    5253                contHeadStrm << MenuSeparator << CWebUtil::ObjName(this->vui.GetName()) << endl; 
    5354                contHeadStrm << " (Id: " << this->vui.GetInsideId() << ")" << CAREnum::GetOverlayTypeString(vui.GetOverlayType()) << endl; 
     
    129130 
    130131                stringstream tblDesc; 
    131                 tblDesc << tbl.NumRows() << " fields in view (" << CWebUtil::Link("data", CPageParams(PAGE_SCHEMA_VUIFIELDS_CSV, &this->vui), "", rootLevel) << ")" <<  endl; 
     132                tblDesc << tbl.NumRows() << " fields in view (" << URLLink("data", CPageParams(PAGE_SCHEMA_VUIFIELDS_CSV, &this->vui), rootLevel) << ")" <<  endl; 
    132133                tbl.description = tblDesc.str(); 
    133134        } 
     
    201202 
    202203                csvPage.SaveInFolder(csvFile->GetPath(), tbl.ToCsv()); 
    203  
    204                 //stringstream tblDesc; 
    205                 //tblDesc << tbl.NumRows() << " fields in view (" << CWebUtil::Link("csv", CWebUtil::CsvDocName(fName), "", 0) << ")" <<  endl; 
    206                 //tbl.description = tblDesc.str(); 
    207204        } 
    208205        catch(exception& e) 
  • branches/work_311/output/URLLink.cpp

    r513 r522  
    2525{ 
    2626        // constructors 
    27         URLLink::URLLink(const std::string &caption, const CPageParams &linkToPage, const OUTPUT::ImageTag &image, int rootLevel, bool validate, OUTPUT::URLLink::LinkTargetMode target) 
     27        URLLink::URLLink(const std::string &caption, const CPageParams &linkToPage, const OUTPUT::ImageTag &image, int rootLevel, bool validate, LinkTargetMode target) 
    2828        { 
    2929                Init(caption, linkToPage, image, rootLevel, validate, target); 
    3030        } 
    31  
    32         URLLink::URLLink(const std::string &caption, const CPageParams &linkToPage, const OUTPUT::ImageTag &image, int rootLevel, OUTPUT::URLLink::LinkTargetMode target) 
     31        URLLink::URLLink(const std::string &caption, const CPageParams &linkToPage, const OUTPUT::ImageTag &image, int rootLevel, LinkTargetMode target) 
    3332        { 
    3433                Init(caption, linkToPage, image, rootLevel, true, target); 
     34        } 
     35        URLLink::URLLink(const std::string &caption, const CPageParams &linkToPage, const OUTPUT::ImageTag::ImageEnum imageId, int rootLevel) 
     36        { 
     37                ImageTag image(imageId, rootLevel); 
     38                Init(caption, linkToPage, image, rootLevel, true, TARGET_MODE_SELF); 
     39        } 
     40        URLLink::URLLink(const std::string &caption, const CPageParams &linkToPage, int rootLevel) 
     41        { 
     42                ImageTag image(ImageTag::NoImage, 0); 
     43                Init(caption, linkToPage, image, rootLevel, true, TARGET_MODE_SELF); 
     44        } 
     45        URLLink::URLLink(const std::string &caption, unsigned int page, OUTPUT::ImageTag::ImageEnum imageId, int rootLevel) 
     46        { 
     47                CPageParams linkToPage(page); 
     48                ImageTag image(imageId, rootLevel); 
     49                Init(caption, linkToPage, image, rootLevel, true, TARGET_MODE_SELF); 
     50        } 
     51        URLLink::URLLink(const std::string &caption, unsigned int page, int rootLevel) 
     52        { 
     53                CPageParams linkToPage(page); 
     54                ImageTag image(ImageTag::NoImage, 0); 
     55                Init(caption, linkToPage, image, rootLevel, true, TARGET_MODE_SELF); 
    3556        } 
    3657        URLLink::URLLink(const CARServerObject &workflowObject, int rootLevel, bool showImage) 
     
    86107                return link.ToStream(strm); 
    87108        } 
     109 
     110        URLLink::operator std::string() const 
     111        { 
     112                stringstream strm; 
     113                ToStream(strm); 
     114                return strm.str(); 
     115        } 
     116 
    88117}; // end namespace OUTPUT 
  • branches/work_311/output/URLLink.h

    r508 r522  
    2020class CPageParams; 
    2121 
     22#include "ImageTag.h" 
     23 
    2224namespace OUTPUT 
    2325{ 
    24         class ImageTag; 
    25  
    2626        class URLLink 
    2727        { 
     
    3434                }; 
    3535 
    36                 URLLink(const std::string &caption, const CPageParams &linkToPage, const OUTPUT::ImageTag &image, int rootLevel, bool validate, OUTPUT::URLLink::LinkTargetMode target); 
    37                 URLLink(const std::string &caption, const CPageParams &linkToPage, const OUTPUT::ImageTag &image, int rootLevel, OUTPUT::URLLink::LinkTargetMode target); 
     36                URLLink(const std::string &caption, const CPageParams &linkToPage, const OUTPUT::ImageTag &image, int rootLevel, bool validate = true, LinkTargetMode target = TARGET_MODE_SELF); 
     37                URLLink(const std::string &caption, const CPageParams &linkToPage, const OUTPUT::ImageTag &image, int rootLevel, LinkTargetMode target); 
     38                URLLink(const std::string &caption, const CPageParams &linkToPage, const OUTPUT::ImageTag::ImageEnum imageId, int rootLevel); 
     39                URLLink(const std::string &caption, const CPageParams &linkToPage, int rootLevel); 
     40                URLLink(const std::string &caption, unsigned int page, OUTPUT::ImageTag::ImageEnum imageId, int rootLevel); 
     41                URLLink(const std::string &caption, unsigned int page, int rootLevel); 
    3842                URLLink(const CARServerObject &workflowObject, int rootLevel, bool showImage = true); 
    3943 
    4044                std::ostream& ToStream(std::ostream &strm) const; 
     45                operator std::string () const; 
    4146        private: 
    4247                std::string link; 
  • branches/work_311/output/URLLinkTest.cpp

    r520 r522  
    5656} 
    5757 
     58TEST_F(URLLinkTests, MainLinkWithImageShort) 
     59{ 
     60        stringstream strm; 
     61        strm << URLLink("<Main Page>", PAGE_MAINHOME, ImageTag::Server, rootLevel); 
     62        string result = strm.str(); 
     63 
     64        ASSERT_STREQ("<img src=\"../img/server.gif\" width=\"16\" height=\"16\" alt=\"server.gif\" /><a href=\"../index.htm\">&lt;Main Page&gt;</a>", result.c_str()); 
     65} 
     66 
    5867TEST_F(URLLinkTests, ObjectLinkWithImage) 
    5968{ 
  • branches/work_311/output/WebPage.cpp

    r505 r522  
    1717#include "stdafx.h" 
    1818#include "RootPath.h" 
     19#include "URLLink.h" 
    1920#include "WebPage.h" 
    2021#include "WebUtil.h" 
     
    8586        strm << "<tr>" << endl; 
    8687        strm << "<td>" << CWebUtil::Link("Main", CPageParams(PAGE_MAINHOME), "server.gif", rootLevel) << "</td>" << endl; 
    87         strm << "<td>" << " (Server: " << CWebUtil::Link(appConfig.serverName, CPageParams(PAGE_SERVER_INFO), "", rootLevel) << "</td>" << endl; 
     88        strm << "<td>" << " (Server: " << URLLink(appConfig.serverName, PAGE_SERVER_INFO, rootLevel) << "</td>" << endl; 
    8889        strm << "<td>" << "@" << "</td>" << endl; 
    8990        strm << "<td>" << "<a href=\"" << appConfig.companyUrl << "\" target=\"_blank\">" << appConfig.companyName << "</a>" << ")" << "</td>" << endl; 
  • branches/work_311/util/RefItem.cpp

    r465 r522  
    2929#include "../core/ARCharMenu.h" 
    3030#include "../core/ARImage.h" 
     31#include "../output/URLLink.h" 
    3132 
    3233const char* IfElse(IfElseState state) 
     
    160161        { 
    161162                const ARIndexList& indexList = schema.GetIndexList(); 
    162                 return CWebUtil::Link(indexList.indexList[actionIndex].indexName, CPageParams(PAGE_SCHEMA_INDEXES, &schema), "", rootLevel); 
     163                return URLLink(indexList.indexList[actionIndex].indexName, CPageParams(PAGE_SCHEMA_INDEXES, &schema), rootLevel); 
    163164        } 
    164165        return "Index"; 
     
    171172        if (schema.Exists()) 
    172173        { 
    173                 return CWebUtil::Link(cResultList, CPageParams(PAGE_SCHEMA_RESULTLIST, &schema), "", rootLevel); 
     174                return URLLink(cResultList, CPageParams(PAGE_SCHEMA_RESULTLIST, &schema), rootLevel); 
    174175        } 
    175176        return cResultList; 
     
    182183        if (schema.Exists()) 
    183184        { 
    184                 return CWebUtil::Link(cSortList, CPageParams(PAGE_SCHEMA_SORTLIST, &schema), "", rootLevel); 
     185                return URLLink(cSortList, CPageParams(PAGE_SCHEMA_SORTLIST, &schema), rootLevel); 
    185186        } 
    186187        return cSortList; 
Note: See TracChangeset for help on using the changeset viewer.