Changeset 669

Timestamp:

1999-10-15T12:00:53+13:00 (25 years ago)

Author:

sjboddie

Message:

finished changes to browsing support

Location:

trunk/gsdl/src/recpt

Files:

• documentaction.cpp (modified) (5 diffs)
• receptionist.cpp (modified) (5 diffs)

trunk/gsdl/src/recpt/documentaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.27  1999/10/14 23:00:53  sjboddie
+   finished changes to browsing support
+
    Revision 1.26  1999/10/10 08:14:06  sjboddie
    - metadata now returns mp rather than array
@@ -438 +441 @@
     ((*format_here).second == "true"))
       formatinfo.DocumentImages = true;
+    else if (((*format_here).first == "DocumentTitles") && 
+         ((*format_here).second == "false"))
+      formatinfo.DocumentTitles = false;
     else if ((*format_here).first == "DocumentHeading") 
       formatinfo.DocumentHeading = (*format_here).second;
-    else if (((*format_here).first == "DocumentArrowsTop") && 
+    else if (((*format_here).first == "DocumentContents") && 
          ((*format_here).second == "false"))
-      formatinfo.DocumentArrowsTop = false;
+      formatinfo.DocumentContents = false;
     else if (((*format_here).first == "DocumentArrowsBottom") && 
          ((*format_here).second == "false"))
       formatinfo.DocumentArrowsBottom = false;
-    else if (((*format_here).first == "DocumentGoTo") && 
-         ((*format_here).second == "false"))
-      formatinfo.DocumentGoTo = false;
     else if ((*format_here).first == "DocumentButtons")
       splitchar ((*format_here).second.begin(), (*format_here).second.end(),
@@ -461 +464 @@
 
   // never want arrows when text is expanded
-  if (gt) {
+  if (gt)
     formatinfo.DocumentArrowsBottom = false;
-    formatinfo.DocumentArrowsTop = false;
-  }
 }
 
@@ -555 +556 @@
       disp.setmacro ("header", "document", "_textheader_");
 
-      text_t pagetitle = response.docInfo[0].metadata["Title"].values[0];
+      text_tarray pagetitlearray;
+      if (!response.docInfo[0].metadata["Title"].values[0].empty())
+    pagetitlearray.push_back (response.docInfo[0].metadata["Title"].values[0]);
       if (!gt) {
-    MetadataInfo_t *parent = response.docInfo[0].metadata["Title"].parent;
-    while (parent != NULL) {
-      pagetitle += ": " + parent->values[0];
-      parent = parent->parent;
+    MetadataInfo_t *parenttitle = response.docInfo[0].metadata["Title"].parent;
+    while (parenttitle != NULL) {
+      if (!parenttitle->values[0].empty())
+        pagetitlearray.push_back (parenttitle->values[0]);
+      parenttitle = parenttitle->parent;
     }
       }
+      reverse (pagetitlearray.begin(), pagetitlearray.end());
+      text_t pagetitle;
+      joinchar (pagetitlearray, ": ", pagetitle);
       disp.setmacro ("pagetitle", "document", pagetitle);
-      disp.setmacro ("thisOID", "Global", response.docInfo[0].metadata["archivedir"].values[0]);
+
+      if (is_top (arg_d))
+    disp.setmacro ("thisOID", "Global", response.docInfo[0].metadata["archivedir"].values[0]);
+      else {
+    MetadataInfo_t *parentad = response.docInfo[0].metadata["archivedir"].parent;
+    text_t thisOID;
+    while (parentad != NULL) {
+      thisOID = parentad->values[0];
+      parentad = parentad->parent;
+    }
+    disp.setmacro ("thisOID", "Global", thisOID);
+      }
       
       if (args["u"] != "1")
@@ -712 +730 @@
   }
     
-  int metasize = metadata.size();
-
   if (get_info (OID, collection, metadata, getParents, collectproto, inforesponse, logout)) {
     int hastxt = inforesponse.docInfo[0].metadata["hastxt"].values[0].getint();
     int haschildren = inforesponse.docInfo[0].metadata["haschildren"].values[0].getint();
-
+    
     if (arg_gt == 0) {
       output_text (inforesponse.docInfo[0], formatlistptr, queryresponse.termInfo, 

trunk/gsdl/src/recpt/receptionist.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.34  1999/10/14 23:00:52  sjboddie
+   finished changes to browsing support
+
    Revision 1.33  1999/10/10 08:14:10  sjboddie
    - metadata now returns mp rather than array
@@ -830 +833 @@
   outconverter->reset();
 
-  // decide on the protocol used for communicating with
-  // the collection server
   text_t &collection = args["c"];
   recptproto *collectproto = NULL;
   if (!collection.empty()) {
+    // decide on the protocol used for communicating with
+    // the collection server
     collectproto = protocols.getrecptproto (collection, logout);
-  }
-
-  // get collection information 
-  collectinfo.clear();
-  if (!collection.empty()) {
-    comerror_t err;
-    collectproto->get_collectinfo (collection, collectinfo, err, logout);
-    if (err != noError) collectinfo.clear();
-  }
-
-  // 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);
+
+    // get collection information 
+    collectinfo.clear();
+    if (!collection.empty()) {
+      comerror_t err;
+      collectproto->get_collectinfo (collection, collectinfo, err, logout);
+      if (err != noError) collectinfo.clear();
+    }
+
+    // get browsers to process OID
+    text_t OID = args["d"];
+    if (OID.empty()) OID = args["cl"];
+    if (!OID.empty()) {
+      text_tset metadata;
+      text_tarray OIDs;
+      OIDs.push_back (OID);
+      if (!is_top(OID)) OIDs.push_back (OID + ".pr");
+      FilterResponse_t response;
+      metadata.insert ("childtype");
+      if (get_info (OIDs, args["c"], metadata, false, collectproto, response, logout)) {
+    text_t classifytype = response.docInfo[0].metadata["childtype"].values[0];
+    if (classifytype.empty()) 
+      classifytype = response.docInfo[1].metadata["childtype"].values[0];
+    browserclass *b = browsers.getbrowser (classifytype);
+    b->processOID (args, collectproto, logout);
+      }
+    }
+
+    // translate "d", "cl", and "hp" arguments if required
+    translate_OIDs (args, collectproto, logout);
+  }
 
   // produce the page using the desired action
@@ -1003 +1013 @@
 
 // translate_OIDs translates the "d", "cl", and "hp" 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
+// if they use the tricky ".fc", ".lc" type syntax.
 void receptionist::translate_OIDs (cgiargsclass &args, recptproto *collectproto, 
                    ostream &logout) {
@@ -1015 +1024 @@
   text_t &arg_hp = args["hp"];
   text_t &collection = args["c"];
-  text_t &arg_gp = args["gp"];
   
   // do a call to translate OIDs if required
@@ -1044 +1052 @@
     collectproto->filter (collection, request, response, err, logout);
     arg_hp = 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_tset metadata;
-    metadata.insert ("Title");
-    bool getParents = false;
-    get_children (top, collection, metadata, getParents, collectproto, response, logout);
-    ResultDocInfo_tarray::iterator dochere = response.docInfo.begin();
-    ResultDocInfo_tarray::iterator docend = response.docInfo.end();
-    while (dochere != docend) {
-      if ((*dochere).metadata["Title"].values[0] == arg_gp) {
-    arg_d = (*dochere).OID;
-    break;
-      }
-      dochere ++;
-    }
   }
 }