Changeset 15950

Timestamp:

2008-06-10T16:35:26+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding dynamic classifiers) Improvements to get_link_icon() to handle multi-level dynamic classifier nodes.

File:

• gsdl/trunk/src/recpt/vlistbrowserclass.cpp (modified) (1 diff)

gsdl/trunk/src/recpt/vlistbrowserclass.cpp

@@ -389 +389 @@
     if (args["a"] == "dc")
     {
-      // Open node
-      if (section.OID == args["dcn"])
+      // Parent node or current node
+      text_t classifier_node_dcn = "";
+      if (!starts_with (section.OID, args["dcn"]) || section.OID == args["dcn"])
       {
         icon = "_document:iconopenbookshelf_";
-        link = "<a href=\"_gwcgi_?c=" + args["c"] + "&amp;a=dc&amp;dcl=" + args["dcl"] + "&amp;dcn=\">";
+
+        // dcn value is the OID of this node's parent
+        text_t::iterator hierarchy_split_position = findchar(section.OID.begin(), section.OID.end(), '|');
+        if (hierarchy_split_position != section.OID.end())
+        {
+          classifier_node_dcn = substr (section.OID.begin(), hierarchy_split_position);
+        }
       }
-      // Closed node
+      // Child 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 + "\">";
+        classifier_node_dcn = section.OID;
       }
+
+      // The node label is going into the URL, so make it CGI-safe
+      text_t classifier_node_dcn_cgi_safe = cgi_safe_utf8(classifier_node_dcn);
+      link = "<a href=\"_gwcgi_?c=" + args["c"] + "&amp;a=dc&amp;dcl=" + args["dcl"] + "&amp;dcn=" + classifier_node_dcn_cgi_safe + "\">";
     }
     // Static classifier nodes