Changeset 22848

Timestamp:

2010-09-03T17:44:59+12:00 (14 years ago)

Author:

ak19

Message:

Further changes to ticket 152 (movable collectdir. Both export.pl and exportcol.pl--for Export (to other formats) and Write To CD-Rom menu options, respectively--are now given a collectdir parameter so exporting can work for collections in non-standard collect directories.

Location:

main/trunk/gli/src/org/greenstone/gatherer/gui

Files:

• ExportAsPrompt.java (modified) (1 diff)
• WriteCDImagePrompt.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/gui/ExportAsPrompt.java

@@ -451 +451 @@
     command_parts_list.add("-saveas");
     command_parts_list.add(export_type);
+    // we want to be able to export items from other collect directories too
+    String collectDir = Gatherer.getCollectDirectoryPath();
+    if(collectDir != Gatherer.getDefaultGSCollectDirectoryPath(true)) {
+        command_parts_list.add("-collectdir");
+        command_parts_list.add(collectDir);
+    }   
     command_parts_list.add("-exportdir");
     String export_dir = LocalGreenstone.getTmpDirectoryPath();

main/trunk/gli/src/org/greenstone/gatherer/gui/WriteCDImagePrompt.java

@@ -375 +375 @@
     }
 
+    // we want to be able to export collections in other collect directories too
+    String collectDir = Gatherer.getCollectDirectoryPath();
+    if(collectDir != Gatherer.getDefaultGSCollectDirectoryPath(true)) {
+        command_parts_list.add("-collectdir");
+        command_parts_list.add(collectDir);
+    }
+    
     for (int i = 0; i < num_collections; i++) {
         command_parts_list.add(((BasicCollectionConfiguration) selected_collections.get(i)).getShortName());