Changeset 7960

Timestamp:

2004-08-16T22:38:03+12:00 (20 years ago)

Author:

davidb

Message:

Improvements to remoteRun code to catch and respond to errors better.

File:

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

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

@@ -47 +47 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
+import org.greenstone.gatherer.cdm.CollectionConfiguration;
+import org.greenstone.gatherer.cdm.CollectionDesignManager;
+import org.greenstone.gatherer.cdm.CollectionMetaManager;
+import org.greenstone.gatherer.cdm.CollectionMeta;
 import org.greenstone.gatherer.msm.GreenstoneArchiveParser;
 import org.greenstone.gatherer.shell.GShellListener;
@@ -204 +208 @@
     }
 
+
+    protected int check_for_error(String line, StringBuffer error_list, 
+                  int error_count)
+    {
+    if (line.startsWith("ERROR:")) {
+        error_count++;
+        if (error_count<10) {
+        error_list.append(line);
+        }
+        else if (error_count==10) {
+        error_list.append("...\n");
+        }
+    }
+    return error_count;
+    }
+        
+
     protected void runRemote(String[] args, BufferedOutputStream bos) 
     {
@@ -254 +275 @@
         URLConnection launch_connection = launch_url.openConnection();
         InputStream stdis = launch_connection.getInputStream();
-        InputStreamReader stdisr = new InputStreamReader(stdis, "UTF-8"  );
+        InputStreamReader stdisr = new InputStreamReader(stdis, "UTF-8");
     
         BufferedReader stdbr = new BufferedReader(stdisr);
     
+        StringBuffer error_list = new StringBuffer();
+        int error_count = 0;
+
         if (type == GShell.NEW) {
         while(true) {
             String line = stdbr.readLine();
             if (line == null) { break; }
-        }       
+            error_count = check_for_error(line,error_list,error_count);
+        }
         }
         else {
@@ -268 +293 @@
             String line = stdbr.readLine();
             if (line == null) { break; }
+            error_count = check_for_error(line,error_list,error_count);
             fireMessage(type, typeAsString(type) + "> " + line, status, bos);
         }       
@@ -273 +299 @@
         stdbr.close();
     
-        status = OK;
-        fireMessage(type, typeAsString(type) + "> " + Dictionary.get("GShell.Success"), status, null);
+        if (error_count>0) {
+        status = ERROR;
+        System.err.println(error_list);
+        if (type != GShell.NEW) {
+            fireMessage(type, typeAsString(type) + "> " + error_list, status, null);
+        }
+        }
+        else {
+        status = OK;
+        fireMessage(type, typeAsString(type) + "> " + Dictionary.get("GShell.Success"), status, null);
+        }
+
+
     }
     // Exception
     catch (Exception exception) {
-        Gatherer.println("Exception in GShell.runRemove() - unexpected");
+        System.err.println("Exception in GShell.runRemote() - unexpected");
         Gatherer.printStackTrace(exception);
         status = ERROR;
@@ -302 +339 @@
         InputStreamReader eisr = new InputStreamReader( prcs.getErrorStream(), "UTF-8" );
         InputStreamReader stdisr = new InputStreamReader( prcs.getInputStream(), "UTF-8"  );
-        //BufferedReader ebr = new BufferedReader( eisr );
-        //BufferedReader stdinbr = new BufferedReader( stdinisr );
-        // Captures the std err of a program and pipes it into std in of java
     
         StringBuffer eline_buffer = new StringBuffer();
@@ -438 +472 @@
         Utility.zipup(col_name,Utility.CONFIG_FILE);
         Utility.upload_url_zip(col_name,"etc");
+
+
+        String col_dir = Utility.getCollectDir(Gatherer.config.gsdl_path);
+
+        File img_dir = new File(Utility.getImagesDir(col_dir));
+        if (img_dir.exists()) {
+            // upload images/ directory to server
+            Utility.zipup(col_name,"images");
+            Utility.upload_url_zip(col_name,"images");
+        }
+
+        // see if collection specific image needs uploading
+        CollectionMetaManager cmm 
+            = CollectionDesignManager.collectionmeta_manager;
+
+        CollectionMeta icon_collection_collectionmeta 
+            = cmm.getMetadatum(CollectionConfiguration.COLLECTIONMETADATA_ICONCOLLECTION_STR);
+        CollectionMeta icon_collection_small_collectionmeta 
+            = cmm.getMetadatum(CollectionConfiguration.COLLECTIONMETADATA_ICONCOLLECTIONSMALL_STR);
+
+        String ics_text = icon_collection_collectionmeta.getValue(CollectionMeta.TEXT);
+        String icsc_text = icon_collection_small_collectionmeta.getValue(CollectionMeta.TEXT);
+        if ((ics_text != null) && (ics_text != "")) {
+            // Stub code for detecting when collectoin image changed
+            // => need to upload images
+            // System.err.println("**** ics_text = " + ics_text);
+        }
+
 
         if (progress!=null) {