Changeset 3087 for trunk/gsdl/src

Timestamp:

2002-04-22T15:26:19+12:00 (22 years ago)

Author:

sjboddie

Message:

Fixed a couple of bugs in the way the "Expand Text" function worked

Location:

trunk/gsdl/src/recpt

Files:

• documentaction.cpp (modified) (2 diffs)
• vlistbrowserclass.cpp (modified) (1 diff)

trunk/gsdl/src/recpt/documentaction.cpp

@@ -767 +767 @@
 
     // output the document text
-    textout << "<p>\n";
-    output_document (OID, args, collectproto, disp, outconvert, textout, logout);
+    if (!args["d"].empty()) {
+      textout << "<p>\n";
+      output_document (OID, args, collectproto, disp, outconvert, textout, logout);
+    }
 
     textout << outconvert << disp << "_document:footer_\n";
@@ -928 +930 @@
     int count = 0;
     while (sechere != secend) {
-      textout << outconvert << disp << "\n<p><a name=" << count << "></a>\n";
+      textout << outconvert << disp << "\n<p><a name=" << (*sechere).OID << "></a>\n";
 
       int shastxt = (*sechere).metadata["hastxt"].values[0].getint();

trunk/gsdl/src/recpt/vlistbrowserclass.cpp

@@ -213 +213 @@
     link += "&cl=" + arg_cl + "&d=" + section.OID + "\">";
       }
-    } else link += "&cl=" + arg_cl + "&d=" + section.OID + "\">";
+    } else {
+      if (args["gt"] == "0") {
+    link += "&cl=" + arg_cl + "&d=" + section.OID + "\">";
+      } else {
+    link += "&cl=" + arg_cl + "&d=" + section.OID + "#" + section.OID + "\">";
+      }
+    }
 
   } else {