Changeset 7511 for trunk/gli/src

Timestamp:

2004-05-31T16:11:18+12:00 (20 years ago)

Author:

kjdon

Message:

now only show extracted metadata if there is a value there. needed to modify the selectClosestMetadataWhenBuildingComplete method to choose the first one if the desired one isn't there

File:

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

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

@@ -200 +200 @@
         // Ensure the position is within the current metadata
         if (i >= current_metadata.size()) {
-            i = current_metadata.size() - 1;
-        }
-
-        // Select the same row as before, except if it would select a different element
+        i = current_metadata.size() - 1;
+        }
+
+        // Select the same row as before, except if it would select a different element - in which case select the first element
         ElementWrapper element = metadatum.getElement();
         if(i < 0) {
         Gatherer.println("Could not find suitable row to select!");
-        return;
-        }
-        Metadata newly_selected_metadatum = (Metadata) current_metadata.get(i);
-        if (!newly_selected_metadatum.getElement().equals(element)) {
-        // Try one row previous
-        i--;
-        if(i < 0) {
-            Gatherer.println("Could not find suitable row to select!");
-            return;
-        }
-
-        newly_selected_metadatum = (Metadata) current_metadata.get(i);
+        i=0; // select the first one
+        //return;
+        } else {
+        Metadata newly_selected_metadatum = (Metadata) current_metadata.get(i);
         if (!newly_selected_metadatum.getElement().equals(element)) {
-            Gatherer.println("Could not find suitable row to select!");
-            return;
+            // Try one row previous
+            i--;
+            if(i < 0) {
+            Gatherer.println("Could not find suitable row to select!");
+            i=0;
+            //return;
+            } else {
+            
+            newly_selected_metadatum = (Metadata) current_metadata.get(i);
+            if (!newly_selected_metadatum.getElement().equals(element)) {
+                Gatherer.println("Could not find suitable row to select!");
+                i=0;
+                //return;
+            }
+            }
         }
         }
@@ -399 +404 @@
         ///ystem.err.println("Element: " + 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)) {
+        // If we haven't seen this metadata element, and if it is not 
+        // extracted, add it now
+        if (!known_elements.contains(element) && !element.isExtracted() ) { 
             Metadata metadatum = new Metadata(element);
             metadatum.setCount(file_nodes.length);