Changeset 8250

Timestamp:

2004-10-08T14:33:22+13:00 (20 years ago)

Author:

mdewsnip

Message:

Moved the download_url_zip and upload_url_zip functions from Utility into GathererApplet, since they depend on the Gatherer class.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• GathererApplet.java (modified) (1 diff)
• cdm/CollectionDesignManager.java (modified) (2 diffs)
• shell/GShell.java (modified) (6 diffs)
• util/Utility.java (modified) (1 diff)

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

@@ -211 +211 @@
     gatherer.run(size, splash, g_man);
     }
+
+
+    static public void download_url_zip(String col_name, String dir)
+    {
+    try {
+        String download_cgi  = Gatherer.cgiBase + "download";
+
+        // Send col_name and dir arguments to download cgi
+
+        String col_name_encoded = URLEncoder.encode(col_name,"UTF-8");
+        String dir_encoded = URLEncoder.encode(dir,"UTF-8");
+        String cgi_args = "c=" + col_name_encoded;
+        cgi_args += "&dir=" + dir_encoded;
+
+        URL download_url = new URL(download_cgi);
+
+        System.err.println("**** download cgi = '" + download_cgi + "'");
+        System.err.println("**** cgi args = '" + cgi_args + "'");
+
+        URLConnection dl_connection = download_url.openConnection();
+        dl_connection.setDoOutput(true);        
+        OutputStream dl_os = dl_connection.getOutputStream();
+
+        PrintWriter dl_out = new PrintWriter(dl_os);
+        dl_out.println(cgi_args);
+        dl_out.close();
+
+        // Download result from running cgi script
+        InputStream dl_is = dl_connection.getInputStream();
+        BufferedInputStream dl_bis = new BufferedInputStream(dl_is); 
+        DataInputStream dl_dbis = new DataInputStream(dl_bis);
+            
+        // set up output stream for zip download
+        String col_dir = Utility.getCollectDir(Configuration.gsdl_path);
+        String zip_fname = col_dir + col_name + ".zip";
+        FileOutputStream zip_fos = new FileOutputStream(zip_fname);
+        BufferedOutputStream zip_bfos = new BufferedOutputStream(zip_fos);
+        
+        byte[] buf = new byte[1024];
+        int len;
+
+        while ((len = dl_dbis.read(buf)) >= 0) {
+        zip_bfos.write(buf,0,len);
+        }
+
+        dl_dbis.close();
+        zip_bfos.close();
+
+    }
+    catch (Exception error) {
+        error.printStackTrace();
+    }
+    }
+
+
+    static public void upload_url_zip(String col_name, String dir)
+    {
+    final String lineEnd = "\r\n";
+    final String twoHyphens = "--";
+    final String boundary =  "*****";
+    final int maxBufferSize = 1024;
+
+    String col_dir = Utility.getCollectDir(Configuration.gsdl_path);
+    String zip_fname = col_dir + col_name + ".zip";
+    String upload_cgi = Gatherer.cgiBase + "upload";
+
+    HttpURLConnection conn = null;
+        
+    try {
+        // Send zip file to server
+
+        File file = new File(zip_fname) ;       
+        FileInputStream fileInputStream = new FileInputStream(file);
+        
+        // open a URL connection to the Servlet 
+        URL url = new URL(upload_cgi);
+        System.err.println("**** Uploading to: " + upload_cgi);
+
+        // Open a HTTP connection to the URL
+        conn = (HttpURLConnection) url.openConnection();
+        
+        conn.setDoInput(true);         // Allow Inputs
+        conn.setDoOutput(true);        // Allow Outputs
+        conn.setUseCaches(false);      // Don't use a cached copy.
+        conn.setRequestMethod("POST"); // Use a post method.
+        
+        conn.setRequestProperty("Connection", "Keep-Alive");        
+        conn.setRequestProperty("Content-Type", "multipart/form-data;boundary="+boundary);
+        
+        DataOutputStream dos = new DataOutputStream( conn.getOutputStream() );
+
+        dos.writeBytes(twoHyphens + boundary + lineEnd);
+        dos.writeBytes("Content-Disposition: form-data; name=\"c\"" + lineEnd + lineEnd);
+        dos.writeBytes(col_name + lineEnd);
+        System.err.println("**** c="+col_name);
+
+        dos.writeBytes(twoHyphens + boundary + lineEnd);
+        dos.writeBytes("Content-Disposition: form-data; name=\"dir\"" + lineEnd + lineEnd);
+        dos.writeBytes(dir + lineEnd);  
+        System.err.println("**** dir="+dir);
+    
+        dos.writeBytes(twoHyphens + boundary + lineEnd);
+        dos.writeBytes("Content-Disposition: form-data; name=\"zip\";"
+               + " filename=\"" + zip_fname +"\"" + lineEnd);
+        dos.writeBytes(lineEnd);
+        System.err.println("**** zip (filename)="+zip_fname);
+                
+        // create a buffer of maximum size                  
+        int bytesAvailable = fileInputStream.available();
+        int bufferSize = Math.min(bytesAvailable, maxBufferSize);
+        byte[] buffer = new byte[bufferSize];
+        
+        // read file and write it into form...
+        int bytesRead = fileInputStream.read(buffer, 0, bufferSize);
+        
+        while (bytesRead > 0) {
+        dos.write(buffer, 0, bufferSize);
+        bytesAvailable = fileInputStream.available();
+        bufferSize = Math.min(bytesAvailable, maxBufferSize);
+        bytesRead = fileInputStream.read(buffer, 0, bufferSize);
+        }
+        
+        // send multipart form data necesssary after file data...
+        
+        dos.writeBytes(lineEnd);
+        dos.writeBytes(twoHyphens + boundary + twoHyphens + lineEnd);
+        
+        // close streams
+        
+        fileInputStream.close();
+        dos.flush();
+        dos.close();
+        
+        
+    }
+    catch (MalformedURLException ex) {
+        System.err.println("Failed on: "+ex);
+    }
+    
+    catch (IOException ioe) {
+        System.err.println("Failed on: "+ioe);
+    }
+    
+    // Read server response
+
+    try {
+        InputStreamReader isr = new InputStreamReader(conn.getInputStream() );
+        BufferedReader bisr = new BufferedReader (isr);
+        String str;
+        while (( str = bisr.readLine()) != null) {
+        System.err.println(str);
+        }
+        bisr.close();
+        
+    }
+    catch (IOException ioex) {
+        System.err.println("From (ServerResponse): "+ioex);
+    }
+    }
 }

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

