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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • 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    }