Changeset 438 for trunk/gsdl/src/recpt

Timestamp:

1999-08-09T16:25:19+12:00 (25 years ago)

Author:

sjboddie

Message:

moved OID translation stuff from documentaction::define_external_macros
to receptionist

Location:

trunk/gsdl/src/recpt

Files:

• documentaction.cpp (modified) (5 diffs)
• documentaction.h (modified) (2 diffs)
• receptionist.cpp (modified) (3 diffs)
• receptionist.h (modified) (1 diff)

trunk/gsdl/src/recpt/documentaction.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.18  1999/08/09 04:25:18  sjboddie
+   moved OID translation stuff from documentaction::define_external_macros
+   to receptionist
+
    Revision 1.17  1999/08/09 02:13:53  sjboddie
    fixed small bug in ShowSectionTitles
@@ -230 +234 @@
 // define all the macros which might be used by other actions
 // to produce pages. 
-void documentaction::define_external_macros (const ColInfoResponse_t &collectinfo, displayclass &disp, 
+void documentaction::define_external_macros (const ColInfoResponse_t &/*collectinfo*/, displayclass &disp, 
                          cgiargsclass &args, recptproto *collectproto, 
                          ostream &logout) {
@@ -248 +252 @@
   // _javaimagesnavbar_  this is the javascript code to shove in to make the 
   //                     flashy images used by _navigationbar_ work
-
-  // _cgiargd_           these are overridden if they use the tricky ".xx" syntax
-  // _cgiargcl_
   
+
   // can't do anything if collectproto is null (i.e. no collection was specified)
   if (collectproto == NULL) return;
@@ -259 +261 @@
   InfoFiltersResponse_t filterinfo;
   FilterResponse_t response;
-  FilterRequest_t request;
   text_tarray metadata;
   text_t navigationbar, javaimagesnavbar, width, topparent;
@@ -267 +268 @@
   text_t &arg_cl = args["cl"];
   text_t &collection = args["c"];
-
-  // if the "gp" (go to page) argument is set we need to set 
-  // the "d" argument to the corresponding page
-  if ((!arg_d.empty()) && (!args["gp"].empty()) &&
-      (is_number (args["gp"]))) {
-    text_t top;
-    get_top (arg_d, top);
-    metadata.push_back ("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();
-    while (dochere != docend) {
-      if ((*dochere).metadata[0].values[0] == args["gp"]) {
-    arg_d = (*dochere).OID;
-    disp.setmacro ("cgiargd", "Global", arg_d);
-    break;
-      }
-      dochere ++;
-    }
-    metadata.erase (metadata.begin(), metadata.end());
-  }
-
-  bool ShowTopPages = true;
-  text_tmap::const_iterator it = collectinfo.format.find("ShowTopPages");
-  if ((it != collectinfo.format.end()) && ((*it).second == "false")) ShowTopPages = false;
-
-  // do a call to translate OIDs if required
-  request.filterName = "NullFilter";
-  request.filterResultOptions = FROID;
-  if ((!arg_d.empty()) && (needs_translating (arg_d) || !ShowTopPages)) {
-    request.docSet.insert (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 (!ShowTopPages && is_top (arg_d)) arg_d += ".fc";
-    
-    request.clear();
-    disp.setmacro ("cgiargd", "Global", arg_d);
-  }
-  // we'll also check here that the "cl" argument has a "classify" doctype 
-  // (in case ".fc" or ".lc" have screwed up)
-  if (needs_translating (arg_cl)) {
-    request.fields.push_back("doctype");
-    request.docSet.insert (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")
-      strip_suffix (arg_cl);
-    else
-      arg_cl = response.docInfo[0].OID;
-    disp.setmacro ("cgiargcl", "Global", arg_cl);
-  }
 
   // don't want navigation bar if page is 'detached'

trunk/gsdl/src/recpt/documentaction.h

@@ -16 +16 @@
 #include "action.h"
 #include "gsdlconf.h"
+#include "formattools.h"
 
 class documentaction : public action {
@@ -28 +29 @@
   void highlighttext(text_t &text, TermInfo_tarray &terms, displayclass &disp,
              outconvertclass &outconvert, ostream &textout, ostream &logout);
+
+  formatinfo_t formatinfo;
+  
 
 public:

trunk/gsdl/src/recpt/receptionist.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.21  1999/08/09 04:25:17  sjboddie
+   moved OID translation stuff from documentaction::define_external_macros
+   to receptionist
+
    Revision 1.20  1999/07/30 02:13:09  sjboddie
    -added collectinfo argument to some functions
@@ -503 +507 @@
   // decide on the protocol used for communicating with
   // the collection server
+  text_t &collection = args["c"];
   recptproto *collectproto = NULL;
-  if (!args["c"].empty()) {
-    collectproto = protocols.getrecptproto (args["c"], logout);
-  }
+  if (!collection.empty()) {
+    collectproto = protocols.getrecptproto (collection, logout);
+  }
+
+  // translate "d" and "cl" arguments if required
+  translate_OIDs (args, collectproto, logout);
 
   // produce the page using the desired action
@@ -647 +655 @@
 
   return true;
+}
+
+// translate_OIDs translates the "d" and "cl" arguments to their correct values
+// 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) {
+
+  FilterResponse_t response;
+  FilterRequest_t request;
+  comerror_t err;
+  text_t &arg_d = args["d"];
+  text_t &arg_cl = args["cl"];
+  text_t &collection = args["c"];
+  text_t &arg_gp = args["gp"];
+
+  bool ShowTopPages = true;
+  text_tmap::const_iterator it = collectinfo.format.find("ShowTopPages");
+  if ((it != collectinfo.format.end()) && ((*it).second == "false")) ShowTopPages = false;
+  
+  // do a call to translate OIDs if required
+  request.filterName = "NullFilter";
+  request.filterResultOptions = FROID;
+  if ((!arg_d.empty()) && (needs_translating (arg_d) || !ShowTopPages)) {
+    request.docSet.insert (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 (!ShowTopPages && is_top (arg_d)) arg_d += ".fc";
+    
+    request.clear();
+  }
+  // we'll also check here that the "cl" argument has a "classify" doctype 
+  // (in case ".fc" or ".lc" have screwed up)
+  if (needs_translating (arg_cl)) {
+    request.fields.push_back("doctype");
+    request.docSet.insert (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")
+      strip_suffix (arg_cl);
+    else
+      arg_cl = response.docInfo[0].OID;
+  }
+
+  // if the "gp" (go to page) argument is set we need to set 
+  // the "d" argument to the corresponding page
+  if ((!arg_d.empty()) && (!arg_gp.empty()) && (is_number (arg_gp))) {
+    text_t top;
+    get_top (arg_d, top);
+    text_tarray metadata;
+    metadata.push_back ("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();
+    while (dochere != docend) {
+      if ((*dochere).metadata[0].values[0] == arg_gp) {
+    arg_d = (*dochere).OID;
+    break;
+      }
+      dochere ++;
+    }
+  }
 }
 

trunk/gsdl/src/recpt/receptionist.h

@@ -54 +54 @@
   virtual void prepare_page (action *a, cgiargsclass &args, recptproto *collectproto,
                  outconvertclass &outconvert, ostream &logout);
+  
+  virtual void translate_OIDs (cgiargsclass &args, recptproto *collectproto, ostream &logout);
+
   virtual void define_general_macros (cgiargsclass &args, outconvertclass &outconvert,
                       ostream &logout);