Changeset 5836

Timestamp:

2003-11-13T14:37:58+13:00 (20 years ago)

Author:

kjdon

Message:

searchForMEtadata(file) now returns true if successful, not true if cancelled

File:

• trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -1360 +1360 @@
     }
 
-     private boolean searchForMetadata(File current_file) {
-       boolean cancelled = false;
+    /** now this returns true if successful, false if unsuccessful or cancelled */
+    private boolean searchForMetadata(File current_file) {
+    boolean success = true;
        if(current_file.isFile() && current_file.getName().equals(Utility.METADATA_XML)) {
-           cancelled = collection.msm.searchForMetadata(null, new FileNode(current_file), false, true); // A dummy run only.
+           success = collection.msm.searchForMetadata(null, new FileNode(current_file), false, true); // A dummy run only.
        }
        else {
            File[] children_files = current_file.listFiles();
-           for(int i = 0; !cancelled && children_files != null && i < children_files.length; i++) {
-               cancelled = searchForMetadata(children_files[i]);
+           for(int i = 0; success && children_files != null && i < children_files.length; i++) {
+               success = searchForMetadata(children_files[i]);
            }
        }
-       return cancelled;
+       return success;
      }