Changeset 4538

Timestamp:

2003-06-10T15:15:18+12:00 (21 years ago)

Author:

jmt12

Message:

2030116: Metadata was not being imported from metadata.xml with filesets named '.*' at the correct level. They are now.

File:

• trunk/gli/src/org/greenstone/gatherer/msm/parsers/GreenstoneMetadataParser.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/msm/parsers/GreenstoneMetadataParser.java

@@ -558 +558 @@
         ///ystem.err.println("Check for: " + (filename != null ? filename : ".*"));
         ///ystem.err.println("Folder level = " + folder_level);
-        ///ystem.err.println("filename != null && '" + filename + "'.matches('" + filename_text + "') = " + (filename != null ? filename.matches(filename_text) : false));
+        ///ystem.err.println("filename != null && '" + filename + "'.matches('" + filename_text + "') = " + (filename != null ? filename.matches(filename_text) && !filename_text.equals(DIRECTORY_FILENAME) : false));
         ///ystem.err.println("filename != null && '" + filename + "'.matches('" + filename_text + DIRECTORY_FILENAME_SUFFIX + "') [folder level = " + folder_level + "] = " + (filename != null ? filename.matches(filename_text + DIRECTORY_FILENAME_SUFFIX) && folder_level: false));
         ///ystem.err.println("filename == null && '" + filename_text + "'.equals('.*') = " + (filename == null ? filename_text.equals(DIRECTORY_FILENAME) : false));
@@ -566 +566 @@
         }
         else {
-            return filename.matches(filename_text);
+            return filename.matches(filename_text) && !filename_text.equals(DIRECTORY_FILENAME);
         }
         }