Changeset 669 for trunk/gsdl/src/recpt/documentaction.cpp

Timestamp:

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

Author:

sjboddie

Message:

finished changes to browsing support

File:

• trunk/gsdl/src/recpt/documentaction.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,