Changeset 346

Timestamp:

1999-07-07T17:47:41+12:00 (25 years ago)

Author:

sjboddie

Message:

changed around the way browsetools works

Location:

trunk/gsdl/src/recpt

Files:

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

trunk/gsdl/src/recpt/OIDtools.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.10  1999/07/07 05:47:41  sjboddie
+   changed around the way browsetools works
+
    Revision 1.9  1999/06/16 23:51:53  sjboddie
    added a strip_suffix function
@@ -302 +305 @@
             metadata, collectproto, response, logout);
 }
+
+// is_child_of returns true if OID2 is a child of OID1
+bool is_child_of(const text_t &OID1, const text_t &OID2) {
+
+  text_t parent = get_parent(OID2);
+
+  while (!parent.empty()) {
+    if (parent == OID1) return true;
+    parent = get_parent(parent);
+  }
+  return false;
+}

trunk/gsdl/src/recpt/OIDtools.h

@@ -74 +74 @@
            FilterResponse_t &response, ostream &logout);
 
+// is_child_of returns true if OID2 is a child of OID1
+bool is_child_of(const text_t &OID1, const text_t &OID2);
+
+
 #endif

trunk/gsdl/src/recpt/documentaction.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.11  1999/07/07 05:47:41  sjboddie
+   changed around the way browsetools works
+
    Revision 1.10  1999/06/29 01:46:44  sjboddie
    now sets a _navigationbar_ macro even if there aren't any
@@ -509 +512 @@
           while (sechere != secend) {
         if ((*sechere).metadata[1].values[0] == "classify") {
-          if ((*sechere).OID == arg_cl) {
+          if (((*sechere).OID == arg_cl) || is_child_of((*sechere).OID, arg_cl)) {
             
             // set the _httpprevarrow_, _httpnextarrow_ macros while we're here
@@ -552 +555 @@
     text_tarray metadata;
     FilterResponse_t response;
-    text_t topparent, classifytype, classifytitle;
+    text_t toptitle, toptype, thistype;
     
     text_t &arg_d = args["d"];
@@ -568 +571 @@
     }
     
-    // get the classifytitle and classifytype
-    get_top (OID, topparent);
+    // get the classifytitle and classifytype for both the top level 
+    // and the current level (using getParent=true)
     metadata.push_back ("Title");
     metadata.push_back ("classifytype");
-    if (get_info (topparent, args["c"], metadata, false, collectproto, response, logout)) {
-      classifytitle = response.docInfo[0].metadata[0].values[0];
-      classifytype = response.docInfo[0].metadata[1].values[0];
+    if (get_info (OID, args["c"], metadata, true, collectproto, response, logout)) {
+      toptitle = response.docInfo[0].metadata[0].values[0];
+      toptype = response.docInfo[0].metadata[1].values[0];
+      thistype = response.docInfo[0].metadata[1].values.back();
     }
     
@@ -580 +584 @@
     if (!arg_d.empty()) {
       
-      if (classifytype == "Hierarchy")
-    output_hierarchy_toc (classifytitle, args, collectproto, disp, 
-                  outconvert, textout, logout);
+      if (toptype == "Hierarchy")
+    hierarchy_toc (thistype, toptitle, args, collectproto, 
+               disp, outconvert, textout, logout);
       else
     // Book is the default for a document level toc - AZList, List and 
     // Datelist don't make sense for document level
-    output_book_toc (classifytitle, args, collectproto, disp,
-             outconvert, textout, logout);
+    book_toc (toptitle, args, collectproto, disp,
+          outconvert, textout, logout);
     } else {
     
-      if (classifytype == "Hierarchy")
-    output_hierarchy_toc (classifytitle, args, collectproto, disp, 
-                  outconvert, textout, logout);
-      else if (classifytype == "Datelist")
-    output_datelist_toc (classifytitle, args, collectproto, disp, 
-                 outconvert, textout, logout);
-      else if (classifytype == "List")
-    output_list_toc (classifytitle, args, collectproto, disp, 
-             outconvert, textout, logout);
+      if (toptype == "Hierarchy")
+    hierarchy_toc (thistype, toptitle, args, collectproto, 
+               disp, outconvert, textout, logout);
+      else if (toptype == "Datelist")
+    datelist_toc (thistype, toptitle, args, collectproto, 
+              disp, outconvert, textout, logout);
+      else if (toptype == "AZList")
+    azlist_toc (thistype, toptitle, args, collectproto, 
+            disp, outconvert, textout, logout);
       else 
-    // AZList is the default for a classification level toc - Book doesn't make 
+    // List is the default for a classification level toc - Book doesn't make 
     // sense for classification level
-    output_azlist_toc (classifytitle, args, collectproto, disp, 
-               outconvert, textout, logout);
+    list_toc (thistype, toptitle, args, collectproto, 
+          disp, outconvert, textout, logout);
     }