Changeset 14308

Timestamp:

2007-08-06T10:55:19+12:00 (17 years ago)

Author:

qq6

Message:

download file 'web.xml' and get all names of sites avaliable if Gatherer.GS3. Reimplemented uploadFileInternal for GS3 on tomcat

File:

• gli/trunk/src/org/greenstone/gatherer/remote/RemoteGreenstoneServer.java (modified) (11 diffs)

gli/trunk/src/org/greenstone/gatherer/remote/RemoteGreenstoneServer.java

@@ -33 +33 @@
 import java.util.zip.*;
 import javax.swing.*;
+import java.io.ByteArrayOutputStream;
 import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.DebugStream;
@@ -42 +43 @@
 import org.greenstone.gatherer.util.UnzipTools;
 import org.greenstone.gatherer.util.Utility;
-
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.commons.httpclient.HttpException;
+import org.apache.commons.httpclient.methods.multipart.FilePart;
+import org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity;
+import org.apache.commons.httpclient.methods.multipart.Part;
+import org.apache.commons.httpclient.methods.multipart.*;
+import org.apache.commons.httpclient.params.*;
+import org.apache.commons.httpclient.HttpStatus;
 
 public class RemoteGreenstoneServer
@@ -85 +95 @@
     return performAction(new RemoteGreenstoneServerDownloadCollectionFileAction(collection_name, collection_file));
     }
-
+    
+    // get web.xml from the server -- for a remote gli of GS3
+    static public String downloadWebXMLFile()
+    {
+    return performAction(new RemoteGreenstoneServerDownloadWebXMLFileAction());
+    }
 
     static public String getScriptOptions(String script_name, String script_arguments)
@@ -91 +106 @@
     return performAction(new RemoteGreenstoneServerGetScriptOptionsAction(script_name, script_arguments));
     }
-
+    
+    //get all available site names from the server -- for a remote gli of GS3
+    static public String getSiteNames()
+    {
+    return performAction(new RemoteGreenstoneServerGetSiteNamesAction());
+    }
 
     static public String moveCollectionFile(String collection_name, File source_collection_file, File target_collection_file)
@@ -532 +552 @@
     }
 
