Changeset 1877

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

Location:

trunk/gsdl/src/recpt

Files:

• pageaction.cpp (modified) (3 diffs)
• receptionist.cpp (modified) (2 diffs)

trunk/gsdl/src/recpt/pageaction.cpp

@@ -120 +120 @@
         iconurl.clear();
 
-        if (!response.docInfo[0].metadata["iconcollectionsmall"].values[0].empty())
-          collectionname = "<img width=150 border=1 src=\""
-            + response.docInfo[0].metadata["iconcollectionsmall"].values[0]
-            + "\" alt=\"" + alt + "\">";
-        else if (!response.docInfo[0].metadata["iconcollection"].values[0].empty())
-          {
-            iconurl = response.docInfo[0].metadata["iconcollection"].values[0];
-          }
+        if (!response.docInfo[0].metadata["iconcollectionsmall"].values[0].empty()) {
+          iconurl = response.docInfo[0].metadata["iconcollectionsmall"].values[0];
+        } else if (!response.docInfo[0].metadata["iconcollection"].values[0].empty()) {
+          iconurl = response.docInfo[0].metadata["iconcollection"].values[0];
+        }
 
         if (!iconurl.empty())
@@ -165 +162 @@
 
           text_t link = "<a href=\"_gwcgi_?"+optsite+"a=p&p=about&c=" + *collist_here + "\">";
-          if (*collist_here == "chinese")
-        link = "<a href=\"_gwcgi_?"+optsite+"a=p&p=about&l=zh&nw=u&c=" + *collist_here + "\">";
-          if (*collist_here == "arabic")
-        link = "<a href=\"_gwcgi_?"+optsite+"a=p&p=about&w=a&c=" + *collist_here + "\">";
 
           if (!cinfo->receptionist.empty()) 
@@ -182 +175 @@
     }
 
-    // disp.setmacro ("homeextra", "home", homeextra); 
     for (; count%3 != 0; count ++) homeextra += "<td></td>\n";
       }

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);
         }
     }