Changeset 16215

Timestamp:

2008-06-26 17:03:14 (7 months ago)

Author:

mdewsnip

Message:

Tidied up the grouping stuff some more and changed the grouping node separator to "." to make it distinct from the hierarchy separators ("|").

Files:

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

gsdl/trunk/src/recpt/dynamicclassifieraction.cpp

@@ -183 +183 @@
-    text_t selected_grouping_node_OID = output_hlist_classifier_nodes (current_classifier_node_OID, current_metadata_value_filter, "substr(value,1,1)", classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout);
-
-|
+.
-    current_metadata_value_filter = selected_grouping_node_OID + "*";
-  }
@@ -197 +197 @@
-  // args["dcn"] may have been modified by output_hlist_classifier_nodes() above
-  text_t classifier_node_OID = args["dcn"];
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  text_t classifier_node_metadata_value_filter = classifier_node_metadata_value + "|*";
-
-  // Split the classifier node OID into its components, then remove any we've already dealt with
-  text_tlist classifier_node_OID_parts_remaining;
-  splitchar(classifier_node_OID.begin(), classifier_node_OID.end(), '|', classifier_node_OID_parts_remaining);
-  if (classifier_options["-group_by_first_character"] == "1")
-  {
-    classifier_node_OID_parts_remaining.pop_front();
-
-    // Update classifier_node_metadata_value (and consequently the filter) to remove the grouping node component
-    joinchar (classifier_node_OID_parts_remaining, '|', classifier_node_metadata_value);
-    classifier_node_metadata_value_filter = classifier_node_metadata_value + "|*";
-  }
-  if (classifier_options["-use_hlist_at_top"] == "1")
-  {
-    classifier_node_OID_parts_remaining.pop_front();
-  }
-
-  // If "-split_greenstone_dates" is on the metadata value and filter doesn't quite match the OID -- fix this