Changeset 9202

Timestamp:

2005-02-28T10:29:08+13:00 (19 years ago)

Author:

mdewsnip

Message:

More GLI applet improvements, by Matthew Whyte. Now uploads only metadata when only metadata has been changed, and only the source files when only the source files have been changed.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• GathererApplet.java (modified) (4 diffs)
• cdm/CollectionDesignManager.java (modified) (1 diff)
• shell/GShell.java (modified) (3 diffs)
• util/Unzip.java (modified) (1 diff)
• util/Utility.java (modified) (7 diffs)

trunk/gli/src/org/greenstone/gatherer/GathererApplet.java

@@ -259 +259 @@
         error.printStackTrace();
     }
-    }
-
-
-    static public void upload_url_zip(String col_name, String dir, GShell source)
+    DebugStream.println("Exited download_url_zip"); //debug
+    }
+
+
+    static public void upload_url_zip(String col_name, String dir, String delete_type, GShell source)
     {
     final String lineEnd = "\r\n";
@@ -278 +279 @@
         // Send zip file to server
 
-        File file = new File(zip_fname) ;       
+        File file = new File(zip_fname) ;
+        
         FileInputStream fileInputStream = new FileInputStream(file);
         
@@ -309 +311 @@
     
         dos.writeBytes(twoHyphens + boundary + lineEnd);
+        dos.writeBytes("Content-Disposition: form-data; name=\"del\"" + lineEnd + lineEnd);
+        dos.writeBytes(delete_type + lineEnd);  
+        System.err.println("**** del="+delete_type);
+
+        dos.writeBytes(twoHyphens + boundary + lineEnd);
         dos.writeBytes("Content-Disposition: form-data; name=\"zip\";"
                + " filename=\"" + zip_fname +"\"" + lineEnd);
@@ -314 +321 @@
         System.err.println("**** zip (filename)="+zip_fname);
                 
+
+
         // create a buffer of maximum size                  
         int bytesAvailable = fileInputStream.available();

trunk/gli/src/org/greenstone/gatherer/cdm/CollectionDesignManager.java

@@ -217 +217 @@
         // upload etc/collect.cfg to server to reflect changes
         Utility.zipup(Gatherer.getCollectDirectoryPath(), collection_name, Utility.CONFIG_FILE, null, "", "");
-        GathererApplet.upload_url_zip(collection_name, "etc", null);
+        GathererApplet.upload_url_zip(collection_name, "etc", "", null);
         }
     }

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

@@ -241 +241 @@
         String collect_directory_path = Gatherer.getCollectDirectoryPath();
         
-        //Only upload the import directory if the files or metadata has changed.
-        System.err.println("getFilesChanged(): " + Gatherer.c_man.getCollection().getFilesChanged());
-        System.err.println("getMetadataChanged(): " + Gatherer.c_man.getCollection().getMetadataChanged());
-        if(Gatherer.c_man.getCollection().getFilesChanged() || Gatherer.c_man.getCollection().getMetadataChanged()) {
-            // zip up import folder
-            Utility.zipup(collect_directory_path, col_name, "import", this, "", "");
-            System.err.println("collect_directory_path: " + collect_directory_path);
-            System.err.println("col_name: " + col_name);
+        //Only upload the parts of the import folder (files/metadata) that has been changed.
+        if(Gatherer.c_man.getCollection().getFilesChanged()) {
+            // zip up import folder, but exclude metadata
+            Utility.zipup(collect_directory_path, col_name, "import", this, "", ".*metadata\\.xml");
 
             if(hasSignalledStop()) { return; }
             // upload it to gsdl server
-            GathererApplet.upload_url_zip(col_name, "import", this);
+            GathererApplet.upload_url_zip(col_name, "import", "files", this);
 
             Gatherer.c_man.getCollection().setFilesChanged(false);
+            System.err.println("Finished uploading files");
+        }
+        if(Gatherer.c_man.getCollection().getMetadataChanged()) {
+            // zip up metadata from import folder
+            Utility.zipup(collect_directory_path, col_name, "import", this, ".*metadata\\.xml", "");
+
+            if(hasSignalledStop()) { return; }
+            // upload it to gsdl server
+            GathererApplet.upload_url_zip(col_name, "import", "metadata", this);
             Gatherer.c_man.getCollection().setMetadataChanged(false);
+            System.err.println("Finished uploading metadata.");
         }
         
@@ -263 +269 @@
 
         if(hasSignalledStop()) { return; }
-        GathererApplet.upload_url_zip(col_name, "etc", this);
+        GathererApplet.upload_url_zip(col_name, "etc", "", this);
 
         String collection_directory_path = Gatherer.c_man.getCollectionDirectoryPath(col_name);
@@ -273 +279 @@
 
             if(hasSignalledStop()) { return; }
-            GathererApplet.upload_url_zip(col_name, "images", this);            
+            GathererApplet.upload_url_zip(col_name, "images", "", this);
+
+            System.err.println("collect_directory_path: " + collect_directory_path);
+            System.err.println("col_name: " + col_name);
         }
 

