Changeset 14817

Timestamp:

2007-11-19T11:22:33+13:00 (16 years ago)

Author:

anna

Message:

Improved error message when GLI had permission problems when opening and creating collections.

File:

• gli/trunk/src/org/greenstone/gatherer/collection/CollectionManager.java (modified) (5 diffs)

gli/trunk/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -380 +380 @@
         if (!new File(collection_directory_path).exists()) {
         // If there is no collection directory then the creation was unsuccessful, or cancelled
-
+          
         return;
         }
@@ -959 +959 @@
         System.err.println("Cannot write lock file!");
         String args[] = new String[2];
-        args[0] = location;
-        args[1] = Dictionary.get("FileActions.Write_Not_Permitted_Title");
+        args[0] = location;     
+        args[1] = Dictionary.get("FileActions.Write_Not_Permitted_Message", new String[]{lock_file.getAbsolutePath()});     
+        if(Gatherer.client_operating_system.toUpperCase().indexOf("WINDOWS")!=-1){        
+          //if(Gatherer.client_operating_system.toUpperCase().indexOf("VISTA")!=-1){            
+            args[1] += Dictionary.get("FileActions.File_Permission_Detail", new String[]{Configuration.gsdl_path, System.getProperty("user.name")});
+          //} 
+        }
         JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CollectionManager.Cannot_Open_With_Reason", args), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
         args = null;
@@ -1019 +1024 @@
         // There is obviously no existing collection present.
         DebugStream.printStackTrace(error);
+        error.printStackTrace();
         if(error.getMessage() != null) {
         String[] args = new String[2];
-        args[0] = location;
-        args[1] = error.getMessage();
+        args[0] = location;     
+        //args[1] = error.getMessage();
+        args[1] = "The Librarian Interface does not have permission to write to... Please check file permissions.";
         JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CollectionManager.Cannot_Open_With_Reason", args), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
         }
@@ -1072 +1079 @@
      */
     public synchronized void message(GShellEvent event) {
+      
     }
 
@@ -1159 +1167 @@
         Gatherer.g_man.repaint();
     }
-    else if (event.getStatus() == GShell.ERROR) {
-        DebugStream.println("There was an error in the gshell:"+ event.getMessage());
-        if (event.getType() == GShell.NEW) {
-        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CollectionManager.Cannot_Create_Collection"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
-        } else {
+    else if (event.getStatus() == GShell.ERROR) {       
+        if (event.getType() == GShell.NEW) {     
+          String name = event.getMessage();
+          String collectDir = getCollectionDirectoryPath(name);
+          String errMsg = "";
+          if (!new File(getCollectionDirectoryPath(name)).exists() || !new File(getCollectionDirectoryPath(name)).canWrite()) {       
+        String reason = Dictionary.get("FileActions.Write_Not_Permitted_Message", new String[]{collectDir});
+        errMsg = Dictionary.get("CollectionManager.Cannot_Create_Collection_With_Reason", new String[]{reason});
+        if(Gatherer.client_operating_system.toUpperCase().indexOf("WINDOWS") != -1){          
+          //if(Gatherer.client_operating_system.toUpperCase().indexOf("VISTA")!=-1){            
+            errMsg += Dictionary.get("FileActions.File_Permission_Detail", new String[]{Configuration.gsdl_path, System.getProperty("user.name")});
+          //} 
+        }
+          } else {
+        errMsg = Dictionary.get("CollectionManager.Cannot_Create_Collection");
+          }
+          JOptionPane.showMessageDialog(Gatherer.g_man, errMsg, Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+        } 
+        else {
         JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CollectionManager.Preview_Ready_Failed"), Dictionary.get("CollectionManager.Preview_Ready_Title"), JOptionPane.ERROR_MESSAGE);
         Gatherer.refresh(Gatherer.COLLECTION_REBUILT);