Changeset 4319

Timestamp:

2003-05-23T16:40:57+12:00 (21 years ago)

Author:

jmt12

Message:

bug fix

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• gui/NewCollectionDetailsPrompt.java (modified) (1 diff)
• msm/GreenstoneArchiveParser.java (modified) (2 diffs)
• valuetree/GValueModel.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/gui/NewCollectionDetailsPrompt.java

@@ -183 +183 @@
           base_collection_pane.add(base_collection_label, BorderLayout.NORTH);
           base_collection_pane.add(base_collection, BorderLayout.CENTER);
-          base_collection_pane.add(base_collection_browse, BorderLayout.EAST);
+          //base_collection_pane.add(base_collection_browse, BorderLayout.EAST);
 
           center_pane.setBorder(BorderFactory.createEmptyBorder(5,0,5,0));

trunk/gli/src/org/greenstone/gatherer/msm/GreenstoneArchiveParser.java

@@ -61 +61 @@
 
      public GreenstoneArchiveParser(GShellProgressMonitor progress, GShell shell) {
-          this.shell = shell;
-          // Determine the collection archive directory.
-          File archive_directory = new File(Gatherer.c_man.getCollectionArchive());
-          // For each of the hash coded directories within.
-          File document_directories[] = archive_directory.listFiles();
-          for(int i = 0; i < document_directories.length; i++) {
-                // Find the doc.xml file within
-                if(document_directories[i].isDirectory()) {
-                     File document_file = new File(document_directories[i], "doc.xml");
-                     // Then extract the metadata from it.
-                     if(document_file.exists()) {
-                          extractMetadata(document_file);
-                          // Display a pretty progress message.
-                          shell.fireMessage(GShell.IMPORT, shell.typeAsString(GShell.IMPORT) + "> " + Gatherer.dictionary.get("GShell.Extracted", document_directories[i].getName()), GShell.OK);
-                          progress.increment();
+          // We can only extract metadata if an extracted metadata set exists in our collection.
+          if(Gatherer.c_man.msm.getSet("") != null) {
+                this.shell = shell;
+                // Determine the collection archive directory.
+                File archive_directory = new File(Gatherer.c_man.getCollectionArchive());
+                // For each of the hash coded directories within.
+                File document_directories[] = archive_directory.listFiles();
+                for(int i = 0; i < document_directories.length; i++) {
+                     // Find the doc.xml file within
+                     if(document_directories[i].isDirectory()) {
+                          File document_file = new File(document_directories[i], "doc.xml");
+                          // Then extract the metadata from it.
+                          if(document_file.exists()) {
+                                extractMetadata(document_file);
+                                // Display a pretty progress message.
+                                shell.fireMessage(GShell.IMPORT, shell.typeAsString(GShell.IMPORT) + "> " + Gatherer.dictionary.get("GShell.Extracted", document_directories[i].getName()), GShell.OK);
+                                progress.increment();
+                          }
                      }
                 }
@@ -112 +115 @@
                                      ElementWrapper element = Gatherer.c_man.msm.getElement(name);
                                      if(element == null) {
-                                          MetadataSet greenstone_mds = Gatherer.c_man.msm.getSet("");
-                                          element = greenstone_mds.addElement(name);
+                                          MetadataSet extracted_mds = Gatherer.c_man.msm.getSet("ex");
+                                          element = extracted_mds.addElement(name);
                                      }
                                      // If we successfully retrieved an element (and we should have) we can continue.

trunk/gli/src/org/greenstone/gatherer/valuetree/GValueModel.java

@@ -195 +195 @@
      public boolean isHierarchy() {
           boolean result = false;
+          // We are a hierarchy if our element says so....
+          if(element.isHierarchy()) {
+                return true;
+          }
+          // Or if our children are actually a hierarchy.
           for(int i = 0; i < root.getChildCount() && !result; i++) {
                 GValueNode node = (GValueNode) root.getChildAt(i);