trunk/gli/src/org/greenstone/gatherer/util/Unzip.java

@@ -103 +103 @@
     } 
     catch (IOException ioe) {
-        System.err.println("Unhandled exception:");
+        System.err.println("Unhandled exception on " + args[1]);
         ioe.printStackTrace();
         return;

trunk/gli/src/org/greenstone/gatherer/util/Utility.java

@@ -71 +71 @@
     static final public int BUFFER_SIZE = FACTOR * 1024;
     /** Definition of an important directory name, in this case the base dir, or the working directory of the Gatherer. */
-    /** The regular expression that marks if we only want doc.xml files. Will this work in Windows?? --Matthew */
-    static final public String METADATA_ONLY_EXPR = "\".*" + File.separator + "doc\\.xml\"";
 
     static public String BASE_DIR  = System.getProperty("user.dir") + File.separator;
@@ -627 +625 @@
     if((reject_expr != "") && (file_path.matches(reject_expr))) {
         // matches reject expression
-        DebugStream.println("File \'" + file_path + "\' matches the reject expression \'" + reject_expr + "\'");
+        //DebugStream.println("File \'" + file_path + "\' matches the reject expression \'" + reject_expr + "\'");
         return encountered_file;
     }
@@ -633 +631 @@
     if ((accept_expr != "") && (!file_path.matches(accept_expr))) {
         // does not match accept expression
-        DebugStream.println("File \'" + file_path + "\' doesn't match accept expression \'" + accept_expr + "\'");
+        //DebugStream.println("File \'" + file_path + "\' doesn't match accept expression \'" + accept_expr + "\'");
         return encountered_file;
     }
@@ -639 +637 @@
     //Special case: we only want the metadata. Parse the xml files.
     if(accept_expr.compareTo(".*doc.xml") == 0) {
-        System.err.println("Only want to get metadata"); //debug
+        DebugStream.println("Only want to get metadata");
         Document old_document = XMLTools.parseXMLFile(new File(file_path));
         NodeList content = old_document.getElementsByTagName("Content");
@@ -719 +717 @@
     static protected boolean dirFunc (ZipOutputStream zos, String dir_name, int prefix_strip, GShell source, boolean encountered_file, String accept_expr, String reject_expr) 
     {
-    /*
-    if (reject_expr != "" && (dir_name.matches(reject_expr))) {
-        // matches reject expression
-        System.err.println("matches reject expression");
-        return encountered_file;
-    }
-    
-    if ((accept_expr != "") && (!dir_name.matches(accept_expr))) {
-        // does not match accept expression
-        System.err.println("doesn't match accept expression");
-        return encountered_file;
-    }
-    */
-
     File dirObj = new File(dir_name);
 
@@ -859 +843 @@
 
         if (zipentry.isDirectory()) {
-            // Create named directory
-            boolean success = (new File(zentryname)).mkdir();
-            if (!success) {
-            System.err.println("Error: unable to create directory '"+zentryname+"'");
+            if(!file.exists()) {
+            // Create named directory, if it doesn't already exist.
+            boolean success = (file.mkdir());
+            if (!success) {
+                System.err.println("Error: unable to create directory '"+zentryname+"'");
+            }
             }
         }
@@ -894 +880 @@
     catch (ZipException error) {
         System.err.println("Error: Unable to open '"+zip_fname+"'");
+        System.err.println("This maybe caused by the zip file being empty.");
         DebugStream.printStackTrace(error);
     }