Changeset 16111

Timestamp:

2008-06-23 17:52:46 (5 months ago)

Author:

ak19

Message:

In uploadFileInternal(), undid introduction of dummy value and cgi-args are once again passed to the constructor of the PostMethod?

Files:

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

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

@@ -55 +55 @@
-import org.apache.commons.httpclient.HttpStatus;
-
+
-public class RemoteGreenstoneServer
-{
@@ -171 +172 @@
-        return greenstoneVersion;
-    }
-
-
-    // ----------------------------------------------------------------------------------------------------
@@ -865 +865 @@
-            String zip_file_path = collection_directory_path + zip_file_name;
-            ZipTools.zipFiles(zip_file_path, collection_directory_path, collection_file_relative_paths);
-
+
-            // Upload the zip file
-            String upload_collection_file_command = "cmd=upload-collection-file";
@@ -905 +905 @@
-            target_collection_directory_relative_path = target_collection_directory_relative_path.replaceAll((Utility.isWindows() ? "\\\\" : "\\/"), "|");
-            progress_bar.setAction("Uploading files into collection...");
-
+
-            String zip_file_name = collection_name + "-" + System.currentTimeMillis() + ".zip";
-            String zip_file_path = Gatherer.getCollectDirectoryPath() + zip_file_name;
@@ -917 +917 @@
-                source_file_relative_paths[i] = getPathRelativeToDirectory(source_files[i], base_directory_path);
-            }
-
+
-            ZipTools.zipFiles(zip_file_path, base_directory_path, source_file_relative_paths);
-
@@ -1271 +1271 @@
-        //For a remote GS3
-        //GS3 is running on Tomcat, and Tomcat requires a connection timeout to be set up at the client
-
+n
-        //from Jakarta is applied to solve this problem only for uploading files. 
-
+
+
-            // Setup the POST method
-);
-
++"?"+cgi_args); // cgi_args: QUERY_STRING on perl server side
+       
-            // construct the multipartrequest form
-            String[] cgi_array=cgi_args.split("&");// get parameter-value pairs from cgi_args string
-6
+5
-            
-            // We insert a dummy value for the first Part. For some reason, the gliserver side doesn't 
-            // read the first Part (whether it's the file or a CGI argument like the cmd=upload-collection-file)
-            parts[0]= new StringPart("dummy_arg", "dummy_value");  // unread dummy value
-            
-            // find all parameters of cgi-args and add them into Part[]
-            for (int i=0; i<cgi_array.length;i++) {
-                parts[i+1]=new StringPart(cgi_array[i].substring(0,cgi_array[i].indexOf("=")),cgi_array[i].substring(cgi_array[i].indexOf("=")+1,cgi_array[i].length()));
-            }
-            parts[cgi_array.length+1]= new StringPart("un", remote_greenstone_server_authentication.getUserName());
-            parts[cgi_array.length+2]= new StringPart("pw", new String(remote_greenstone_server_authentication.getPassword()));
-            parts[cgi_array.length+3]= new StringPart("ts", String.valueOf(System.currentTimeMillis()));
-            parts[cgi_array.length+4]= new StringPart("site", Configuration.site_name);
-            // The FilePart: consisting of the (cgi-arg) name and (optional) filename in the Content-Disposition 
-            // of the POST request Header (see CGI.pm), and the actual zip file itself. It uses the defaults:
-            // Content-Type: application/octet-stream; charset=ISO-8859-1,Content-Transfer-Encoding: binary
-
-
+
+
+
+
+
+
+
+
+
+
+
-            // set MultipartRequestEntity on the POST method
-            httppost.setRequestEntity(new MultipartRequestEntity(parts, httppost.getParams()));
@@ -1304 +1302 @@
-            //httppost.getRequestEntity().writeRequest(new FileOutputStream("request.txt", true)); // true: appends
-            
-
-            //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
-            String command_output = ""; 
@@ -1325 +1321 @@
-                httppost.releaseConnection();
-            }
-
+    
-        }
-