Changeset 4466 for trunk/gli

Timestamp:

2003-06-03T16:27:12+12:00 (21 years ago)

Author:

jmt12

Message:

2030093: CustomAZList now has valueIsAdjusting() to stop inifinite loops, and only adds hidden range metadata to files/folders which have the ranged metadata set. Having tested this works if the user appends new metadata.

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/custom/CustomAZList.java (modified) (3 diffs)

trunk/gli/src/org/greenstone/gatherer/cdm/custom/CustomAZList.java

@@ -90 +90 @@
     /** An array of togglebuttons showing what separations are available. */
     private JToggleButton separators[] = null;
+    /** A reference to the progress dialog if it exists. */
+    private ProgressDialog pd = null;
     /** A private dictionary for this custom classifier. */
     private ResourceBundle dictionary = null;
@@ -601 +603 @@
     // 33% - Allocation of metadata to records, 33 / <number of files>.
     // Hopefully the previous dialog should have already vanished (its dispose() caused by the process click).
-    ProgressDialog pd = new ProgressDialog("Custom Classifier Creation", "Preparing for operation.");
+    pd = new ProgressDialog("Custom Classifier Creation", "Preparing for operation.");
     // Step 1: Create the new dummy element and add it if necessary.
     pd.setText("Creating dummy metadata element.");
@@ -652 +654 @@
     // Step 5: Recurse the entire tree, adding the appropriate values where necessary (overwriting any existing value for this element).
     pd.setText("Allocating metadata to records.");
-    int document_count = gatherer.c_man.getCollection().getDocumentCount();
+    int count = gatherer.c_man.getCollection().getCount();
     TreeModel record_tree = gatherer.c_man.getRecordSet();
     FileNode records[] = ArrayTools.add(null, (FileNode)record_tree.getRoot());
     while(records != null) {
-        if(records[0].isLeaf()) {
-        addMetadata(0L, records[0], element);
-        // Each iteration.
-        pd.increase(1, document_count, 50);
-        }
-        else {
+        FileNode current_record = records[0];
+        // There is no point in assigning hidden metadata to a file node we doesn't have any of that metadata set...
+        ArrayList current_metadatum = Gatherer.c_man.getCollection().gdm.getMetadata(current_record.getFile());
+        for(int z = 0; z < current_metadatum.size(); z++) {
+        Metadata current_metadata = (Metadata) current_metadatum.get(z);
+        if(current_metadata.getElement().equals(element) && current_metadata.isFileLevel()) {
+            ///ystem.err.println("The file " + current_record + " has previous " + element + " metadata in: " + current_metadata);
+            addMetadata(0L, current_record, element);
+        }
+        }
+        if(!current_record.isLeaf()) {
         // Add all children to records at once hopefully.
-        FileNode children[] = new FileNode[records[0].getChildCount()];
+        FileNode children[] = new FileNode[current_record.getChildCount()];
         for(int i = 0; i < children.length; i++) {
-            children[i] = (FileNode) records[0].getChildAt(i);
+            children[i] = (FileNode) current_record.getChildAt(i);
         }
         records = ArrayTools.add(records, children);
         }
         records = ArrayTools.tail(records);
+        pd.increase(1, count, 50);
     }
     // Step 6: Done.
     pd.dispose();
-    }
+    pd = null;
+    }
+
+    public boolean valueIsAdjusting() {
+    return (pd == null);
+    }
+
     /** A dialog window used to show the progress of processing the file records in terms of adding hidden metadata. */
     private class ProgressDialog