+    /**
+     * --------------------------------------------------------------------------------------------
+     *    DOWNLOAD web.xml FILE --for a remote GS3
+     * --------------------------------------------------------------------------------------------
+     */
+    static private class RemoteGreenstoneServerDownloadWebXMLFileAction
+    extends RemoteGreenstoneServerAction
+    {
+    public RemoteGreenstoneServerDownloadWebXMLFileAction()
+    {}
+
+    public void perform()
+        throws Exception
+    {
+        String web_xml_directory_path=(Configuration.gli_user_directory_path);
+        String download_web_xml_file_command = "cmd=download-web-xml-file";
+        download_web_xml_file_command += "&file=" + URLEncoder.encode("web.xml", "UTF-8");
+        String zip_file_name = "web-xml.zip";
+        String zip_file_path = web_xml_directory_path + zip_file_name;
+        action_output = downloadFile(download_web_xml_file_command, zip_file_path);
+
+        // Unzip the web.xml file just downloaded
+        UnzipTools.unzipFile(zip_file_path,web_xml_directory_path);
+    }
+    }
 
     /**
@@ -564 +609 @@
     }
 
+    /**
+     * --------------------------------------------------------------------------------------------
+     *    GET ALL NAMES OF SITES // for a remote GS3 
+     * --------------------------------------------------------------------------------------------
+     */
+    static private class RemoteGreenstoneServerGetSiteNamesAction
+    extends RemoteGreenstoneServerAction
+    {
+    public RemoteGreenstoneServerGetSiteNamesAction()
+    {}
+
+    public void perform()
+        throws Exception
+    {
+        progress_bar.setAction("Getting names of sites ...");
+
+        String get_script_options_command = "cmd=get-site-names";
+        action_output = sendCommandToServer(get_script_options_command, null);
+    }
+    }
 
     /**
@@ -780 +845 @@
     // static private PasswordAuthentication remote_greenstone_server_authentication = new PasswordAuthentication(System.getProperty("user.name"), new char[] { });
 
+    static public void set_remote_greenstone_server_authentication_to_null(){
+    remote_greenstone_server_authentication = null;
+    }
 
     static private class RemoteGreenstoneServerAuthenticateTask
@@ -800 +868 @@
         protected String getMessageString()
         {
+        if (Gatherer.GS3){
+            return (Dictionary.get("RemoteGreenstoneServer.Authentication_Message_gs3") + " " + Configuration.site_name);
+        }
         return Dictionary.get("RemoteGreenstoneServer.Authentication_Message");
         }
@@ -989 +1060 @@
     cgi_args += "&pw=" + new String(remote_greenstone_server_authentication.getPassword());
     cgi_args += "&ts=" + System.currentTimeMillis();
+    if (Gatherer.GS3){
+        cgi_args += "&site=" + Configuration.site_name;
+    }
 
     URL download_url = new URL(download_cgi);
@@ -1042 +1116 @@
         cgi_args += "&pw=" + new String(remote_greenstone_server_authentication.getPassword());
     cgi_args += "&ts=" + System.currentTimeMillis();
+    if (Gatherer.GS3){
+        cgi_args += "&site=" + Configuration.site_name;
+    }
 
     URL gliserver_url = new URL(gliserver_url_string + "?" + cgi_args);
@@ -1071 +1148 @@
     throws Exception
     {
-    DebugStream.println("gliserver URL: " + upload_cgi);
+    //For a remote GS3
+    //GS3 is running on Tomcat, and Tomcat requires a connection timeout to be set up at the client
+    //side while uploading files. As HttpURLConection couldn't set the connection timeout, HttpClient.jar 
+    //from Jakarta is applied to solve this problem only for uploading files. 
+    if (Gatherer.GS3){
+        System.err.println("gliserver URL: " + upload_cgi);
+        System.err.println("gliserver args: " + cgi_args);
+
+    // Setup the POST method
+    PostMethod httppost = new PostMethod(upload_cgi+"?"+cgi_args);
+
+    //read the zip file into a byte array
+    InputStream in = new FileInputStream (file_path);
+    File f = new File (file_path); // in order to get the length of the bytes array
+    ByteArrayOutputStream out = new ByteArrayOutputStream ((int)f.length());
+    int r = 0; // amount read
+    byte[] buf = new byte[1024];
+    while((r = in.read(buf, 0, buf.length)) != -1) {
+        out.write(buf, 0, r);
+    }
+    in.close();
+    byte[] result = out.toByteArray();
+
+    // construct the multipartrequest form
+    PartSource partSource = new ByteArrayPartSource("zipFile", result);
+        FilePart filePart = new FilePart("uploaded_file", partSource);
+
+    String[] cgi_array=cgi_args.split("&");// get parameter-value paires from cgi_args string
+    Part[] parts=new Part[cgi_array.length+5];
+    parts[0]=filePart;
+    parts[1]= new StringPart("un", remote_greenstone_server_authentication.getUserName());
+    parts[2]= new StringPart("pw", new String(remote_greenstone_server_authentication.getPassword()));
+    parts[3]= new StringPart("ts", String.valueOf(System.currentTimeMillis()));
+    parts[4]= new StringPart("site", Configuration.site_name);
+    // find all parameters of cgi-agrs and add them into Part[]
+    for (int i=0; i<cgi_array.length;i++){
+        parts[5+i]=new StringPart(cgi_array[i].substring(0,cgi_array[i].indexOf("=")),cgi_array[i].substring(cgi_array[i].indexOf("=")+1,cgi_array[i].length()));
+    }
+    // set MutilartRequestEntity on the POST method
+        httppost.setRequestEntity(new MultipartRequestEntity(parts, httppost.getParams()));
+    //set up the HttpClient connection
+    HttpClient client=new HttpClient(); 
+        client.getParams().setBooleanParameter(HttpMethodParams.USE_EXPECT_CONTINUE, false);
+    client.getParams().setConnectionManagerTimeout(200000); //set the connection timeout
+    // get the output of the command from the server
+    client.executeMethod(httppost);
+    String command_output = ""; 
+    try{
+        client.executeMethod(httppost);
+        if (httppost.getStatusCode() == HttpStatus.SC_OK) {
+        command_output = httppost.getStatusLine().toString();
+        } else {
+        command_output = httppost.getStatusLine().toString();
+        System.out.println("Unexpected failure: " + httppost.getStatusLine().toString());
+        }
+    }catch(IOException e){
+        e.printStackTrace();
+    }finally{
+        httppost.releaseConnection();
+    }
+    return command_output;
+    }
+
+    //For a remote GS2
+    System.err.println("gliserver URL: " + upload_cgi);
     System.err.println("gliserver args: " + cgi_args);
-
     // Add username and password, and a timestamp
     cgi_args += "&un=" + remote_greenstone_server_authentication.getUserName();