@@ -37 +37 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
+import org.greenstone.gatherer.GathererApplet;
 import org.greenstone.gatherer.util.GSDLSiteConfig;
 import org.greenstone.gatherer.util.Utility;
@@ -226 +227 @@
           // upload etc/collect.cfg to server to reflect changes
           Utility.zipup(col_name,Utility.CONFIG_FILE);
-          Utility.upload_url_zip(col_name,"etc");
+          GathererApplet.upload_url_zip(col_name,"etc");
       }
       }

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

@@ -48 +48 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
+import org.greenstone.gatherer.GathererApplet;
 import org.greenstone.gatherer.cdm.CollectionConfiguration;
 import org.greenstone.gatherer.cdm.CollectionDesignManager;
@@ -466 +467 @@
         Utility.zipup(col_name,"import");
         // upload it to gsdl server
-        Utility.upload_url_zip(col_name,"import");
+        GathererApplet.upload_url_zip(col_name,"import");
 
         // upload etc folder to server (need collect.cfg and any hfiles)
         Utility.zipup(col_name, "etc");
-        Utility.upload_url_zip(col_name,"etc");
+        GathererApplet.upload_url_zip(col_name,"etc");
 
         String col_dir = Utility.getCollectionDir(Configuration.gsdl_path, col_name);
@@ -477 +478 @@
             // upload images/ directory to server
             Utility.zipup(col_name,"images");
-            Utility.upload_url_zip(col_name,"images");
+            GathererApplet.upload_url_zip(col_name,"images");
         }
 
