Changeset 649 for trunk/gsdl/src/recpt/pageaction.cpp

Timestamp:

1999-10-10T21:14:12+13:00 (25 years ago)

Author:

sjboddie

Message:

• metadata now returns mp rather than array
• redesigned browsing support (although it's not finished so

won't currently work ;-)

File:

• trunk/gsdl/src/recpt/pageaction.cpp (modified) (9 diffs)

trunk/gsdl/src/recpt/pageaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.16  1999/10/10 08:14:09  sjboddie
+   - metadata now returns mp rather than array
+   - redesigned browsing support (although it's not finished so
+   won't currently work ;-)
+
    Revision 1.15  1999/09/17 04:46:05  sjboddie
    fixed a couple of problems with 'unknown' classifier
@@ -121 +126 @@
 }
 
-
-bool pageaction::init (ostream &logout) {
-
-  // classify_meta should contain names of all classifiers supported
-  // by this receptionist. classifications using metadata names not
-  // in this list will be displayed as "unknown"
-  classify_meta.insert ("Title");
-  classify_meta.insert ("List");
-  classify_meta.insert ("Creator");
-  classify_meta.insert ("Series");
-  classify_meta.insert ("Date");
-  classify_meta.insert ("Subject");
-  classify_meta.insert ("Organization");
-  classify_meta.insert ("Howto");
-  classify_meta.insert ("Topic");
-  classify_meta.insert ("Browse");
-  classify_meta.insert ("People");
-
-  return action::init (logout);
-}
-
-
 bool pageaction::check_cgiargs (cgiargsinfoclass &/*argsinfo*/, cgiargsclass &/*args*/, 
                 ostream &/*logout*/) {
@@ -154 +137 @@
   response_data = "text/html";
 }
-
-
-// define all the macros which might be used by other actions
-// to produce pages. 
-void pageaction::define_external_macros (const ColInfoResponse_t &/*collectinfo*/, displayclass &/*disp*/, 
-                     cgiargsclass &/*args*/, recptproto * /*collectproto*/, 
-                     ostream &/*logout*/) {
-}
-
 
 void pageaction::define_internal_macros (const ColInfoResponse_t &collectinfo, displayclass &disp, 
@@ -203 +177 @@
     }
 
-    unsigned long current_time = time(NULL);
-    text_t homeextra;
+    text_t homeextra = "<center><table width=_pagewidth_><tr valign=top>\n";
 
     recptprotolistclass *rprotolist = recpt->get_recptprotolist_ptr ();
@@ -213 +186 @@
     while (rprotolist_here != rprotolist_end) {
       if ((*rprotolist_here).p != NULL) {
+
     text_tarray collist;
     comerror_t err;
@@ -220 +194 @@
       text_tarray::iterator collist_end = collist.end();
 
-      homeextra += "<dl>\n";
-
-      FilterResponse_t response;
-      text_tarray metadata;
-      metadata.push_back ("collectionname");
-
+      int row1 = 6;
+      int row2 = 4;
+      int count = 1;
       while (collist_here != collist_end) {
-        text_t collectionname = *collist_here;
-        if (get_info ("collection", *collist_here, metadata, false, (*rprotolist_here).p, response, logout))
-          collectionname = response.docInfo[0].metadata[0].values[0];
-        
+
         ColInfoResponse_t cinfo;
         (*rprotolist_here).p->get_collectinfo (*collist_here, cinfo, err, logout);
         if (err == noError) {
-          text_t link = "<a href=\"_gwcgi_?a=p&p=about&c=" + *collist_here + "\">";
-          if (!cinfo.receptionist.empty()) 
-        link = "<a href=\"" + cinfo.receptionist + "?a=p&p=about&c=" + *collist_here + "\">";
-          
-          homeextra += "<dt>" + link + collectionname + "</a></dt>\n";
-          homeextra += "<dd>";
-          if (cinfo.numDocs != 0) homeextra += text_t(cinfo.numDocs) + "_documents_";
-          if (cinfo.numWords != 0) homeextra += text_t(cinfo.numWords) + "_words_";
-          unsigned long last_update = (current_time - cinfo.buildDate) / 86400;
-          homeextra += "_lastupdate_ " + text_t(last_update) + " _ago_</dd>\n";
+          if (cinfo.isPublic) {
+
+        FilterResponse_t response;
+        text_tset metadata;
+        metadata.insert ("collectionname");
+        metadata.insert ("iconcollection");
+        metadata.insert ("iconcollectionsmall");
+        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];
+          
+          if (!response.docInfo[0].metadata["iconcollectionsmall"].values[0].empty())
+            collectionname = "<img width=150 src=\""
+              + response.docInfo[0].metadata["iconcollectionsmall"].values[0]
+              + "\" alt=\"" + alt + "\">";
+          else if (!response.docInfo[0].metadata["iconcollection"].values[0].empty())
+            collectionname = "<img width=150 src=\""
+              + response.docInfo[0].metadata["iconcollection"].values[0]
+              + "\" alt=\"" + alt + "\">";
+          else collectionname = alt;
+        }
+        
+        if ((count == 1) || (count == (row1+1)) || (count == ((row1+row2)+1))) 
+          homeextra += "<td align=center>";
+        else homeextra += "<p>";
+        text_t link = "<a href=\"_gwcgi_?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 + "\">";
+
+        if (!cinfo.receptionist.empty()) 
+          link = "<a href=\"" + cinfo.receptionist + "?a=p&p=about&c=" 
+            + *collist_here + "\">";
+        
+        homeextra += link + collectionname + "</a>\n";
+        
+        if ((count == row1) || (count == (row1+row2))) 
+          homeextra += "</td>";
+        
+        count ++;
+          }
         }
+
         collist_here ++;
       }
-      homeextra += "</dl>\n";
+      homeextra += "</tr></table></center>\n";
       disp.setmacro ("homeextra", "home", homeextra); 
     }
@@ -265 +267 @@
 
     FilterResponse_t response;
-    text_tarray metadata;
-    metadata.push_back ("Title");
+    text_tset metadata;
+    metadata.insert ("Title");
     bool getParents = false;
     get_children ("", args["c"], metadata, getParents, collectproto, response, logout);
@@ -272 +274 @@
     disp.setmacro ("numbrowseoptions", "help", response.docInfo.size()+1);
 
-    ResultDocInfo_tarray::const_iterator here = response.docInfo.begin();
-    ResultDocInfo_tarray::const_iterator end = response.docInfo.end();
+    ResultDocInfo_tarray::iterator here = response.docInfo.begin();
+    ResultDocInfo_tarray::iterator end = response.docInfo.end();
 
     // we're assuming that we've always got a search button
@@ -280 +282 @@
 
     while (here != end) {
-      text_t title = (*here).metadata[0].values[0];
-
-      text_tset::const_iterator it = classify_meta.find (title);
-      if (it == classify_meta.end()) title = "Unknown";
-
-      shorttext += "<li>_text" + title + "short_\n";
-      longtext += "_text" + title + "long_";
+      text_t title = (*here).metadata["Title"].values[0];
+
+      text_t stext, ltext;
+      disp.expandstring ("document", "_text" + title + "short_", stext);
+      if (stext == ("_text" + title + "short_")) {
+    stext = "<li>_textdefaultshorttext_";
+    ltext = "_textdefaultlongtext_";
+      } else {
+    shorttext += "<li>" + stext;
+    longtext += "_text" + title + "long_";
+      }
       here ++;
     }