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

Timestamp:

2003-08-11T12:09:06+12:00 (21 years ago)

Author:

kjdon

Message:

made some small changes to allow the user to specify that documents should be detached by default - the links in the search list and classifier lists lead to new windows being opened for the documents. there is a new arg xx, which is 0 by default, but if its 1, it means that docs should be detached. affected classes are documentaction - this is where I defined the arg, just because the x arg is there, and the browser classes where the links to the documents are created. I have only changed vlist, hlist and datelist browser classes - I didn't think the others needed changing. to use this, you need to set the arg to 1 in main.cfg (for all collections), or add it to the receptionist thingy in a colls collect.cfg file

File:

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

trunk/gsdl/src/recpt/vlistbrowserclass.cpp

@@ -192 +192 @@
 // get_link_icon attempts to work out what type of icon should be displayed for
 // the given section and what it should link to.
+// [modification to allow default document detach settings -- kjdon]
 void vlistbrowserclass::get_link_icon (ResultDocInfo_t &section, cgiargsclass &args,
                        const text_t &collink, text_t &link, text_t &icon) {
 
   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
   icon = "_document:icontext_";
+
+  text_t doctype;
   int haschildren = 0;
 
   if (section.metadata.count("haschildren")>0)
     haschildren = section.metadata["haschildren"].values[0].getint();
-
-  text_t doctype;
   if (section.metadata.count("doctype")>0)
     doctype = section.metadata["doctype"].values[0];
@@ -210 +213 @@
 
   if (args["a"] == "q") {
-    // query results
+    // query results list
+    link += "&cl=search&d=" + section.OID;
+    
+    if (args["xx"] == "1") {
+      link += detach_link_end;
+    } else {
+      link += link_end;
+    }
     if ((is_top (section.OID)) && (haschildren == 1)) icon = "_document:iconclosedbook_";
     else if (haschildren == 1) icon = "_document:iconclosedfolder_";
-    link += "&cl=search&d=" + section.OID + "\">";
-
+    
   } else if (!arg_d.empty()) {
-    // document level
+    // we are in a document - none of the links should be detach links
     if (is_top(section.OID)) {
+      // we link back to the originating page eg search page or classifier page
       icon = "_document:iconopenbook_";
-      if (arg_cl == "search") link = "<a href=\"_httpquery_\">";
+      if (arg_cl == "search") { 
+    link = "<a href=\"_httpquery_\">";
+      }
       else link += "&cl=" + arg_cl + "\">";
-    
+      
     } else if (haschildren == 1) {
       if ((args["gc"] == "1") || 
@@ -239 +251 @@
       }
     }
-
+    
   } else {
-    // classification level
+    // classification level - links to docs may be detaching
     if (haschildren == 1) {
       if (doctype == "classify") {
@@ -254 +266 @@
     }
       } else {
+    
     icon = "_document:iconclosedbook_";
-    link += "&cl=" + arg_cl + "&d=" + section.OID + "\">";
+    link += "&cl=" + arg_cl + "&d=" + section.OID;
+    if (args["xx"] == "1") {
+      link +=  detach_link_end;
+    } else {
+      link += link_end;
+    }
+    
       }
     } else {
       if (doctype == "classify") link = "";
-      else link += "&cl=" + arg_cl + "&d=" + section.OID + "\">";
-    }
-  }
-}
+      else {
+    link += "&cl=" + arg_cl + "&d=" + section.OID;
+    if (args["xx"] == "1") {
+      link +=  detach_link_end;
+    } else {
+      link += link_end;
+    }
+      }
+    }
+  }
+  
+}