Changeset 9931

Timestamp:

2005-05-23T16:36:40+12:00 (19 years ago)

Author:

kjdon

Message:

getting collectionmeta from teh colinforesponse now, not using a get_info via the protocol. this means that collmeta will be read from the config file not from the database - it will not require rebuilding for changes to take effect.

Location:

trunk/gsdl/src/recpt

Files:

• collectoraction.cpp (modified) (1 diff)
• extlinkaction.cpp (modified) (1 diff)
• extlinkaction.h (modified) (3 diffs)
• librarymain.cpp (modified) (1 diff)
• pageaction.cpp (modified) (9 diffs)
• pageaction.h (modified) (2 diffs)
• queryaction.cpp (modified) (1 diff)
• receptionist.cpp (modified) (3 diffs)
• statusaction.cpp (modified) (4 diffs)

trunk/gsdl/src/recpt/collectoraction.cpp

@@ -797 +797 @@
     text_tarray::iterator collist_here = collist.begin();
     text_tarray::iterator collist_end = collist.end();
-    FilterResponse_t response;
-    text_tset metadata;
-    metadata.insert ("collectionname");
     while (collist_here != collist_end) {
       ColInfoResponse_t *cinfo = recpt->get_collectinfo_ptr ((*rprotolist_here).p, *collist_here, logout);
       if (cinfo != NULL) {
-        text_t collectionname = *collist_here;
-        if (!cinfo->collectionmeta["collectionname"].empty()) {
-          // get collection name from the collection cfg file
-          collectionname = cinfo->collectionmeta["collectionname"];
-        } else if (get_info ("collection", *collist_here, args["l"], metadata, false, 
-                 (*rprotolist_here).p, response, logout)) {
-          // get collection name from gdbm file
-          collectionname = response.docInfo[0].metadata["collectionname"].values[0];
+        text_t collectionname = cinfo->get_collectionmeta("collectionname", args["l"]);
+        if (collectionname.empty()) {
+          collectionname = *collist_here;
         }
         dirnames.push_back(*collist_here);

trunk/gsdl/src/recpt/extlinkaction.cpp

@@ -217 +217 @@
     
     recptproto *collectproto = protos->getrecptproto (*col_here, logout);
-    
     if (get_info (args["href"], *col_here, args["l"], metadata, false, collectproto, response, logout)) {
       if (!response.docInfo[0].metadata["section"].values[0].empty()) {
-        text_t collectionname = *col_here;
-        metadata.erase (metadata.begin(), metadata.end());
-        metadata.insert ("collectionname");
-        FilterResponse_t nresponse;
-        if (get_info ("collection", *col_here, args["l"], metadata, false, collectproto, nresponse, logout)) {
-          if (!nresponse.docInfo[0].metadata["collectionname"].values[0].empty())
-        collectionname = nresponse.docInfo[0].metadata["collectionname"].values[0];
+        ColInfoResponse_t *cinfo = recpt->get_collectinfo_ptr (collectproto, *col_here, logout);
+        text_t collectionname = cinfo->get_collectionmeta("collectionname", args["l"]); //
+        if (collectionname.empty()) {
+          collectionname = *col_here;
         }
         textout << outconvert << disp << ("_extlink:header_\n")

trunk/gsdl/src/recpt/extlinkaction.h

@@ -31 +31 @@
 
 #include "action.h"
+#include "receptionist.h"
 
 class extlinkaction : public action {
@@ -38 +39 @@
   extlinkaction ();
   virtual ~extlinkaction ();
+
+  void set_receptionist (receptionist *therecpt) {recpt=therecpt;}
 
   text_t get_action_name () {return "extlink";}
@@ -55 +58 @@
 
 protected:
+  
+  receptionist *recpt;
+  
   bool get_link (cgiargsclass &args, recptprotolistclass *protos,
          text_t &link, ostream &logout);

trunk/gsdl/src/recpt/librarymain.cpp

@@ -182 +182 @@
 
 #ifdef GSDL_USE_EXTLINK_ACTION
-  recpt.add_action (new extlinkaction());
+  extlinkaction *aextlinkaction = new extlinkaction();
+  aextlinkaction->set_receptionist(&recpt);
+  recpt.add_action (aextlinkaction);
 #endif
         

trunk/gsdl/src/recpt/pageaction.cpp

@@ -219 +219 @@
         coll_type += "0";
           }
-
-          FilterResponse_t response;
-          text_tset metadata;
-          metadata.insert ("collectionname");
-          text_t lang = args["l"];
-          if (!lang.empty()) {
-        metadata.insert ("collectionname:"+lang);
-          }
-          text_t collectionname = *collist_here;
-          
-          if (get_info ("collection", *collist_here, "", metadata, false, 
-                (*rprotolist_here).p, response, logout)) {
-        if (!lang.empty() && !response.docInfo[0].metadata["collectionname:"+lang].values[0].empty()) {
-          collectionname = response.docInfo[0].metadata["collectionname:"+lang].values[0]; 
-        } else if (!response.docInfo[0].metadata["collectionname"].values[0].empty()) {
-          collectionname = response.docInfo[0].metadata["collectionname"].values[0];
-        }
+          text_t collectionname = cinfo->get_collectionmeta("collectionname", args["l"]);
+          if (collectionname.empty()) {
+        collectionname = *collist_here;
           }
           
@@ -351 +337 @@
 
           found_valid_col = true;
-          FilterResponse_t response;
-          text_tset metadata;
-          metadata.insert ("collectionname");
-          metadata.insert ("iconcollection");
-          metadata.insert ("iconcollectionsmall");
-          // also look for lang specific values
-          text_t lang = args["l"];
-          if (!lang.empty()) {
-        metadata.insert ("collectionname:"+lang);
-        metadata.insert ("iconcollection:"+lang);
-        metadata.insert ("iconcollectionsmall:"+lang);
+          text_t collectionname = *collist_here;
+          text_t alt = cinfo->get_collectionmeta("collectionname", args["l"]);
+          if (alt.empty()) {
+        alt = collectionname;
           }
-          text_t collectionname = *collist_here;
-          text_t alt = collectionname;
-
-          if (get_info ("collection", *collist_here, "", metadata, false, 
-                (*rprotolist_here).p, response, logout)) {
-        // get the "collectionname"
-        if (!lang.empty() && !response.docInfo[0].metadata["collectionname:"+lang].values[0].empty()) {
-          alt = response.docInfo[0].metadata["collectionname:"+lang].values[0]; 
-        } else if (!response.docInfo[0].metadata["collectionname"].values[0].empty()) {
-          alt = response.docInfo[0].metadata["collectionname"].values[0];
+          
+          // url to image: try iconcollectionsmall, then iconcollection
+          text_t iconurl = cinfo->get_collectionmeta("iconcollectionsmall", args["l"]);
+          if (iconurl.empty()) {
+        iconurl = cinfo->get_collectionmeta("iconcollection", args["l"]);
+          }
+          
+          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;
         }
         
-        text_t iconurl;
-        iconurl.clear();
-
-        if (!lang.empty() &&!response.docInfo[0].metadata["iconcollectionsmall:"+lang].values[0].empty()) {
-         iconurl = response.docInfo[0].metadata["iconcollectionsmall:"+lang].values[0]; 
-        } else if (!response.docInfo[0].metadata["iconcollectionsmall"].values[0].empty()) {
-          iconurl = response.docInfo[0].metadata["iconcollectionsmall"].values[0];
-        } else if (!lang.empty() && !response.docInfo[0].metadata["iconcollection:"+lang].values[0].empty()) {
-          iconurl = response.docInfo[0].metadata["iconcollection:"+lang].values[0];
-        } else if (!response.docInfo[0].metadata["iconcollection"].values[0].empty()) {
-          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;
-          }
-
+        collectionname 
+          = "<img width=150 border=1 src=\"" + iconurl + "\" alt=\"" + alt + "\">";
+          } else {
+        collectionname = alt;
           }
+          
           if ((count%configinfo.HomePageCols == 0) && (!first))
         homeextra += "</tr><tr valign=top>\n";
@@ -426 +384 @@
           text_t link = "<a href=\"_gwcgi_?"+optsite+"a=p&p=about&c=" + *collist_here + coll_type;
           link += "&l=" + args["l"] + "&w=" + args["w"] + "\">";
-
+          
           if (!cinfo->receptionist.empty()) 
         link = "<a href=\"" + cinfo->receptionist + "\">";
@@ -453 +411 @@
 }
 
-void pageaction::set_collectionlist_macro (displayclass &disp, recptprotolistclass *protos, 
+void pageaction::set_collectionlist_macro (displayclass &disp, 
+                       recptprotolistclass *protos, 
+                       cgiargsclass &args, 
                        ostream &logout) {
 
@@ -522 +482 @@
         coll_type += "0";
           }
-          FilterResponse_t response;
-          text_tset metadata;
-          metadata.insert ("collectionname");
-          text_t collectionname = *collist_here;
-
-          if (get_info ("collection", *collist_here, "", metadata, false, 
-                (*rprotolist_here).p, response, logout)) {
-        if (!response.docInfo[0].metadata["collectionname"].values[0].empty()) {
-          collectionname = response.docInfo[0].metadata["collectionname"].values[0];
-        }
+          text_t collectionname = cinfo->get_collectionmeta("collectionname", args["l"]);
+          if (collectionname.empty()) {
+        collectionname = *collist_here;
           }
           
@@ -836 +789 @@
     }
   }
-
+  
+  
   if (arg_p == "home" || arg_p == "homehelp") {
     if (status_disabled) disp.setmacro ("textgoadmin", "home", "");
@@ -845 +799 @@
       homepagestyle (disp, protos, args, logout);
     } else if (arg_p == "homehelp") {
-      set_collectionlist_macro (disp, protos, logout);
+      set_collectionlist_macro (disp, protos, args, logout);
     }
 
@@ -878 +832 @@
     text_t colname;
     if (*col_here == arg_c) {
-        colname = cinfo->collectionmeta["collectionname"];
+        colname = cinfo->get_collectionmeta("collectionname", args["l"]);
     } else {
       ColInfoResponse_t *this_cinfo = recpt->get_collectinfo_ptr (collectproto, *col_here, logout);
       if (this_cinfo == NULL) {++col_here; continue;}
-      colname = this_cinfo->collectionmeta["collectionname"];
+      colname = this_cinfo->get_collectionmeta("collectionname", args["l"]);
     }
-
+    if (colname.empty()) {
+      colname = *col_here;
+    }
     ++count;
     collectionoption += "<input type=checkbox name=\"cc\" value=\"" + 
@@ -1003 +959 @@
       if (*here == arg_c) {
         if (!first) textsubcollections += "<br>";
-        textsubcollections += "\n" + cinfo->collectionmeta["collectionname"] + "\n";
+        textsubcollections += "\n" + cinfo->get_collectionmeta("collectionname", args["l"]) + "\n";
       } else {
         ColInfoResponse_t *this_cinfo = recpt->get_collectinfo_ptr (collectproto, *here, logout);
         if (this_cinfo == NULL) {++here; continue;}
         if (!first) textsubcollections += "<br>";
-        textsubcollections += "\n" + this_cinfo->collectionmeta["collectionname"] + "\n";
+        textsubcollections += "\n" + this_cinfo->get_collectionmeta("collectionname", args["l"]) + "\n";
       }
       ++count;

trunk/gsdl/src/recpt/pageaction.h

@@ -48 +48 @@
 
   text_t get_action_name () {return "p";}
-
+  
   bool check_cgiargs (cgiargsinfoclass &argsinfo, cgiargsclass &args, 
               recptprotolistclass *protos, ostream &logout);
@@ -80 +80 @@
   
   void set_collectionlist_macro (displayclass &disp, recptprotolistclass *protos, 
-                 ostream &logout);
+                 cgiargsclass &args, ostream &logout);
 
   void set_documentation_macro (displayclass &disp);

trunk/gsdl/src/recpt/queryaction.cpp

@@ -975 +975 @@
           text_tset::const_iterator t = collections.find (*collist_here);
           if (t != collections.end()) textout << outconvert << " checked";
-
-          textout << outconvert 
-              << " name=cc value=\"" << *collist_here << "\">";
           
-          if (!cinfo->collectionmeta["collectionname"].empty())
-        textout << outconvert << disp << cinfo->collectionmeta["collectionname"];
-          else 
-        textout << outconvert << *collist_here;
-          
-          textout << outconvert << "<br>\n";
+          text_t collectionname = cinfo->get_collectionmeta("collectionname", args["l"]);
+          if (collectionname.empty()) {
+        collectionname = *collist_here;
+          }
+          textout << outconvert << disp 
+              << " name=cc value=\"" << *collist_here << "\">"
+              << collectionname << "<br>\n";
+
           
         }

trunk/gsdl/src/recpt/receptionist.cpp

@@ -1396 +1396 @@
   disp.setmacro ("httpprefix", displayclass::defaultpackage, configinfo.httpprefix);
 
-  // get relevant info from the collection
-  if (!collection.empty()) {
-    ColInfoResponse_t cinfo;
-    comerror_t err;
-    recptproto *collectproto = protocols.getrecptproto (collection, logout);
-    if (collectproto != NULL) {
-      collectproto->get_collectinfo (collection, cinfo, err, logout);
-      text_t httpcollection;
-      if (!cinfo.httpdomain.empty()) httpcollection = "http://";
-      httpcollection += cinfo.httpdomain + cinfo.httpprefix + "/collect/"
-    + collection; 
-      disp.setmacro ("httpcollection", displayclass::defaultpackage,
-             httpcollection); 
-      // as of gsdl 2.53, collect.cfg can specify macros
-      if (cinfo.collection_macros.size() > 0) {
-    macros_map::const_iterator this_macro=cinfo.collection_macros.begin();
-    macros_map::const_iterator done_macro=cinfo.collection_macros.end();
-    while (this_macro != done_macro) {
-
-      disp.setcollectionmacro("Global",           // package
-                  this_macro->first,          // macro name
-                  this_macro->second.first,   // params
-                  this_macro->second.second); // value
-      ++this_macro;
-    }
-      } // col macros
-    } // collectproto != NULL
-  }
 
   text_t compressedoptions = get_compressed_arg(args, logout);
@@ -1498 +1470 @@
         if (!lang.empty()) {
           if (args["l"]==lang) {
-        disp.setmacro (name, displayclass::defaultpackage, (*here).second.values[0]);
+        disp.setcollectionmacro(displayclass::defaultpackage, name, "", (*here).second.values[0]);
           }
         }
         else { // the default one
-          disp.setmacro ((*here).first, displayclass::defaultpackage, (*here).second.values[0]);
+          disp.setcollectionmacro(displayclass::defaultpackage, (*here).first,  "", (*here).second.values[0]);
         }
       }
@@ -1525 +1497 @@
     }
   }
+
+  if (!collection.empty()) {
+    ColInfoResponse_t cinfo;
+    comerror_t err;
+    recptproto *collectproto = protocols.getrecptproto (collection, logout);
+    if (collectproto != NULL) {
+      collectproto->get_collectinfo (collection, cinfo, err, logout);
+      text_t httpcollection;
+      if (!cinfo.httpdomain.empty()) httpcollection = "http://";
+      httpcollection += cinfo.httpdomain + cinfo.httpprefix + "/collect/"
+    + collection; 
+      disp.setmacro ("httpcollection", displayclass::defaultpackage,
+             httpcollection); 
+      // as of gsdl 2.53, collect.cfg can specify macros
+      if (cinfo.collection_macros.size() > 0) {
+    macros_map::const_iterator this_macro=cinfo.collection_macros.begin();
+    macros_map::const_iterator done_macro=cinfo.collection_macros.end();
+    while (this_macro != done_macro) {
+
+      disp.setcollectionmacro("Global",           // package
+                  this_macro->first,          // macro name
+                  this_macro->second.first,   // params
+                  this_macro->second.second); // value
+      ++this_macro;
+    }
+      } // col macros
+    } // collectproto != NULL
+  }
+
 }
 

trunk/gsdl/src/recpt/statusaction.cpp

@@ -52 +52 @@
 }
 
