Changeset 18360 for gli

Timestamp:

2009-01-12T11:18:49+13:00 (15 years ago)

Author:

kjdon

Message:

updated the rtl-gli branch with files from trunk. Result of a merge 14807:18318

Location:

gli/branches/rtl-gli/src/org/greenstone/gatherer/shell

Files:

• GImportProgressMonitor.java (modified) (2 diffs)
• GScheduleProgressMonitor.java (copied) (copied from gli/trunk/src/org/greenstone/gatherer/shell/GScheduleProgressMonitor.java )
• GShell.java (modified) (14 diffs)

gli/branches/rtl-gli/src/org/greenstone/gatherer/shell/GImportProgressMonitor.java

@@ -110 +110 @@
     /** The element name of a file not recognised. */
     static final private String NONRECOGNISEDFILE_ELEMENT = "NonRecognisedFile";
+    /** The element name of a Warning message */
+    static final private String WARNING_ELEMENT = "Warning";
     /** The element name of a BadArgument message */
     static final private String BADARGUMENT_ELEMENT = "BadArgument";
@@ -315 +317 @@
         }
         }
+        else if (name.equals(WARNING_ELEMENT)) {
+        if(Configuration.getMode() <= threshold) {
+            String args[] = new String[1];
+            args[0] = element.getAttribute(PLUGIN_ATTRIBUTE);
+            String reason = element.getAttribute(REASON_ATTRIBUTE);
+            queue.add(new GShellEvent(event.getSource(), 0, event.getType(), Dictionary.get("GShell.Import.Warning", args) + " " + reason, event.getStatus()));
+            args = null;
+        }
+        }
+        
+        
         // Or the import complete element
         else if(name.equals(IMPORTCOMPLETE_ELEMENT)) {

gli/branches/rtl-gli/src/org/greenstone/gatherer/shell/GShell.java

@@ -89 +89 @@
     static final public int CONVERT = 5;
     static final public int EXPLODE = 6;
+    static final public int SRCREPLACE = 7; // for replacing source docs with their html
+    static final public int SCHEDULE = 8;
 
     /** Elements in status type enumeration. */
@@ -103 +105 @@
     static public String GSHELL_CONVERT = "gshell_convert";
     static public String GSHELL_EXPLODE = "gshell_explode";
+    static public String GSHELL_SRCREPLACE = "gshell_srcreplace"; // for replacing source docs with their html versions
+    static public String GSHELL_SCHEDULE = "gshell_schedule"; 
 
     /** Determine if the given process is still executing. It does this by attempting to throw an exception - not the most efficient way, but the only one as far as I know
@@ -165 +169 @@
         if(line_buffer.length() > 0) {
         String line = line_buffer.toString();
-        // DebugStream.println("* " + line + " *");
+        // DebugStream.println("* " + line + " *");     
         fireMessage(type, typeAsString(type) + "> " + line, status, bos);
         line_buffer = new StringBuffer();
@@ -191 +195 @@
         String collection_name = args[args.length - 1];
         System.err.println("Collection name: " + collection_name);
+
 
         String script_args = "";
@@ -212 +217 @@
         System.err.println("Script args: " + script_args);
         buffered_output_stream = bos;
-        String command_output = RemoteGreenstoneServer.runScript(collection_name, script_name, script_args, this);
+        String command_output = Gatherer.remoteGreenstoneServer.runScript(collection_name, script_name, script_args, this);
         status = (command_output.equals("") ? CANCELLED : OK);
     }
@@ -235 +240 @@
         Runtime rt = Runtime.getRuntime();
         Process prcs = null;
-        if (Utility.isWindows()){
-        prcs = rt.exec(args);
-        }else{
-        prcs = rt.exec(command);
-        }
+      
+        prcs = rt.exec(args);
+        // If we used single argument exec, spaces in filenames or paths cause problems
+        // I.e. better to avoid: prcs = rt.exec(command);
         
         InputStreamReader eisr = new InputStreamReader( prcs.getErrorStream(), "UTF-8" );
-        InputStreamReader stdisr = new InputStreamReader( prcs.getInputStream(), "UTF-8"  );
+        InputStreamReader stdisr = new InputStreamReader( prcs.getInputStream(), "UTF-8"  );        
     
         StringBuffer eline_buffer = new StringBuffer();
@@ -260 +264 @@
             sleep(100);
             }
-            catch(Exception exception) {
+            catch(Exception exception) {         
             }
         }
@@ -344 +348 @@
     String out_name = null;
     BufferedOutputStream bos = null;
-    if(type == IMPORT || type == BUILD) {
+    if(type == IMPORT || type == BUILD || type == SCHEDULE) {
         if(type == IMPORT) {
         out_name = (String) Gatherer.c_man.getCollection().import_options.getValue("out");
         }
-        else {
+        else if(type == BUILD) {
         out_name = (String) Gatherer.c_man.getCollection().build_options.getValue("out");
+        }
+        else { // SCHEDULE
+        out_name = (String) Gatherer.c_man.getCollection().schedule_options.getValue("out"); 
         }
         if(out_name != null && out_name.length() > 0) {
@@ -376 +383 @@
         if (type == NEW) {
         if (Gatherer.isGsdlRemote) {
-            RemoteGreenstoneServer.downloadCollection(col_name);
+            Gatherer.remoteGreenstoneServer.downloadCollection(col_name);
         }
         }
@@ -388 +395 @@
             }
 
-            RemoteGreenstoneServer.downloadCollectionArchives(col_name);
+            Gatherer.remoteGreenstoneServer.downloadCollectionArchives(col_name);
 
             if (progress!=null) {
@@ -398 +405 @@
         fireMessage(type, typeAsString(type) + "> " + Dictionary.get("GShell.Parsing_Metadata_Start"), status, null);
         DocXMLFileManager.clearDocXMLFiles();
-        DocXMLFileManager.loadDocXMLFiles(new File(CollectionManager.getLoadedCollectionArchivesDirectoryPath()));
+        if (Configuration.fedora_info.isActive()) { // FLI case
+            File collection_export_directory = new File(CollectionManager.getLoadedCollectionExportDirectoryPath());
+            DocXMLFileManager.loadDocXMLFiles(collection_export_directory,"docmets.xml");
+        }
+        else {
+            File collection_archives_directory = new File(CollectionManager.getLoadedCollectionArchivesDirectoryPath());
+            DocXMLFileManager.loadDocXMLFiles(collection_archives_directory,"doc.xml");
+        }
+
+
         fireMessage(type, typeAsString(type) + "> " + Dictionary.get("GShell.Parsing_Metadata_Complete"), status, null);
         }
@@ -404 +420 @@
         else if(type == BUILD) {
         // download the building directory (if gsdl server is remote)
-        if (Gatherer.isGsdlRemote) {
+        if ((Gatherer.isGsdlRemote) && (!Configuration.fedora_info.isActive())) {
             if (progress!=null) {
             progress.messageOnProgressBar("Downloading index data from server");
             }
-            
+                        
             if (!Gatherer.GS3){
             // Only need to download build.cfg file
             File build_cfg_file = new File(CollectionManager.getLoadedCollectionBuildingDirectoryPath(), "build.cfg");
-            RemoteGreenstoneServer.downloadCollectionFile(col_name, build_cfg_file);
+            Gatherer.remoteGreenstoneServer.downloadCollectionFile(col_name, build_cfg_file);
             }else{
             // Only need to download buildConfig.xml file
             File buildConfig_xml_file = new File(CollectionManager.getLoadedCollectionBuildingDirectoryPath(), "buildConfig.xml");
-            RemoteGreenstoneServer.downloadCollectionFile(col_name, buildConfig_xml_file);
+            Gatherer.remoteGreenstoneServer.downloadCollectionFile(col_name, buildConfig_xml_file);
             }
 
@@ -545 +561 @@
         concerned = null;
     }
+    
+    String msg = "";
+    // If we are creating collection and have trouble with permissions, we need more messages
+    if(status == ERROR && type == GShell.NEW){
+      msg = args[args.length-1];
+    }
     // And firing off an event
-    GShellEvent event = new GShellEvent(this, 0, type, "", status);
+    GShellEvent event = new GShellEvent(this, 0, type, msg, status);
     Object[] concerned = listeners.getListenerList();
     for(int i = 0; i < concerned.length ; i++) {
@@ -597 +619 @@
         name = "explode_metadata_database.pl";
         break;
+    case SRCREPLACE: // To work with replace_srcdoc_with_html.pl
+        name = "replace_srcdoc_with_html.pl";
+        break;
+    case SCHEDULE:
+        name = "schedule.pl";
+        break; 
     default:
         name = "";