Changeset 10690

Timestamp:

2005-10-05T14:28:14+13:00 (18 years ago)

Author:

mdewsnip

Message:

Replaced a silly and slow (especially with Java 1.5) way of finding metadata.xml files with a much smaller and faster way.

File:

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

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

@@ -143 +143 @@
     File directory = (file.isDirectory() ? file : file.getParentFile());
     while (directory != null) {
-        File[] directory_files = directory.listFiles();
-        for (int i = 0; i < directory_files.length; i++) {
-        File child_file = directory_files[i];
-        if (!child_file.isDirectory() && child_file.getName().equals("metadata.xml")) {
-            // It is very important that shallower files come before deeper ones
-            applicable_metadata_xml_files.add(0, new MetadataXMLFile(child_file.getAbsolutePath()));
-        }
+        File metadata_xml_file = new File(directory, "metadata.xml");
+        if (metadata_xml_file.exists() && !metadata_xml_file.isDirectory()) {
+        // It is very important that shallower files come before deeper ones
+        applicable_metadata_xml_files.add(0, new MetadataXMLFile(metadata_xml_file.getAbsolutePath()));
         }