-void statusaction::output_welcome (cgiargsclass &/*args*/, recptprotolistclass *protos, 
+void statusaction::output_welcome (cgiargsclass &args, recptprotolistclass *protos, 
                    displayclass &disp, outconvertclass &outconvert, 
                    ostream &textout, ostream &logout) {
@@ -90 +90 @@
       ColInfoResponse_t *cinfo = recpt->get_collectinfo_ptr ((*rprotolist_here).p, *collist_here, logout);
       if (cinfo != NULL) {
-        text_t collname = *collist_here;
-        text_tmap::iterator it = cinfo->collectionmeta.find("collectionname");
-        if (it != cinfo->collectionmeta.end()) collname = (*it).second;
+        text_t collname = cinfo->get_collectionmeta("collectionname", args["l"]);
+        if (collname.empty()) {
+          collname = *collist_here;
+        }
 
         textout << "<td>";
@@ -594 +595 @@
 
       textout << "<tr><th valign=top>collection metadata</th><td><table>\n";
-      text_tmap::iterator meta_here = collectinfo->collectionmeta.begin();
-      text_tmap::iterator meta_end = collectinfo->collectionmeta.end();
+      collectionmeta_map::iterator meta_here = collectinfo->collectionmeta.begin();
+      collectionmeta_map::iterator meta_end = collectinfo->collectionmeta.end();
+      
       while (meta_here != meta_end) {
-    textout << outconvert << "<tr><td>" << (*meta_here).first
-        << "</td><td>" << (*meta_here).second << "</td></tr>\n";
+    textout << outconvert << "<tr><td valign=top>" << (*meta_here).first
+        << "</td><td><table>" ;
+        text_tmap lang_map = (*meta_here).second;
+    text_tmap::iterator lang_here = lang_map.begin();
+    text_tmap::iterator lang_end = lang_map.end();
+    while (lang_here != lang_end) {
+      textout << outconvert << "<tr><td>" << (*lang_here).first
+            << "</td><td>" << (*lang_here).second << "</td></tr>\n";
+      
+      ++lang_here;
+    }
+    textout << outconvert << "</table></td></tr>\n";
     ++meta_here;
       }
@@ -607 +619 @@
       text_tmap::iterator format_end = collectinfo->format.end();
       while (format_here != format_end) {
-    textout << outconvert << "<tr><td>" << (*format_here).first
+    textout << outconvert << "<tr><td valign=top>" << (*format_here).first
         << "</td><td>" << html_safe((*format_here).second) << "</td></tr>\n";
     ++format_here;