Changeset 7618

Timestamp:

2004-06-18T10:17:15+12:00 (20 years ago)

Author:

davidb

Message:

previousarrow variable renamed prevarrow to be more consistent with
other variable names in function.

File:

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

trunk/gsdl/src/recpt/pagedbrowserclass.cpp

@@ -131 +131 @@
 
   text_t previousOID, previoustitle, nextOID, nexttitle;
-  text_t previousarrow, nextarrow, httpprevarrow, httpnextarrow;
+  text_t prevarrow, nextarrow, httpprevarrow, httpnextarrow;
   bool found = false;
 
@@ -149 +149 @@
     previoustitle = (*(thissection-1)).metadata["Title"].values[0];
       } else {
-    previousarrow = "_document:parentarrow_";
+    prevarrow = "_document:parentarrow_";
       }
 
@@ -168 +168 @@
   textout << outconvert << disp 
       << ("_document:textnumpages_(" + text_t(numpages) + ")</center></td></tr>\n");
+
+  disp.setmacro ("numpages", "document", numpages);
 
   if (!found) {
@@ -177 +179 @@
     if (!previousOID.empty()) {
       httpprevarrow = "_httpdocument_&cl=" + args["cl"] + "&d=" + dm_safe(previousOID);
-      previousarrow = "<a href=\"" + httpprevarrow + "\">_iconprev_" + previoustitle + "</a>\n";
+      prevarrow = "<a href=\"" + httpprevarrow + "\">_iconprev_" + previoustitle + "</a>\n";
     }
     if (!nextOID.empty()) {
@@ -188 +190 @@
   if (!httpnextarrow.empty()) disp.setmacro ("httpnextarrow", "document", httpnextarrow);
 
+  if (!prevarrow.empty()) disp.setmacro ("prevarrow", "document", prevarrow);
+  if (!nextarrow.empty()) disp.setmacro ("nextarrow", "document", nextarrow);
+
+
   textout << outconvert << disp << "<tr valign=middle>\n"
-      << "<td align=right>" << previousarrow << "</td>\n"
+      << "<td align=right>" << prevarrow << "</td>\n"
       << "<td align=center valign=top>_document:gotoform_</td>"
       << "<td align=left>" << nextarrow << "</td>\n"