Changeset 16123

Timestamp:

2008-06-24T15:51:47+12:00 (16 years ago)

Author:

mdewsnip

Message:

Improved to nested hlists.

File:

• gsdl/trunk/src/recpt/dynamicclassifieraction.cpp (modified) (3 diffs)

gsdl/trunk/src/recpt/dynamicclassifieraction.cpp

@@ -348 +348 @@
   }
 
-  // If no classifier node has been specified automatically go to the first hlist node
-  if (args["dcn"] == parent_classifier_node_OID)
-  {
-    args["dcn"] = (*hlist_classifier_nodes.begin()).first;
-  }
-
   // Add the necessary metadata to the hlist classifier nodes
   text_t selected_hlist_node_OID = "";
@@ -361 +355 @@
   {
     text_t hlist_classifier_node_OID = (*hlist_classifier_nodes_iterator).first;
+    if (parent_classifier_node_OID != "")
+    {
+      hlist_classifier_node_OID = parent_classifier_node_OID + "|" + hlist_classifier_node_OID;
+    }
 
     // Is this the hlist node that is currently selected?
@@ -374 +372 @@
     hlist_classifier_node.metadata["haschildren"].values.push_back ("1");
     hlist_classifier_node.metadata["numleafdocs"].values.push_back ("?");  // We can't determine this without more database requests
-    hlist_classifier_node.metadata["Title"].values.push_back (hlist_classifier_node_OID);
+    hlist_classifier_node.metadata["Title"].values.push_back ((*hlist_classifier_nodes_iterator).first);
     hlist_classifier_nodes_response.docInfo.push_back (hlist_classifier_node);
 
     hlist_classifier_nodes_iterator++;
+  }
+
+  // Automatically select the first hlist node if necessary
+  if (selected_hlist_node_OID == "")
+  {
+    selected_hlist_node_OID = (*hlist_classifier_nodes_response.docInfo.begin()).OID;
+
+    if (args["dcn"] == parent_classifier_node_OID)
+    {
+      args["dcn"] = selected_hlist_node_OID;
+    }
   }