Changeset 14261 for gli/trunk

Timestamp:

2007-07-18T11:19:26+12:00 (17 years ago)

Author:

mdewsnip

Message:

Now passes "fs" argument to gliserver.pl when uploading files, for IIS 6.

File:

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

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

@@ -1089 +1089 @@
     gliserver_connection.setRequestProperty("Connection", "Keep-Alive");        
 
-    DataOutputStream dos = new DataOutputStream(gliserver_connection.getOutputStream());
-    dos.writeBytes(cgi_args + "\n");
-
     // Send zip file to server
     File file = new File(file_path);
     FileInputStream fileInputStream = new FileInputStream(file);
 
+    // Add file size argument, because IIS 6 needs a lot of help
+    int file_size = fileInputStream.available();
+    cgi_args += "&fs=" + file_size;
+
+    DataOutputStream dos = new DataOutputStream(gliserver_connection.getOutputStream());
+    dos.writeBytes(cgi_args + "\n");
+
     // create a buffer of maximum size
     final int maxBufferSize = 1024;
-    int bytesAvailable = fileInputStream.available();
+    int bytesAvailable = file_size;
     int bufferSize = Math.min(bytesAvailable, maxBufferSize);
     byte[] buffer = new byte[bufferSize];
@@ -1107 +1111 @@
     int bytesRead = fileInputStream.read(buffer, 0, bufferSize);
     while (bytesRead > 0) {
-        dos.write(buffer, 0, bufferSize);
+        dos.write(buffer, 0, bytesRead);
         bytesAvailable = fileInputStream.available();
         bufferSize = Math.min(bytesAvailable, maxBufferSize);