Changeset 1877 for trunk/gsdl/src/recpt/receptionist.cpp

Timestamp:

2001-01-30T17:49:32+13:00 (23 years ago)

Author:

sjboddie

Message:

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

File:

• trunk/gsdl/src/recpt/receptionist.cpp (modified) (2 diffs)

trunk/gsdl/src/recpt/receptionist.cpp

@@ -1152 +1152 @@
     if (collectproto != NULL) {
       collectproto->get_collectinfo (collection, cinfo, err, logout);
-      text_t httpcollection 
-    = "http://" + cinfo.httpdomain + cinfo.httpprefix 
-        +"/collect/" + collection; 
-      
+      text_t httpcollection;
+      if (!cinfo.httpdomain.empty()) httpcollection = "http://";
+      httpcollection += cinfo.httpdomain + cinfo.httpprefix + "/collect/" + collection; 
       disp.setmacro ("httpcollection", "Global", httpcollection); 
     }
@@ -1235 +1234 @@
       if (!iconcollection.empty())
     {
-      if (iconcollection[0]=='/')
+      ColInfoResponse_t cinfo;
+      comerror_t err;
+      collectproto->get_collectinfo (collection, cinfo, err, logout);
+      if (iconcollection[0]=='/' && !cinfo.httpdomain.empty())
         {
           // local but with full path
-          ColInfoResponse_t cinfo;
-          comerror_t err;
-          collectproto->get_collectinfo (collection, cinfo, err, logout);
           iconcollection = "http://" + cinfo.httpdomain + iconcollection;
-          disp.setmacro("iconcollection","Global",iconcollection);
+          disp.setmacro("iconcollection", "Global", iconcollection);
         }
     }