Changeset 10873 for trunk/gsdl/src/recpt/vlistbrowserclass.cpp

Timestamp:

2005-11-08T17:30:57+13:00 (18 years ago)

Author:

jrm21

Message:

documentaction modified for new HTML4/CSS stuff (eg stop looking for
icon width macros). Other files modified to tidy up output (put tag
attribute values in quotes, use & instead of &, etc). Not quite
finished yet but it works.

File:

• trunk/gsdl/src/recpt/vlistbrowserclass.cpp (modified) (8 diffs)

trunk/gsdl/src/recpt/vlistbrowserclass.cpp

@@ -74 +74 @@
 
   text_t collink = collection;
-  if (!collink.empty()) collink = "&c=" + collink;
+  if (!collink.empty()) collink = "&c=" + collink;
 
   get_link_icon (section, args, collink, link, icon);
@@ -124 +124 @@
 
   text_t collink = collection;
-  if (!collink.empty()) collink = "&c=" + collink;
+  if (!collink.empty()) collink = "&c=" + collink;
 
   if (colnumber > 0) {
@@ -209 +209 @@
   link = "<a href=\"_httpdocument_" + collink;
   text_t link_end = "\">";
-  text_t detach_link_end = "&x=1\" target=\\_blank>"; // to detach the link, and x=1 signifies it is a detached page
+  text_t detach_link_end = "&amp;x=1\" target=\\_blank>"; // to detach the link, and x=1 signifies it is a detached page
   icon = "_document:icontext_";
 
@@ -225 +225 @@
   if (args["a"] == "q") {
     // query results list
-    link += "&cl=search&d=" + section.OID;
+    link += "&amp;cl=search&amp;d=" + section.OID;
     
     if (args["xx"] == "1") {
@@ -243 +243 @@
     link = "<a href=\"_httpquery_\">";
       }
-      else link += "&cl=" + arg_cl + "\">";
+      else link += "&amp;cl=" + arg_cl + "\">";
       
     } else if (haschildren == 1) {
@@ -250 +250 @@
       (section.OID == arg_d)) {
     icon = "_document:iconopenfolder_";
-    link += "&cl=" + arg_cl + "&d=" + section.OID + ".pr\">";
+    link += "&amp;cl=" + arg_cl + "&amp;d=" + section.OID + ".pr\">";
       } else {
     icon = "_document:iconclosedfolder_";
-    link += "&cl=" + arg_cl + "&d=" + section.OID + "\">";
+    link += "&amp;cl=" + arg_cl + "&amp;d=" + section.OID + "\">";
       }
     } else {
       if (args["gt"] == "0") {
-    link += "&cl=" + arg_cl + "&d=" + section.OID + "\">";
+    link += "&amp;cl=" + arg_cl + "&amp;d=" + section.OID + "\">";
       } else {
-    link += "&cl=" + arg_cl + "&d=" + section.OID + "#" + section.OID + "\">";
+    link += "&amp;cl=" + arg_cl + "&amp;d=" + section.OID + "#" + section.OID + "\">";
       }
     }
@@ -271 +271 @@
         (section.OID == arg_cl)) {
       icon = "_document:iconopenbookshelf_";
-      link += "&cl=" + section.OID + ".pr\">";
+      link += "&amp;cl=" + section.OID + ".pr\">";
     } else {
       icon = "_document:iconclosedbookshelf_";
-      link += "&cl=" + section.OID + "\">";
+      link += "&amp;cl=" + section.OID + "\">";
     }
       } else {
     
     icon = "_document:iconclosedbook_";
-    link += "&cl=" + arg_cl + "&d=" + section.OID;
+    link += "&amp;cl=" + arg_cl + "&amp;d=" + section.OID;
     if (args["xx"] == "1") {
       link +=  detach_link_end;
@@ -290 +290 @@
       if (doctype == "classify") link = "";
       else {
-    link += "&cl=" + arg_cl + "&d=" + section.OID;
+    link += "&amp;cl=" + arg_cl + "&amp;d=" + section.OID;
     if (args["xx"] == "1") {
       link +=  detach_link_end;