Changeset 912 for trunk/gsdl/src/recpt/pagedbrowserclass.cpp

Timestamp:

2000-02-07T10:29:11+13:00 (24 years ago)

Author:

sjboddie

Message:

fixed a bug - made some functions virtual for use with cstr collection

File:

• trunk/gsdl/src/recpt/pagedbrowserclass.cpp (modified) (4 diffs)

trunk/gsdl/src/recpt/pagedbrowserclass.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.5  2000/02/06 21:29:11  sjboddie
+   fixed a bug - made some functions virtual for use with cstr collection
+
    Revision 1.4  1999/10/30 23:06:25  sjboddie
    tidied up a bit
@@ -67 +70 @@
 }
 
-// if the "gp" (go to page) argument is set we need to set 
+// if the "gp" (go to page) argument is set we need to set
 // the "d" argument to the corresponding page
 void pagedbrowserclass::processOID (cgiargsclass &args, recptproto *collectproto,
-                    ostream &logout) {
+                                    ostream &logout) {
 
   text_t &arg_d = args["d"];
   text_t &arg_gp = args["gp"];
-  
+  text_tset metadata;
+  bool getParents = false;
+  FilterResponse_t response;
+
   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;
-    FilterResponse_t response;
     get_children (top, args["c"], metadata, getParents, collectproto, response, logout);
     ResultDocInfo_tarray::iterator dochere = response.docInfo.begin();
@@ -87 +90 @@
     while (dochere != docend) {
       if ((*dochere).metadata["Title"].values[0] == arg_gp) {
-    arg_d = (*dochere).OID;
-    break;
+        arg_d = (*dochere).OID;
+        break;
       }
       dochere ++;
     }
-  }
-}
-
+
+  } else if (!arg_d.empty() && is_top(arg_d)) { // if top level doc, check if not invisible
+    metadata.insert("thistype");
+    if(get_info(arg_d, args["c"], metadata, getParents, collectproto, response, logout)) {
+      text_t type = response.docInfo[0].metadata["thistype"].values[0];
+      if (type=="Invisible") { // display first child
+        arg_d = arg_d + ".1";
+      }
+    }
+  }
+}
 
 int pagedbrowserclass::output_section_group (ResultDocInfo_t &section, cgiargsclass &args,
@@ -156 +167 @@
     previousarrow = "_document:parentarrow_";
 
-      if (thissection != sections.docInfo.end()) {
+      if ((thissection+1) != endsection) {
     nextOID = (*(thissection+1)).OID;
     nexttitle = (*(thissection+1)).metadata["Title"].values[0];