Changeset 649 for trunk/gsdl/src/recpt/receptionist.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/receptionist.cpp (modified) (12 diffs)

trunk/gsdl/src/recpt/receptionist.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.33  1999/10/10 08:14:10  sjboddie
+   - metadata now returns mp rather than array
+   - redesigned browsing support (although it's not finished so
+   won't currently work ;-)
+
    Revision 1.32  1999/09/21 11:28:45  sjboddie
    tidied up file locking
@@ -290 +295 @@
   // add the cgi arguments from this action
   argsinfo.addarginfo (NULL, theaction->getargsinfo());
+}
+
+
+void receptionist::add_browser (browserclass *thebrowser) {
+  // make sure we have a browser to add
+  if (thebrowser == NULL) return;
+
+  // add this browser to the list of browsers
+  browsers.addbrowser(thebrowser);
+}
+
+
+void receptionist::setdefaultbrowser (const text_t &browsername) {
+  browsers.setdefaultbrowser (browsername);
 }
 
@@ -378 +397 @@
     }
   }
-
   
   // configure the actions
@@ -403 +421 @@
     protohere++;
   }
-}
+
+  // configure the browsers
+  browserptrmap::iterator browserhere = browsers.begin ();
+  browserptrmap::iterator browserend = browsers.end ();
+
+  while (browserhere != browserend) {
+    assert ((*browserhere).second.b != NULL);
+    if ((*browserhere).second.b != NULL) 
+      (*browserhere).second.b->configure(key, cfgline);
+    
+    browserhere++;
+  }
+}
+
 
 void receptionist::configure (const text_t &key, const text_t &value) {
@@ -450 +481 @@
   }
 
+  // there must be at least one browser defined
+  if (browsers.empty()) {
+    logout << "Error: no browsers have been added to the receptionist\n";
+    return false;
+  }
+
   // create a saveconf string if there isn't one already
   if (configinfo.saveconf.empty())
@@ -502 +539 @@
     !(*protohere).p->init(logout)) return false;
     protohere++;
+  }
+
+  // init the browsers
+  browserptrmap::iterator browserhere = browsers.begin ();
+  browserptrmap::iterator browserend = browsers.end ();
+  while (browserhere != browserend) {
+    if (((*browserhere).second.b == NULL) || 
+    !(*browserhere).second.b->init(logout)) return false;
+    browserhere++;
   }
 
@@ -800 +846 @@
   }
 
+  // get browsers to process OID
+  text_t OID = args["d"];
+  if (OID.empty()) OID = args["cl"];
+  text_tset metadata;
+  FilterResponse_t response;
+  metadata.insert ("classifytype");
+  if (get_info (OID + ".pr", args["c"], metadata, false, collectproto, response, logout)) {
+    browserclass *b = 
+      browsers.getbrowser (response.docInfo[0].metadata["classifytype"].values[0]);
+    b->processOID (args);
+  }
+
   // translate "d", "cl", and "hp" arguments if required
   translate_OIDs (args, collectproto, logout);
@@ -947 +1005 @@
 // if they use the tricky ".fc", ".lc" type syntax. also sorts out the "d" argument
 // if the goto page ("gp") argument was used
-void receptionist::translate_OIDs (cgiargsclass &args, recptproto *collectproto, ostream &logout) {
+void receptionist::translate_OIDs (cgiargsclass &args, recptproto *collectproto, 
+                   ostream &logout) {
 
   FilterResponse_t response;
@@ -957 +1016 @@
   text_t &collection = args["c"];
   text_t &arg_gp = args["gp"];
-
-  bool DocumentTopPages = true;
-  text_tmap::const_iterator it = collectinfo.format.find("DocumentTopPages");
-  if ((it != collectinfo.format.end()) && ((*it).second == "false")) DocumentTopPages = false;
   
   // do a call to translate OIDs if required
   request.filterName = "NullFilter";
   request.filterResultOptions = FROID;
-  if ((!arg_d.empty()) && (needs_translating (arg_d) || !DocumentTopPages)) {
+  if (!arg_d.empty() && needs_translating (arg_d)) {
     request.docSet.push_back (arg_d);
-    request.fields.push_back ("classifytype");
-    request.filterResultOptions = FRmetadata;
-    request.getParents = true;
     collectproto->filter (collection, request, response, err, logout);
     arg_d = response.docInfo[0].OID;
-    
-    text_t &classifytype = response.docInfo[0].metadata[0].values[0];
-    if (classifytype.empty() || classifytype == "Book")
-      if (!DocumentTopPages && is_top (arg_d)) arg_d += ".fc";
-    
     request.clear();
   }
@@ -982 +1029 @@
   // (in case ".fc" or ".lc" have screwed up)
   if (needs_translating (arg_cl)) {
-    request.fields.push_back("doctype");
+    request.fields.insert ("doctype");
     request.docSet.push_back (arg_cl);
     request.filterResultOptions = FRmetadata;
     collectproto->filter (collection, request, response, err, logout);
     // set to original value (without .xx stuff) if doctype isn't "classify"
-    if (response.docInfo[0].metadata[0].values[0] != "classify")
+    if (response.docInfo[0].metadata["doctype"].values[0] != "classify")
       strip_suffix (arg_cl);
     else
@@ -1004 +1051 @@
     text_t top;
     get_top (arg_d, top);
-    text_tarray metadata;
-    metadata.push_back ("Title");
+    text_tset metadata;
+    metadata.insert ("Title");
     bool getParents = false;
     get_children (top, collection, metadata, getParents, collectproto, response, logout);
-    ResultDocInfo_tarray::const_iterator dochere = response.docInfo.begin();
-    ResultDocInfo_tarray::const_iterator docend = response.docInfo.end();
+    ResultDocInfo_tarray::iterator dochere = response.docInfo.begin();
+    ResultDocInfo_tarray::iterator docend = response.docInfo.end();
     while (dochere != docend) {
-      if ((*dochere).metadata[0].values[0] == arg_gp) {
+      if ((*dochere).metadata["Title"].values[0] == arg_gp) {
     arg_d = (*dochere).OID;
     break;
@@ -1099 +1146 @@
   if ((!collection.empty()) && (collectproto != NULL)) {
     FilterResponse_t response;
-    text_tarray metadata;
-    //    metadata.push_back (".collectionimage");
-    
+    text_tset metadata;
     get_info ("collection", collection, metadata, false, 
           collectproto, response, logout);
 
     if (!response.docInfo[0].metadata.empty()) {
-      MetadataInfo_tarray::const_iterator here = response.docInfo[0].metadata.begin();
-      MetadataInfo_tarray::const_iterator end = response.docInfo[0].metadata.end();
+      MetadataInfo_tmap::const_iterator here = response.docInfo[0].metadata.begin();
+      MetadataInfo_tmap::const_iterator end = response.docInfo[0].metadata.end();
       while (here != end) {
-    if (((*here).name != "haschildren") && ((*here).name != "hasnext") &&
-        ((*here).name != "hasprevious")) {
-      disp.setmacro ((*here).name, "Global", (*here).values[0]);
+    if (((*here).first != "haschildren") && ((*here).first != "hasnext") &&
+        ((*here).first != "hasprevious")) {
+      disp.setmacro ((*here).first, "Global", (*here).second.values[0]);
     }
     here ++;