@@ -518 +519 @@
         if (type == NEW) {
         if (Gatherer.isGsdlRemote) {
-            Utility.download_url_zip(col_name,".");
+            GathererApplet.download_url_zip(col_name,".");
             Utility.unzip(col_name);
         }
@@ -533 +534 @@
 
             Utility.delete(Gatherer.c_man.getCollectionArchive()); // remove current archives
-            Utility.download_url_zip(col_name,"archives");
+            GathererApplet.download_url_zip(col_name,"archives");
             Utility.unzip(col_name);
 
@@ -556 +557 @@
 
             Utility.delete(Gatherer.c_man.getCollectionBuild()); // remove current build dir
-            Utility.download_url_zip(col_name,"building");
+            GathererApplet.download_url_zip(col_name,"building");
             Utility.unzip(col_name);
 

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

@@ -768 +768 @@
     
 
-    static public void download_url_zip(String col_name, String dir)
-    {
-    try {
-        String download_cgi  = Gatherer.cgiBase + "download";
-
-        // Send col_name and dir arguments to download cgi
-
-        String col_name_encoded = URLEncoder.encode(col_name,"UTF-8");
-        String dir_encoded = URLEncoder.encode(dir,"UTF-8");
-        String cgi_args = "c=" + col_name_encoded;
-        cgi_args += "&dir=" + dir_encoded;
-
-        URL download_url = new URL(download_cgi);
-
-        System.err.println("**** download cgi = '" + download_cgi + "'");
-        System.err.println("**** cgi args = '" + cgi_args + "'");
-
-        URLConnection dl_connection = download_url.openConnection();
-        dl_connection.setDoOutput(true);        
-        OutputStream dl_os = dl_connection.getOutputStream();
-
-        PrintWriter dl_out = new PrintWriter(dl_os);
-        dl_out.println(cgi_args);
-        dl_out.close();
-
-        // Download result from running cgi script
-        InputStream dl_is = dl_connection.getInputStream();
-        BufferedInputStream dl_bis = new BufferedInputStream(dl_is); 
-        DataInputStream dl_dbis = new DataInputStream(dl_bis);
-            
-        // set up output stream for zip download
-        String col_dir = Utility.getCollectDir(Configuration.gsdl_path);
-        String zip_fname = col_dir + col_name + ".zip";
-        FileOutputStream zip_fos = new FileOutputStream(zip_fname);
-        BufferedOutputStream zip_bfos = new BufferedOutputStream(zip_fos);
-        
-        byte[] buf = new byte[1024];
-        int len;
-
-        while ((len = dl_dbis.read(buf)) >= 0) {
-        zip_bfos.write(buf,0,len);
-        }
-
-        dl_dbis.close();
-        zip_bfos.close();
-
-    }
-    catch (Exception error) {
-        error.printStackTrace();
-    }
-    }
-
-
-    static public void upload_url_zip(String col_name, String dir)
-    {
-    final String lineEnd = "\r\n";
-    final String twoHyphens = "--";
-    final String boundary =  "*****";
-    final int maxBufferSize = 1024;
-
-    String col_dir = Utility.getCollectDir(Configuration.gsdl_path);
-    String zip_fname = col_dir + col_name + ".zip";
-    String upload_cgi = Gatherer.cgiBase + "upload";
-
-    HttpURLConnection conn = null;
-        
-    try {
-        // Send zip file to server
-
-        File file = new File(zip_fname) ;       
-        FileInputStream fileInputStream = new FileInputStream(file);
-        
-        // open a URL connection to the Servlet 
-        URL url = new URL(upload_cgi);
-        System.err.println("**** Uploading to: " + upload_cgi);
-
-        // Open a HTTP connection to the URL
-        conn = (HttpURLConnection) url.openConnection();
-        
-        conn.setDoInput(true);         // Allow Inputs
-        conn.setDoOutput(true);        // Allow Outputs
-        conn.setUseCaches(false);      // Don't use a cached copy.
-        conn.setRequestMethod("POST"); // Use a post method.
-        
-        conn.setRequestProperty("Connection", "Keep-Alive");        
-        conn.setRequestProperty("Content-Type", "multipart/form-data;boundary="+boundary);
-        
-        DataOutputStream dos = new DataOutputStream( conn.getOutputStream() );
-
-        dos.writeBytes(twoHyphens + boundary + lineEnd);
-        dos.writeBytes("Content-Disposition: form-data; name=\"c\"" + lineEnd + lineEnd);
-        dos.writeBytes(col_name + lineEnd);
-        System.err.println("**** c="+col_name);
-
-        dos.writeBytes(twoHyphens + boundary + lineEnd);
-        dos.writeBytes("Content-Disposition: form-data; name=\"dir\"" + lineEnd + lineEnd);
-        dos.writeBytes(dir + lineEnd);  
-        System.err.println("**** dir="+dir);
-    
-        dos.writeBytes(twoHyphens + boundary + lineEnd);
-        dos.writeBytes("Content-Disposition: form-data; name=\"zip\";"
-               + " filename=\"" + zip_fname +"\"" + lineEnd);
-        dos.writeBytes(lineEnd);
-        System.err.println("**** zip (filename)="+zip_fname);
-                
-        // create a buffer of maximum size                  
-        int bytesAvailable = fileInputStream.available();
-        int bufferSize = Math.min(bytesAvailable, maxBufferSize);
-        byte[] buffer = new byte[bufferSize];
-        
-        // read file and write it into form...
-        int bytesRead = fileInputStream.read(buffer, 0, bufferSize);
-        
-        while (bytesRead > 0) {
-        dos.write(buffer, 0, bufferSize);
-        bytesAvailable = fileInputStream.available();
-        bufferSize = Math.min(bytesAvailable, maxBufferSize);
-        bytesRead = fileInputStream.read(buffer, 0, bufferSize);
-        }
-        
-        // send multipart form data necesssary after file data...
-        
-        dos.writeBytes(lineEnd);
-        dos.writeBytes(twoHyphens + boundary + twoHyphens + lineEnd);
-        
-        // close streams
-        
-        fileInputStream.close();
-        dos.flush();
-        dos.close();
-        
-        
-    }
-    catch (MalformedURLException ex) {
-        System.err.println("Failed on: "+ex);
-    }
-    
-    catch (IOException ioe) {
-        System.err.println("Failed on: "+ioe);
-    }
-    
-    // Read server response
-
-    try {
-        InputStreamReader isr = new InputStreamReader(conn.getInputStream() );
-        BufferedReader bisr = new BufferedReader (isr);
-        String str;
-        while (( str = bisr.readLine()) != null) {
-        System.err.println(str);
-        }
-        bisr.close();
-        
-    }
-    catch (IOException ioex) {
-        System.err.println("From (ServerResponse): "+ioex);
-    }
-    }
-
     static protected String unixStylePath(String path)
     {