Changeset 15835 for gsdl

Timestamp:

2008-05-30T14:43:13+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding dynamic classifiers) Improved get_link_icon() for dynamic classifiers so both open and closed nodes are dealt with.

File:

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

gsdl/trunk/src/recpt/vlistbrowserclass.cpp

@@ -386 +386 @@
     if (haschildren == 1) {
       if (doctype == "classify") {
-    if ((args["gc"] == "1") || 
+    // Dynamic classifier nodes
+    if (args["a"] == "dc")
+    {
+      // Open node
+      if (section.OID == args["dcn"])
+      {
+        icon = "_document:iconopenbookshelf_";
+        link = "<a href=\"_gwcgi_?c=" + args["c"] + "&amp;a=dc&amp;dcl=" + args["dcl"] + "&amp;dcn=\">";
+      }
+      // Closed node
+      else
+      {
+        icon = "_document:iconclosedbookshelf_";
+
+        // The node label is going into the URL, so make it CGI-safe
+        text_t classifier_node_cgi_safe = cgi_safe_utf8(section.OID);
+        link = "<a href=\"_gwcgi_?c=" + args["c"] + "&amp;a=dc&amp;dcl=" + args["dcl"] + "&amp;dcn=" + classifier_node_cgi_safe + "\">";
+      }
+    }
+    // Static classifier nodes
+    else if ((args["gc"] == "1") || 
         (is_child_of (section.OID, arg_cl)) || 
         (section.OID == arg_cl)) {
@@ -401 +421 @@
 
 #ifndef DOCHANDLE
-      if (args["a"] == "dc")
-      {
-        // This is a dynamic classifier node, and the node label is going into the URL, so make it CGI-safe
-        text_t classifier_node_cgi_safe = cgi_safe_utf8(section.OID);
-        link = "<a href=\"_gwcgi_?c=" + args["c"] + "&amp;a=dc&amp;dcl=" + args["dcl"] + "&amp;dcn=" + classifier_node_cgi_safe + "\">";
-      }
-      else
-      {
-        link += "&amp;cl=" + section.OID + "\">";
-      }
+      link += "&amp;cl=" + section.OID + "\">";
 #else
       link += ","+section.OID + ")\">";