Changeset 16216

Timestamp:

2008-06-26T17:34:51+12:00 (16 years ago)

Author:

mdewsnip

Message:

First attempt at a "-split_using_hierarchy_separator" option.

File:

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

gsdl/trunk/src/recpt/dynamicclassifieraction.cpp

@@ -176 +176 @@
   text_t current_classifier_node_OID = "";
   text_t current_metadata_value_filter = "";
+  text_t classifier_node_separator = classifier_options["-split_using_hierarchy_separator"];
   int classifier_node_indent = 0;
 
@@ -192 +193 @@
     text_t selected_hlist_node_OID = output_hlist_classifier_nodes (current_classifier_node_OID, current_metadata_value_filter, "", classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout);
 
-    current_classifier_node_OID = selected_hlist_node_OID + "|";
+    current_classifier_node_OID = selected_hlist_node_OID + classifier_node_separator;
   }
 
@@ -215 +216 @@
   // Split the classifier node OID into its hierarchical parts, then remove any we've already dealt with (HLists)
   text_tlist classifier_node_OID_parts_remaining;
-  splitchar(classifier_node_OID_sans_grouping.begin(), classifier_node_OID_sans_grouping.end(), '|', classifier_node_OID_parts_remaining);
+  splitword (classifier_node_OID_sans_grouping.begin(), classifier_node_OID_sans_grouping.end(), classifier_node_separator, classifier_node_OID_parts_remaining);
   if (classifier_options["-use_hlist_at_top"] == "1")
   {
@@ -222 +223 @@
 
   text_t classifier_node_metadata_value = classifier_node_OID_sans_grouping;
-  text_t classifier_node_metadata_value_filter = classifier_node_metadata_value + "|*";
+  text_t classifier_node_metadata_value_filter = classifier_node_metadata_value + classifier_node_separator + "*";
 
   // If "-split_greenstone_dates" is on the metadata value and filter doesn't quite match the OID -- fix this
@@ -229 +230 @@
     classifier_node_metadata_value.replace("|", "");
     classifier_node_metadata_value_filter = classifier_node_metadata_value;
-    classifier_node_metadata_value_filter += ((classifier_node_metadata_value_filter.size() == 8) ? "|*" : "*");
+    if (classifier_node_metadata_value_filter.size() == 8)
+    {
+      classifier_node_metadata_value_filter += classifier_node_separator;
+    }
+    classifier_node_metadata_value_filter += "*";
   }
 
@@ -245 +250 @@
 
     // Output the child classifier nodes
-    output_child_classifier_nodes (classifier_node_OID + "|", classifier_node_metadata_value, classifier_node_metadata_value_filter, classifier_node_indent, classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout);
+    current_classifier_node_OID = classifier_node_OID + classifier_node_separator;
+    output_child_classifier_nodes (current_classifier_node_OID, classifier_node_metadata_value, classifier_node_metadata_value_filter, classifier_node_indent, classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout);
 
     // Get the document nodes at this level
@@ -270 +276 @@
 {
   text_tmap classifier_options;
+
+  // Default values
+  classifier_options["-split_using_hierarchy_separator"] = "|";
 
   // Split the classifier specification string by spaces
@@ -339 +348 @@
 
     // Determine the label for the hlist classifier node from the metadata value
-    text_tarray hlist_metadata_value_parts;
-    splitchar (hlist_metadata_value.begin(), hlist_metadata_value.end(), '|', hlist_metadata_value_parts);
+    text_tlist hlist_metadata_value_parts;
+    text_t hlist_node_separator = classifier_options["-split_using_hierarchy_separator"];
+    splitword (hlist_metadata_value.begin(), hlist_metadata_value.end(), hlist_node_separator, hlist_metadata_value_parts);
     text_t hlist_classifier_node_label = hlist_metadata_value_parts.front();
 
@@ -427 +437 @@
     classifier_node_indent++;
 
-    upper_classifier_node_OID += "|";
+    upper_classifier_node_OID += classifier_options["-split_using_hierarchy_separator"];
     upper_classifier_node_labels_iterator++;
   }
@@ -464 +474 @@
     // We need to remove the current position from the metadata value to leave the child metadata value
     text_t child_metadata_value = hierarchical_metadata_value;
-    if (starts_with(hierarchical_metadata_value, classifier_node_hierarchical_metadata_value + "|"))
-    {
-      child_metadata_value = substr(hierarchical_metadata_value.begin() + (classifier_node_hierarchical_metadata_value + "|").size(), hierarchical_metadata_value.end());
+    text_t child_node_separator = classifier_options["-split_using_hierarchy_separator"];
+    if (starts_with(hierarchical_metadata_value, classifier_node_hierarchical_metadata_value + child_node_separator))
+    {
+      child_metadata_value = substr(hierarchical_metadata_value.begin() + (classifier_node_hierarchical_metadata_value + child_node_separator).size(), hierarchical_metadata_value.end());
     }
 
     // Determine the label for the child classifier node from the metadata value
-    text_tarray child_metadata_value_parts;
-    splitchar (child_metadata_value.begin(), child_metadata_value.end(), '|', child_metadata_value_parts);
+    text_tlist child_metadata_value_parts;
+    splitword (child_metadata_value.begin(), child_metadata_value.end(), child_node_separator, child_metadata_value_parts);
     text_t child_classifier_node_label = child_metadata_value_parts.front();