Changeset 15164 for gli

Timestamp:

2008-04-02T18:08:50+13:00 (16 years ago)

Author:

ak19

Message:

modified Download Collection file's ERROR string handling, added method exists(collection, file) to check if a file exists on the server end and to this end added class RemoteGreenstoneServerExistsAction

File:

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

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

@@ -149 +149 @@
     }
 
+    static public boolean exists(String collection_name, File collection_file)
+    {
+    String result = performAction(new RemoteGreenstoneServerExistsAction(collection_name, collection_file));
+    if(result.contains("exists")) {
+        return true;
+    }
+    else if(result.contains("does not exist")) {
+        return false;
+    }
+    return false;
+    }
 
     // ----------------------------------------------------------------------------------------------------
@@ -518 +529 @@
     /**
      * --------------------------------------------------------------------------------------------
+     *    CHECKING IF A FILE/FOLDER EXISTS ON SERVER SIDE
+     * --------------------------------------------------------------------------------------------
+     */
+    static private class RemoteGreenstoneServerExistsAction 
+    extends RemoteGreenstoneServerAction
+    {
+    private String collection_name;
+    private File collection_file;
+    
+    public RemoteGreenstoneServerExistsAction(String collection_name, File collection_file)
+    {
+        this.collection_name = collection_name;
+        this.collection_file = collection_file;
+    }
+    
+    public void perform()
+        throws Exception
+    {
+        String collection_directory_path = CollectionManager.getCollectionDirectoryPath(collection_name);
+        String collection_file_relative_path = getPathRelativeToDirectory(collection_file, collection_directory_path);
+        collection_file_relative_path = collection_file_relative_path.replaceAll((Utility.isWindows() ? "\\\\" : "\\/"), "|");
+        File file = new File(collection_directory_path, collection_file_relative_path);
+
+        String file_exists_command = "cmd=file-exists";
+        file_exists_command += "&c=" + URLEncoder.encode(collection_name, "UTF-8");
+        file_exists_command += "&file=" + URLEncoder.encode(collection_file_relative_path, "UTF-8");
+        // returns either "File <filename> exists" or "File <filename> does not exist"
+        // for the file/folder collection_file
+        action_output = sendCommandToServer(file_exists_command, null);
+    }   
+    }
+    
+
+    /**
+     * --------------------------------------------------------------------------------------------
      *    DOWNLOAD COLLECTION FILE
      * --------------------------------------------------------------------------------------------
@@ -1014 +1060 @@
         }
         // Handle other types of errors by throwing an exception
-        else if (command_output.startsWith("ERROR: ")) {
+        else if (command_output.startsWith("ERROR: ")) { 
         throw new Exception(command_output.substring("ERROR: ".length()));
+        } else if (command_output.contains("ERROR: ")) { // check if ERROR occurs anywhere else in the output
+        throw new Exception(command_output);
         }
 
@@ -1167 +1215 @@
     }
 
-
+           
     /** Returns the command output if the action completed, throws some kind of exception otherwise. */
     static private String uploadFileInternal(String upload_cgi, String cgi_args, String file_path)