Changeset 16220 for gsdl

Timestamp:

2008-06-27T10:51:20+12:00 (16 years ago)

Author:

mdewsnip

Message:

Added the last of the "-split_using_hierarchy_separator" code.

File:

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

gsdl/trunk/src/recpt/dynamicclassifieraction.cpp

@@ -223 +223 @@
   if (classifier_options["-split_greenstone_dates"] == "1")
   {
-    classifier_node_metadata_value.replace("|", "");
+    classifier_node_metadata_value.replace (classifier_node_separator, "");
     classifier_node_metadata_value_filter = classifier_node_metadata_value;
     if (classifier_node_metadata_value_filter.size() == 8)
@@ -518 +518 @@
 {
   text_t hierarchical_metadata_value = metadata_value;
-
-  // Add hierarchy separators into Greenstone date values (YYYYMMDD -> YYYY|MM|DD)
+  text_t hierarchy_separator = classifier_options["-split_using_hierarchy_separator"];
+
+  // Add hierarchy separators into Greenstone date values (e.g. YYYYMMDD -> YYYY|MM|DD)
   if (classifier_options["-split_greenstone_dates"] == "1")
   {
@@ -525 +526 @@
     {
       // Add year
-      hierarchical_metadata_value = substr(metadata_value.begin(), metadata_value.begin() + 4);
+      hierarchical_metadata_value = substr (metadata_value.begin(), metadata_value.begin() + 4);
       if (metadata_value.size() == 6 || metadata_value.size() == 8)
       {
     // Add month
-    hierarchical_metadata_value += "|" + substr(metadata_value.begin() + 4, metadata_value.begin() + 6);
+    hierarchical_metadata_value += hierarchy_separator;
+    hierarchical_metadata_value += substr (metadata_value.begin() + 4, metadata_value.begin() + 6);
     if (metadata_value.size() == 8)
     {
       // Add day
-      hierarchical_metadata_value += "|" + substr(metadata_value.begin() + 6, metadata_value.begin() + 8);
+      hierarchical_metadata_value += hierarchy_separator;
+      hierarchical_metadata_value += substr (metadata_value.begin() + 6, metadata_value.begin() + 8);
     }
       }