Changeset 1282

Timestamp:

2000-07-13T14:51:10+12:00 (24 years ago)

Author:

sjboddie

Message:

got DocumentArrowsBottom working for collections using "paged" browsers
(like gberg). The whole idea of arrows as used both in the query results
page and document pages needs to be revisited to get things working in
all situations

File:

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

trunk/gsdl/src/recpt/pagedbrowserclass.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.11  2000/07/13 02:51:10  sjboddie
+   got DocumentArrowsBottom working for collections using "paged" browsers
+   (like gberg). The whole idea of arrows as used both in the query results
+   page and document pages needs to be revisited to get things working in
+   all situations
+
    Revision 1.10  2000/06/29 02:47:20  sjboddie
    added browser info (i.e VList, HList etc.) to status pages
@@ -136 +142 @@
 
   if (section.OID != args["d"]) {
-    // set the _parentarrow_ macro 
-    text_t parentarrow = "<a href=\"_httpdocument_&cl=" + args["cl"] +
-      "&d=" + section.OID + "\">_iconprev_</a>\n";
+    text_t httpprevarrow = "_httpdocument_&cl=" + args["cl"] + "&d=" + section.OID;
+    text_t parentarrow = "<a href=\"" + httpprevarrow + "\">_iconprev_</a>\n";
+    disp.setmacro ("httpprevarrow", "document", httpprevarrow);
     disp.setmacro ("parentarrow", "document", parentarrow);
     return 0;
@@ -164 +170 @@
 
   text_t previousOID, previoustitle, nextOID, nexttitle;
-  text_t previousarrow, nextarrow;
+  text_t previousarrow, nextarrow, httpprevarrow, httpnextarrow;
   bool found = false;
 
@@ -181 +187 @@
     previousOID = (*(thissection-1)).OID;
     previoustitle = (*(thissection-1)).metadata["Title"].values[0];
-      } else 
+      } else {
     previousarrow = "_document:parentarrow_";
+      }
 
       if ((thissection+1) != endsection) {
@@ -201 +208 @@
       << ("_document:textnumpages_(" + text_t(numpages) + ")</center></td></tr>\n");
 
-  if (!found)
-    nextarrow = "<a href=\"_httpdocument_&cl=" + args["cl"] + "&d=" + sections.docInfo[0].OID + 
-      "\">" + sections.docInfo[0].metadata["Title"].values[0] + "_iconnext_</a>\n";
-  else {
-    if (!previousOID.empty())
-      previousarrow = "<a href=\"_httpdocument_&cl=" + args["cl"] + "&d=" + 
-    previousOID + "\">_iconprev_" + previoustitle + "</a>\n";
-    if (!nextOID.empty())
-      nextarrow = "<a href=\"_httpdocument_&cl=" + args["cl"] + "&d=" + 
-    nextOID + "\">" + nexttitle + "_iconnext_</a>\n";
-  }
+  if (!found) {
+    httpnextarrow = "_httpdocument_&cl=" + args["cl"] + "&d=" + sections.docInfo[0].OID;
+    nextarrow = "<a href=\"" + httpnextarrow + "\">" + 
+      sections.docInfo[0].metadata["Title"].values[0] + "_iconnext_</a>\n";
+
+  } else {
+    if (!previousOID.empty()) {
+      httpprevarrow = "_httpdocument_&cl=" + args["cl"] + "&d=" + previousOID;
+      previousarrow = "<a href=\"" + httpprevarrow + "\">_iconprev_" + previoustitle + "</a>\n";
+    }
+    if (!nextOID.empty()) {
+      httpnextarrow = "_httpdocument_&cl=" + args["cl"] + "&d=" + nextOID;
+      nextarrow = "<a href=\"" + httpnextarrow + "\">" + nexttitle + "_iconnext_</a>\n";
+    }
+  }
+
+  if (!httpprevarrow.empty()) disp.setmacro ("httpprevarrow", "document", httpprevarrow);
+  if (!httpnextarrow.empty()) disp.setmacro ("httpnextarrow", "document", httpnextarrow);
 
   textout << outconvert << disp << "<tr valign=middle>\n"