Changeset 10167

Timestamp:

2005-06-23T11:53:37+12:00 (19 years ago)

Author:

mdewsnip

Message:

Fixed a bug where folder-level metadata would be shown on any folder whose name started with the name of the folder the metadata was originally assigned to. For example, metadata assigned to folder "test" would also be shown to be assigned to folders "test2", "testblah" etc.

Thanks to Papadimitropoulos Petros for reporting this.

File:

• trunk/gli/src/org/greenstone/gatherer/metadata/MetadataXMLFileManager.java (modified) (1 diff)

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

@@ -171 +171 @@
 
     // Look at each loaded metadata.xml file to see if it is potentially applicable
-    File file_directory = (file.isDirectory() ? file : file.getParentFile());
+    String file_directory_path = (file.isDirectory() ? file : file.getParentFile()).getAbsolutePath() + File.separator;
     for (int i = 0; i < metadata_xml_files.size(); i++) {
         MetadataXMLFile metadata_xml_file = (MetadataXMLFile) metadata_xml_files.get(i);
 
         // This metadata.xml file is only potentially applicable if it is above or at the same level as the file
-        if (file_directory.getAbsolutePath().startsWith(metadata_xml_file.getParentFile().getAbsolutePath())) {
+        if (file_directory_path.startsWith(metadata_xml_file.getParentFile().getAbsolutePath() + File.separator)) {
         applicable_metadata_xml_files.add(metadata_xml_file);
         }