Changeset 8655

Timestamp:

2004-11-24T15:43:01+13:00 (19 years ago)

Author:

mdewsnip

Message:

Missed a couple of cases for escaping and unescaping square brackets in metadata elements.

File:

• trunk/gli/src/org/greenstone/gatherer/metadata/MetadataXMLFile.java (modified) (5 diffs)

trunk/gli/src/org/greenstone/gatherer/metadata/MetadataXMLFile.java

@@ -237 +237 @@
 
         // Square brackets need to be escaped because they are a special character in Greenstone
-        String metadata_element_value = XMLTools.getElementTextValue(current_metadata_element);
-        metadata_element_value = metadata_element_value.replaceAll("[", "[");
-        metadata_element_value = metadata_element_value.replaceAll("]", "]");
-
-        MetadataValueTreeNode metadata_value_tree_node = metadata_element.getMetadataValueTreeNode(metadata_element_value);
+        String metadata_value_string = XMLTools.getElementTextValue(current_metadata_element);
+        metadata_value_string = metadata_value_string.replaceAll("[", "[");
+        metadata_value_string = metadata_value_string.replaceAll("]", "]");
+
+        MetadataValueTreeNode metadata_value_tree_node = metadata_element.getMetadataValueTreeNode(metadata_value_string);
 
         // If there is no metadata value tree node for this value, create it
         if (metadata_value_tree_node == null) {
-            DebugStream.println("Note: No value tree node for metadata value \"" + metadata_element_value + "\"");
-            metadata_element.addMetadataValue(metadata_element_value);
-            metadata_value_tree_node = metadata_element.getMetadataValueTreeNode(metadata_element_value);
+            DebugStream.println("Note: No value tree node for metadata value \"" + metadata_value_string + "\"");
+            metadata_element.addMetadataValue(metadata_value_string);
+            metadata_value_tree_node = metadata_element.getMetadataValueTreeNode(metadata_value_string);
         }
 
@@ -299 +299 @@
     }
 
+    // Square brackets need to be escaped because they are a special character in Greenstone
+    String metadata_value_string = metadata_value.getFullValue();
+    metadata_value_string = metadata_value_string.replaceAll("\\[", "[");
+    metadata_value_string = metadata_value_string.replaceAll("\\]", "]");
+    
     // Read all the FileSet elements in the file
     NodeList fileset_elements_nodelist = document.getElementsByTagName(FILESET_ELEMENT);
@@ -325 +330 @@
         // Find the Metadata element to delete from the fileset
         String metadata_element_name_full = metadata_value.getMetadataElement().getFullName();
-        String metadata_element_value = metadata_value.getFullValue();
         NodeList metadata_elements_nodelist = current_fileset_element.getElementsByTagName(METADATA_ELEMENT);
         for (int k = 0; k < metadata_elements_nodelist.getLength(); k++) {
@@ -337 +341 @@
 
         // Check the metadata element value matches
-        String current_metadata_element_value = XMLTools.getElementTextValue(current_metadata_element);
-        if (!current_metadata_element_value.equals(metadata_element_value)) {
+        String current_metadata_value_string = XMLTools.getElementTextValue(current_metadata_element);
+        if (!current_metadata_value_string.equals(metadata_value_string)) {
             continue;
         }
@@ -407 +411 @@
         }
 
-        String metadata_element_value = XMLTools.getElementTextValue(current_metadata_element);
-        metadata_element.addMetadataValue(metadata_element_value);
+        // Square brackets need to be escaped because they are a special character in Greenstone
+        String metadata_value_string = XMLTools.getElementTextValue(current_metadata_element);
+        metadata_value_string = metadata_value_string.replaceAll("&#091;", "[");
+        metadata_value_string = metadata_value_string.replaceAll("&#093;", "]");
+
+        metadata_element.addMetadataValue(metadata_value_string);
     }