Changeset 6156

Timestamp:

2003-12-08T14:32:35+13:00 (20 years ago)

Author:

jmt12

Message:

Added functionality (but haven't enabled it) to hide extracted metadata elements if only folders selected - which never have extracted metadata

File:

• trunk/gli/src/org/greenstone/gatherer/gui/table/GTableModel.java (modified) (4 diffs)

trunk/gli/src/org/greenstone/gatherer/gui/table/GTableModel.java

@@ -307 +307 @@
     /** Determine if the given metadata is common to all selected file nodes given the context of the current view. */
    public boolean isCommon(Metadata entry) {
-      return (entry.getCount() >= file_nodes.length);
+      return (file_nodes != null && entry.getCount() >= file_nodes.length);
    }
 
@@ -337 +337 @@
         }
 
+        boolean have_encountered_file = false;
+
         ///ystem.err.println("\nBuilding metadata model...");
         Vector elements = Gatherer.c_man.getCollection().msm.getElements();
@@ -344 +346 @@
         for (int i = 0; i < file_nodes.length && !killed; i++) {
         File current_file = file_nodes[i].getFile();
+        have_encountered_file = have_encountered_file || current_file.isFile();
         ///ystem.err.println("File " + i + " (of " + file_nodes.length + "): " + current_file);
 
@@ -393 +396 @@
         ///ystem.err.println("Element: " + element);
 
-        // If we haven't seen this metadata element, add it now
-        if (!known_elements.contains(element)) {
+        // If we haven't seen this metadata element, and conditional on the fact that if it is extracted, we have seen at least one file, then add it now
+        //System.err.println("Element name = " + element);
+        //System.err.println("Element extracted = " + element.isExtracted());
+        //System.err.println("have_encountered_files = " + have_encountered_file);
+        if (!known_elements.contains(element)) { // && (!element.isExtracted() || have_encountered_file)) {
             Metadata metadatum = new Metadata(element);
             metadatum.setCount(file_nodes.length);