Changeset 1877

Show
Ignore:
Timestamp:
30.01.2001 17:49:32 (19 years ago)
Author:
sjboddie
Message:

fixed a couple of minor bugs that were introduced with the corba stuff

Location:
trunk/gsdl/src/recpt
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • trunk/gsdl/src/recpt/pageaction.cpp

    r1870 r1877  
    120120        iconurl.clear(); 
    121121 
    122         if (!response.docInfo[0].metadata["iconcollectionsmall"].values[0].empty()) 
    123           collectionname = "<img width=150 border=1 src=\"" 
    124             + response.docInfo[0].metadata["iconcollectionsmall"].values[0] 
    125             + "\" alt=\"" + alt + "\">"; 
    126         else if (!response.docInfo[0].metadata["iconcollection"].values[0].empty()) 
    127           { 
    128             iconurl = response.docInfo[0].metadata["iconcollection"].values[0]; 
    129           } 
     122        if (!response.docInfo[0].metadata["iconcollectionsmall"].values[0].empty()) { 
     123          iconurl = response.docInfo[0].metadata["iconcollectionsmall"].values[0]; 
     124        } else if (!response.docInfo[0].metadata["iconcollection"].values[0].empty()) { 
     125          iconurl = response.docInfo[0].metadata["iconcollection"].values[0]; 
     126        } 
    130127 
    131128        if (!iconurl.empty()) 
     
    165162 
    166163          text_t link = "<a href=\"_gwcgi_?"+optsite+"a=p&p=about&c=" + *collist_here + "\">"; 
    167           if (*collist_here == "chinese") 
    168         link = "<a href=\"_gwcgi_?"+optsite+"a=p&p=about&l=zh&nw=u&c=" + *collist_here + "\">"; 
    169           if (*collist_here == "arabic") 
    170         link = "<a href=\"_gwcgi_?"+optsite+"a=p&p=about&w=a&c=" + *collist_here + "\">"; 
    171164 
    172165          if (!cinfo->receptionist.empty())  
     
    182175    } 
    183176 
    184     // disp.setmacro ("homeextra", "home", homeextra);  
    185177    for (; count%3 != 0; count ++) homeextra += "<td></td>\n"; 
    186178      } 
  • trunk/gsdl/src/recpt/receptionist.cpp

    r1870 r1877  
    11521152    if (collectproto != NULL) { 
    11531153      collectproto->get_collectinfo (collection, cinfo, err, logout); 
    1154       text_t httpcollection  
    1155     = "http://" + cinfo.httpdomain + cinfo.httpprefix  
    1156         +"/collect/" + collection;  
    1157        
     1154      text_t httpcollection; 
     1155      if (!cinfo.httpdomain.empty()) httpcollection = "http://"; 
     1156      httpcollection += cinfo.httpdomain + cinfo.httpprefix + "/collect/" + collection;  
    11581157      disp.setmacro ("httpcollection", "Global", httpcollection);  
    11591158    } 
     
    12351234      if (!iconcollection.empty()) 
    12361235    { 
    1237       if (iconcollection[0]=='/') 
     1236      ColInfoResponse_t cinfo; 
     1237      comerror_t err; 
     1238      collectproto->get_collectinfo (collection, cinfo, err, logout); 
     1239      if (iconcollection[0]=='/' && !cinfo.httpdomain.empty()) 
    12381240        { 
    12391241          // local but with full path 
    1240           ColInfoResponse_t cinfo; 
    1241           comerror_t err; 
    1242           collectproto->get_collectinfo (collection, cinfo, err, logout); 
    12431242          iconcollection = "http://" + cinfo.httpdomain + iconcollection; 
    1244           disp.setmacro("iconcollection","Global",iconcollection); 
     1243          disp.setmacro("iconcollection", "Global", iconcollection); 
    12451244        } 
    12461245    }