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

Timestamp:

2003-07-02T23:18:45+12:00 (21 years ago)

Author:

sjboddie

Message:

Made the DocumentArrowsBottom format option work and added a new
DocumentArrowsTop option

File:

• trunk/gsdl/src/recpt/documentaction.cpp (modified) (6 diffs)

trunk/gsdl/src/recpt/documentaction.cpp

@@ -532 +532 @@
          ((*format_here).second == "false"))
       formatinfo.DocumentArrowsBottom = false;
+    else if (((*format_here).first == "DocumentArrowsTop") && 
+         ((*format_here).second == "true"))
+      formatinfo.DocumentArrowsTop = true;
     else if ((*format_here).first == "DocumentButtons")
       splitchar ((*format_here).second.begin(), (*format_here).second.end(),
@@ -549 +552 @@
 
   // never want arrows when text is expanded
-  if (gt) formatinfo.DocumentArrowsBottom = false;
+  if (gt) {
+    formatinfo.DocumentArrowsBottom = false;
+    formatinfo.DocumentArrowsTop = false;
+  }
 }
 
@@ -565 +571 @@
   // _imagethispage_        the title image to be displayed at top right of page
 
-  // _navarrows_            this may be overridden to "" when format option 
+  // _navarrowsbottom_      this may be overridden to "" when format option 
   //                        DocumentArrowsBottom is false
+
+  // _navarrowstop_         likewise for DocumentArrowsTop
+
+  // _httpprevarrow_        links to next and previous sections of document - used
+  // _httpnextarrow_        by DocumentArrowsBottom
 
   // _header_               the header macro is overridden if we're not at a top level 
@@ -585 +596 @@
   text_t &arg_cl = args["cl"];
 
-  if (!formatinfo.DocumentArrowsBottom)
-    disp.setmacro("navarrows", "document", "");
+  if (!formatinfo.DocumentArrowsBottom) {
+    disp.setmacro("navarrowsbottom", "document", "");
+  } else if (!formatinfo.DocumentArrowsBottom) {
+    disp.setmacro("navarrowstop", "document", "");
+  } 
+
+  if (!arg_d.empty() && (formatinfo.DocumentArrowsBottom || formatinfo.DocumentArrowsTop)) {
+    // set _httpprevarrow_ and _httpnextarrow_
+    set_arrow_macros (args, collectproto, disp, logout);
+  }
 
   metadata.insert ("Title");
@@ -787 +806 @@
         disp, outconvert, textout, logout);
    
+    if (formatinfo.DocumentArrowsTop && !args["d"].empty()) {
+      textout << outconvert << disp << "_document:navarrowstop_\n";
+    }
+
     //output the related documents (may be the empty string)
     //will not output the docs if a format string is specified
@@ -973 +996 @@
   delete formatlistptr;
 }
+
+void documentaction::set_arrow_macros (cgiargsclass &args, recptproto *collectproto,
+                       displayclass &disp, ostream &logout) {
+
+  text_tset metadata;
+  FilterResponse_t response;
+  FilterResponse_t presponse;
+
+  int haschildren = 0;
+  text_tarray next_siblings;
+  text_t previous_sibling;
+  text_t &arg_d = args["d"];
+
+  // get info on current section
+  metadata.insert("haschildren");
+  if (!get_info(arg_d, args["c"], metadata, false, collectproto, response, logout)) {
+    logout << "error 1 in documentaction::set_arrow_macros\n";
+    return;
+  }
+  haschildren = response.docInfo[0].metadata["haschildren"].values[0].getint();
+      
+  // get OIDs of next and previous siblings of current section and
+  // all it's parents
+  int parentcount = countchar(arg_d.begin(), arg_d.end(), '.');
+  text_t thisoid = arg_d;
+  while (parentcount > 0) {
+    get_children (get_parent(thisoid), args["c"], metadata, false, 
+          collectproto, response, logout);
+    ResultDocInfo_tarray::iterator this_sibling = response.docInfo.begin();
+    ResultDocInfo_tarray::iterator last_sibling = response.docInfo.end();
+    bool first = true;
+    while (this_sibling != last_sibling) {
+      if ((*this_sibling).OID == thisoid) {
+    if (!first && next_siblings.empty()) {
+      previous_sibling = (*(this_sibling-1)).OID;
+      int section_has_children = (*(this_sibling-1)).metadata["haschildren"].values[0].getint();
+      // if previous sibling has children we need to recurse
+      // down to the last descendant
+      while (section_has_children) {
+        get_children (previous_sibling, args["c"], metadata, false, 
+              collectproto, presponse, logout);
+        if (!presponse.docInfo.empty()) {
+          ResultDocInfo_tarray::iterator it = presponse.docInfo.end() - 1;
+          previous_sibling = (*it).OID;
+          section_has_children = (*it).metadata["haschildren"].values[0].getint();
+        } else {
+          section_has_children = 0; // this should never happen
+        }
+      }
+    }
+        
+    if ((this_sibling+1) != last_sibling) {
+      next_siblings.push_back((*(this_sibling+1)).OID);
+    } else {
+      next_siblings.push_back("");
+    }
+    break;
+      }
+      this_sibling++;
+      first = false;
+    }
+    thisoid = get_parent(thisoid);
+    parentcount--;
+  }
+
+  // work out values for next link
+  if (haschildren) {
+    disp.setmacro ("httpnextarrow", "document", "_httpdocument_&cl=" + args["cl"] +
+           "&d=" + arg_d + ".fc");
+  } else {
+    text_tarray::const_iterator h = next_siblings.begin();
+    text_tarray::const_iterator e = next_siblings.end();
+    while (h != e) {
+      if (!(*h).empty()) {
+    disp.setmacro ("httpnextarrow", "document", "_httpdocument_&cl=" + args["cl"] +
+               "&d=" + *h);
+    break;
+      }
+      h++;
+    }
+  }
+
+  // work out value for previous link
+  if (!previous_sibling.empty()) {
+    disp.setmacro ("httpprevarrow", "document", "_httpdocument_&cl=" + args["cl"] +
+           "&d=" + previous_sibling);
+  } else {
+    if (countchar(arg_d.begin(), arg_d.end(), '.')) {
+      disp.setmacro ("httpprevarrow", "document", "_httpdocument_&cl=" + args["cl"] +
+             "&d=" + get_parent(arg_d));
+    }
+  }
+}