Changeset 18948

Timestamp:

2009-04-14T14:39:22+12:00 (15 years ago)

Author:

kjdon

Message:

getLoadedCollectionDirectoryPath now gets the path from the loaded collection, rather than from Gatherer's collect directory + coll name - it may be in a subdir in collect group. getCollectDirectory uses this path rather than the default. new method getDefaultCollectDirectory for teh old path, which commands that create new colls now use

File:

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

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

@@ -207 +207 @@
     command_parts_list.add(collection.getName());
 
-    // Run the buildcol.pl command
+    // Run the buildcol.pl and
     String[] command_parts = (String[]) command_parts_list.toArray(new String[0]);
     GShell shell = new GShell(command_parts, GShell.BUILD, BUILDING, this, build_monitor, GShell.GSHELL_BUILD);
@@ -507 +507 @@
     try {
         // first make sure that the collect directory exists
-        File collect_dir = new File(getCollectDirectory());
+        File collect_dir = new File(getDefaultCollectDirectory());
         if (!collect_dir.exists()) {
         collect_dir.mkdirs();
@@ -837 +837 @@
     static public String getLoadedCollectionDirectoryPath()
     {
-    return Gatherer.getCollectDirectoryPath() + collection.getName() + File.separator;
+    return collection.getCollectionDirectory().getPath() + File.separator;
     }
 
@@ -1403 +1403 @@
 
     command_parts_list.add("-collectdir");
-    command_parts_list.add(getCollectDirectory());
+    command_parts_list.add(getDefaultCollectDirectory());
     
     command_parts_list.add("-win31compat");
@@ -1685 +1685 @@
     }
 
-
-    // used as arg in the perl scripts
-    private String getCollectDirectory() {
+    private String getDefaultCollectDirectory() {
     String collect_dir = Gatherer.getCollectDirectoryPath();
-
     // Remove erroneous file windows file separator as it causes problems when running import.pl
     if(collect_dir.length() > 2 && collect_dir.endsWith("\\")) {
         collect_dir = collect_dir.substring(0, collect_dir.length() - 1);
     }
-
+    return collect_dir;
+    }
+
+    // used as arg in the perl scripts
+    private String getCollectDirectory() {
+    
+    String collect_dir = collection.getCollectionDirectory().getParentFile().getPath();
     return collect_dir;
     }