Changeset 8313 for trunk/gli/src/org/greenstone/gatherer/shell/GShell.java

Timestamp:

2004-10-13T14:48:20+13:00 (20 years ago)

Author:

mdewsnip

Message:

Finally committing the (many) changes to the GLI to use the new metadata code... I hope this doesn't have too many bugs in it and committing it now doesn't stuff anyone up! (Katherine said I could commit it, so blame her if anything goes wrong).

File:

• trunk/gli/src/org/greenstone/gatherer/shell/GShell.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/shell/GShell.java

@@ -53 +53 @@
 import org.greenstone.gatherer.cdm.CollectionMetaManager;
 import org.greenstone.gatherer.cdm.CollectionMeta;
-import org.greenstone.gatherer.msm.GreenstoneArchiveParser;
+import org.greenstone.gatherer.metadata.DocXMLFileManager;
 import org.greenstone.gatherer.util.StaticStrings; 
 import org.greenstone.gatherer.util.Utility;
@@ -542 +542 @@
         }
 
-        // extract any new metadata from the archive directory.
+        // Refresh the DocXMLFileManager
         fireMessage(type, typeAsString(type) + "> " + Dictionary.get("GShell.Parsing_Metadata_Start"), status, null);
-        new GreenstoneArchiveParser(progress, this);
+        DocXMLFileManager.clearDocXMLFiles();
+        DocXMLFileManager.loadDocXMLFiles(new File(Gatherer.c_man.getCollectionArchive()));
         fireMessage(type, typeAsString(type) + "> " + Dictionary.get("GShell.Parsing_Metadata_Complete"), status, null);
         }
 
-        else if(type == BUILD) {
+//      else if(type == BUILD) {
         
-        // download the building directory (if gsdl server is remote)           
-        if (Gatherer.isGsdlRemote) {
-            if (progress!=null) {
-            progress.messageOnProgressBar("Downloading index data from server");
-            }
-
-            Utility.delete(Gatherer.c_man.getCollectionBuild()); // remove current build dir
-            GathererApplet.download_url_zip(col_name,"building");
-            Utility.unzip(col_name);
-
-            if (progress!=null) {
-            progress.messageOnProgressBar("");
-            }
-
-        }
-
-        }
+//      // download the building directory (if gsdl server is remote)           
+//      if (Gatherer.isGsdlRemote) {
+//          if (progress!=null) {
+//          progress.messageOnProgressBar("Downloading index data from server");
+//          }
+
+//          Utility.delete(Gatherer.c_man.getCollectionBuild()); // remove current build dir
+//          GathererApplet.download_url_zip(col_name,"building");
+//          Utility.unzip(col_name);
+
+//          if (progress!=null) {
+//          progress.messageOnProgressBar("");
+//          }
+
+//      }
+
+//      }
     }