Changeset 8433 for trunk/gli/src/org/greenstone/gatherer/metadata/MetadataXMLFile.java

Timestamp:

2004-11-03T12:08:31+13:00 (20 years ago)

Author:

mdewsnip

Message:

Now escapes '(', ')', ',', '{', '}' in file paths when converting to regular expressions so files with these characters in the names can have metadata assigned and removed.

File:

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

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

@@ -68 +68 @@
     }
 
-    // Convert the file path into a regular expression that will match it
-    String file_path_regexp = file_relative_path.replaceAll("\\.", "\\\\.");
-    if (file_relative_path.equals("")) {
+    // Form a regular expression that specifies the scope of the metadata
+    String file_path_regexp = file_relative_path;
+    if (file_path_regexp.equals("")) {
         file_path_regexp = DIRECTORY_FILENAME;
+    }
+    else {
+        // Convert the file path into a regular expression that will match it
+        file_path_regexp = file_path_regexp.replaceAll("\\.", "\\\\.");
+        file_path_regexp = file_path_regexp.replaceAll("\\(", "\\\\(");
+        file_path_regexp = file_path_regexp.replaceAll("\\)", "\\\\)");
+        file_path_regexp = file_path_regexp.replaceAll("\\[", "\\\\[");
+        file_path_regexp = file_path_regexp.replaceAll("\\]", "\\\\]");
+        file_path_regexp = file_path_regexp.replaceAll("\\{", "\\\\{");
+        file_path_regexp = file_path_regexp.replaceAll("\\}", "\\\\}");
     }
 
@@ -273 +283 @@
     }
 
-    // Convert the file path into a regular expression that will match it
-    String file_path_regexp = file_relative_path.replaceAll("\\.", "\\\\.");
-    if (file_relative_path.equals("")) {
+    // Form a regular expression that specifies the scope of the metadata
+    String file_path_regexp = file_relative_path;
+    if (file_path_regexp.equals("")) {
         file_path_regexp = DIRECTORY_FILENAME;
+    }
+    else {
+        // Convert the file path into a regular expression that will match it
+        file_path_regexp = file_path_regexp.replaceAll("\\.", "\\\\.");
+        file_path_regexp = file_path_regexp.replaceAll("\\(", "\\\\(");
+        file_path_regexp = file_path_regexp.replaceAll("\\)", "\\\\)");
+        file_path_regexp = file_path_regexp.replaceAll("\\[", "\\\\[");
+        file_path_regexp = file_path_regexp.replaceAll("\\]", "\\\\]");
+        file_path_regexp = file_path_regexp.replaceAll("\\{", "\\\\{");
+        file_path_regexp = file_path_regexp.replaceAll("\\}", "\\\\}");
     }