Changeset 1509 for branches/corba/gsdl/src/recpt/pageaction.cpp

Timestamp:

2000-09-07T09:49:07+12:00 (24 years ago)

Author:

davidb

Message:

Improvements to corba implementation so images within a collection
are handled better and images in the remote site but not in the local
site are cached locally.

File:

• branches/corba/gsdl/src/recpt/pageaction.cpp (modified) (5 diffs)

branches/corba/gsdl/src/recpt/pageaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.29.2.1  2000/09/06 21:49:02  davidb
+
+   Improvements to corba implementation so images within a collection
+   are handled better and images in the remote site but not in the local
+   site are cached locally.
+
    Revision 1.29  2000/03/19 21:16:46  nzdl
    added german language interface
@@ -204 +210 @@
     while (collist_here != collist_end) {
       
+      text_t protocol_name = (*rprotolist_here).p->get_protocol_name ();
+
       ColInfoResponse_t cinfo;
       (*rprotolist_here).p->get_collectinfo (*collist_here, cinfo, err, logout);
-      
+
       if (err == noError) {
         if (cinfo.isPublic && (cinfo.buildDate > 0)) {
@@ -217 +225 @@
           text_t collectionname = *collist_here;
           text_t alt = collectionname;
+
           if (get_info ("collection", *collist_here, metadata, false, 
                 (*rprotolist_here).p, response, logout)) {
         if (!response.docInfo[0].metadata["collectionname"].values[0].empty())
           alt = response.docInfo[0].metadata["collectionname"].values[0];
-        
+
+        text_t iconurl;
+        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 + "\">";
+          {
+            iconurl = response.docInfo[0].metadata["iconcollectionsmall"].values[0];
+
+          }
         else if (!response.docInfo[0].metadata["iconcollection"].values[0].empty())
-          collectionname = "<img width=150 border=1 src=\""
-            + response.docInfo[0].metadata["iconcollection"].values[0]
-            + "\" alt=\"" + alt + "\">";
-        else collectionname = alt;
+          {
+            iconurl = response.docInfo[0].metadata["iconcollection"].values[0];
+          }
+
+        if (!iconurl.empty())
+          {
+            // check to see URL is local to colserver
+            text_t::iterator iconurl_head = iconurl.begin();
+            text_t iconhead = substr(iconurl_head,iconurl_head+16);
+            if (iconhead=="_httpcollection_")
+              {
+            // local and using _httpcollection_
+            text_t icontail = substr(iconurl_head+16,iconurl.end());
+            iconurl = "http://" + cinfo.httpdomain 
+              + cinfo.httpprefix + "/collect/" 
+              + *collist_here + "/" + icontail;
+              }
+            else if (iconurl[0]=='/')
+              {
+            // local but with full path
+            iconurl = "http://" + cinfo.httpdomain + iconurl;
+              }
+
+            collectionname 
+              = "<img width=150 border=1 src=\"" + iconurl + "\" alt=\"" + alt + "\">";
+          }
+        else
+          {
+            collectionname = alt;
+          }
+
           }
         
@@ -246 +286 @@
           }
           
-          text_t link = "<a href=\"_gwcgi_?a=p&p=about&c=" + *collist_here + "\">";
+          text_t optsite = "";
+          text_t site_name = (*rprotolist_here).p->get_site_name ();
+          if (!site_name.empty()) { optsite = "site="+site_name+"&"; }
+
+          text_t link = "<a href=\"_gwcgi_?"+optsite+"a=p&p=about&c=" + *collist_here + "\">";
           if (*collist_here == "chinese")
-        link = "<a href=\"_gwcgi_?a=p&p=about&l=zh&nw=u&c=" + *collist_here + "\">";
+        link = "<a href=\"_gwcgi_?"+optsite+"a=p&p=about&l=zh&nw=u&c=" + *collist_here + "\">";
           if (*collist_here == "arabic")
-        link = "<a href=\"_gwcgi_?a=p&p=about&w=a&c=" + *collist_here + "\">";
+        link = "<a href=\"_gwcgi_?"+optsite+"a=p&p=about&w=a&c=" + *collist_here + "\">";
 
           if (!cinfo.receptionist.empty()) 
@@ -266 +310 @@
       collist_here ++;
     }
-    homeextra += "</tr></table></center>\n";
-    disp.setmacro ("homeextra", "home", homeextra); 
-      }
-    }
+      }
+    }
+    homeextra += "</td>";
     rprotolist_here ++;
   }
+  homeextra += "</tr></table></center>\n";
+  disp.setmacro ("homeextra", "home", homeextra); 
+
 }