Changeset 22605 for main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

Timestamp:

2010-08-11T21:28:34+12:00 (14 years ago)

Author:

ak19

Message:

Ticket #152: Allowing different paths to collect dir so that GLI can work with collect dirs on pen drives. NONE OF THESE CHANGES ARE FOR Client-GLI AS YET. 1. Preferences (Connection tab), Open and New Collection dialogs allow one to change the current collect directory containing the collections to select from. 2. New Collection dialog allows one to base a new collection on an existing collection in a collect dir other than the current collect dir. 3. Collections in the Documents in Greenstone Collections Workspace Tree Node now have two additional rightclick options: to move and copy these collections to another location.

File:

• main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java (modified) (2 diffs)

main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -497 +497 @@
         if (no_load || open_collection_file_path.equals("")) {
         open_collection_file_path = null;
-        }
+        //      collectDirectoryHasChanged(); // make sure gsdlsite.cfg's collecthome defaults to GS' collect
+        }
+
+        // If opening a collection outside the standard GS collect folder, need
+        // to open the non-standard collect folder that the collection resides in
+        if (open_collection_file_path != null && 
+        !open_collection_file_path.startsWith(getCollectDirectoryPath())) {
+        File collectFolder = null;
+        if(!open_collection_file_path.endsWith("gli.col")) { // then it's a collect folder
+            collectFolder = new File(open_collection_file_path);
+        } else {
+            // the filepath is a gli.col file. To get the collect folder: the 1st level
+            // up is collection folder, 2 two levels up is the containing collect folder
+            collectFolder = new File(open_collection_file_path).getParentFile().getParentFile();
+        }
+
+        // Need to deal with colgroups as well: while there's an etc/collect.cfg in the current
+        // collectFolder, move one level up
+        String cfg_file = (Gatherer.GS3)? Utility.CONFIG_GS3_FILE : Utility.CONFIG_FILE;
+        if(new File(collectFolder.getAbsolutePath()+File.separator+cfg_file).exists()) { // colgroup
+            collectFolder = collectFolder.getParentFile();
+            
+        }
+        setCollectDirectoryPath(collectFolder.getAbsolutePath()); // now set this as the current collect folder
+        }
+        
     }
     catch (Exception exception) {
@@ -761 +786 @@
         System.err.println("Error: Unable to make directory: " + gli_user_directory);
     }
+    }
+
+
+    public static void collectDirectoryHasChanged(String oldCollectPath, String newCollectPath) { 
+    if(oldCollectPath.equals(newCollectPath)) {
+        return; // nothing to be done
+    }
+
+    // first save any open collection in the *old* location
+    if(Gatherer.c_man.getCollection() != null) {
+        Gatherer.setCollectDirectoryPath(oldCollectPath); // go back to current collection's location
+        Gatherer.g_man.saveThenCloseCurrentCollection(); // close the current collection first
+    }
+    
+    // change to new collect path
+    Configuration.setString("general.open_collection"+Configuration.gliPropertyNameSuffix(), 
+                true, newCollectPath);
+    Gatherer.setCollectDirectoryPath(newCollectPath);
+    
+
+    // refresh the Documents in Greenstone Collections
+    //WorkspaceTreeModel.refreshGreenstoneCollectionsNode();
+    Gatherer.g_man.refreshWorkspaceTreeGreenstoneCollections();
+    
+    // The web server needs to be told where a new (non-standard) collecthome home is.
+    // The web server reads collecthome from cgi-bin/gsdlsite.cfg, where the property
+    // collecthome can be specified if a non-standard collecthome is to be used. If no 
+    // such property is specified in the file, then it assumes the standard GS collecthome.
+    // This method does nothing for a remote Greenstone.    
+    if(Gatherer.isGsdlRemote) {
+        return;
+    }   
+
+    String gsdlsitecfg = "";
+    if(Gatherer.GS3) { // web/WEB-INF/cgi/gsdl3site.cfg
+        gsdlsitecfg = Configuration.gsdl3_path + File.separator + "WEB-INF" 
+        + File.separator + "cgi" + File.separator + "gsdl3site.cfg";
+    } else { // cgi-bin/gsdlsite.cfg
+        gsdlsitecfg = Configuration.gsdl_path + File.separator 
+        + "cgi-bin" + File.separator + "gsdlsite.cfg";
+    }
+
+    // non-destructive update of gsdl(3)site.cfg (comments preserved)
+    Utility.updatePropertyConfigFile(gsdlsitecfg, "collecthome", Gatherer.getCollectDirectoryPath());
     }