Changeset 12001

Timestamp:

2006-07-04T15:31:08+12:00 (18 years ago)

Author:

davidb

Message:

Experimental addition for nicer URLs for retrieving a document from Grenstone.
Works in conjunction with re-write rules in Apache web server.
Off by default -- need to define DOCHANDLE to switch on.

File:

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

trunk/gsdl/src/recpt/vlistbrowserclass.cpp

@@ -74 +74 @@
 
   text_t collink = collection;
+
+#ifndef DOCHANDLE
   if (!collink.empty()) collink = "&c=" + collink;
+#endif
 
   get_link_icon (section, args, collink, link, icon);
@@ -131 +134 @@
 
   text_t collink = collection;
+#ifndef DOCHANDLE
   if (!collink.empty()) collink = "&c=" + collink;
+#endif
 
   if (colnumber > 0) {
@@ -223 +228 @@
                        const text_t &collink, text_t &link, text_t &icon) {
 
+#ifndef DOCHANDLE
   link = "<a href=\"_httpdocument_" + collink;
+#else
+  link = "<a href=\"_httpdocumenthandle_(" + collink;
+#endif
+
   text_t link_end = "\">";
+#ifndef DOCHANDLE
   text_t detach_link_end = "&amp;x=1\" target=\\_blank>"; // to detach the link, and x=1 signifies it is a detached page
+#else
+  text_t detach_link_end = "\" target=\\_blank>"; // to detach the link, and x=1 signifies it is a detached page
+#endif
+
   icon = "_document:icontext_";
 
@@ -241 +256 @@
   if (args["a"] == "q") {
     // query results list
+#ifndef DOCHANDLE
     link += "&amp;cl=search&amp;d=" + section.OID;
-    
+#else
+    link += "," + section.OID+")";
+#endif
     if (args["xx"] == "1") {
       link += detach_link_end;
@@ -259 +277 @@
     link = "<a href=\"_httpquery_\">";
       }
-      else link += "&amp;cl=" + arg_cl + "\">";
+      else {
+#ifndef DOCHANDLE
+    link += "&amp;cl=" + arg_cl + "\">";
+#else
+    link += ","+arg_cl + ")\">";
+#endif
+      }    
       
     } else if (haschildren == 1) {
@@ -266 +290 @@
       (section.OID == arg_d)) {
     icon = "_document:iconopenfolder_";
+#ifndef DOCHANDLE
     link += "&amp;cl=" + arg_cl + "&amp;d=" + section.OID + ".pr\">";
+#else
+    link += ","+section.OID + ".pr)\">";
+#endif
       } else {
     icon = "_document:iconclosedfolder_";
+#ifndef DOCHANDLE
     link += "&amp;cl=" + arg_cl + "&amp;d=" + section.OID + "\">";
+#else
+    link += ","+section.OID + ")\">";
+#endif
       }
     } else {
       if (args["gt"] == "0") {
+#ifndef DOCHANDLE
     link += "&amp;cl=" + arg_cl + "&amp;d=" + section.OID + "\">";
+#else
+    link += ","+section.OID + ")\">";
+#endif
       } else {
+#ifndef DOCHANDLE
     link += "&amp;cl=" + arg_cl + "&amp;d=" + section.OID + "#" + section.OID + "\">";
+#else
+    link += ","+section.OID + "#" + section.OID + ")\">";
+#endif
       }
     }
@@ -287 +327 @@
         (section.OID == arg_cl)) {
       icon = "_document:iconopenbookshelf_";
+
+#ifndef DOCHANDLE
       link += "&amp;cl=" + section.OID + ".pr\">";
+#else
+      link += ","+section.OID + ".pr)\">";
+#endif
+
+
     } else {
       icon = "_document:iconclosedbookshelf_";
+
+#ifndef DOCHANDLE
       link += "&amp;cl=" + section.OID + "\">";
+#else
+      link += ","+section.OID + ")\">";
+#endif
+
     }
       } else {
     
     icon = "_document:iconclosedbook_";
+#ifndef DOCHANDLE
     link += "&amp;cl=" + arg_cl + "&amp;d=" + section.OID;
+#else
+    link += ","+section.OID+")";
+#endif
     if (args["xx"] == "1") {
       link +=  detach_link_end;
@@ -306 +363 @@
       if (doctype == "classify") link = "";
       else {
+#ifndef DOCHANDLE
     link += "&amp;cl=" + arg_cl + "&amp;d=" + section.OID;
+#else
+    link += "," + section.OID +")";
+#endif
     if (args["xx"] == "1") {
       link +=  detach_link_end;