Changeset 26573 for main

Timestamp:

2012-12-11T17:21:17+13:00 (11 years ago)

Author:

ak19

Message:

Related to commit revision 26567 which mandated the inclusion of the site flag (and site_name) when building scripts are run over Greenstone 3 collections. This is now passed in by GLI to those scripts.

Location:

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

Files:

• collection/CollectionManager.java (modified) (7 diffs)
• gui/ExportAsPrompt.java (modified) (1 diff)

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

@@ -215 +215 @@
     command_parts_list.add("-language");
     command_parts_list.add(Configuration.getLanguage());
+
+    if(Gatherer.GS3) {
+        command_parts_list.add("-site");
+        command_parts_list.add(Configuration.site_name);
+    }
+
     if(!Gatherer.isGsdlRemote) {
         command_parts_list.add("-collectdir");
@@ -264 +270 @@
     import_list.add("-language");
     import_list.add(Configuration.getLanguage());
+
+    if(Gatherer.GS3) {
+        import_list.add("-site");
+        import_list.add(Configuration.site_name);
+    }
+    
     if(!Gatherer.isGsdlRemote) {
         import_list.add("-collectdir");
@@ -306 +318 @@
     build_list.add("-language");
     build_list.add(Configuration.getLanguage());
+
+    if(Gatherer.GS3) {
+        build_list.add("-site");
+        build_list.add(Configuration.site_name);
+    }
+
     if(!Gatherer.isGsdlRemote) {
         build_list.add("-collectdir");
@@ -452 +470 @@
 //  }
 //  command_parts_list.add(Configuration.getGS3ScriptPath() + "convert_coll_from_gs2.pl");
+//
+//  command_parts_list.add("-site");
+//  command_parts_list.add(Configuration.site_name);
+//
 //  command_parts_list.add("-collectdir");
 //  command_parts_list.add(getCollectDirectory());
@@ -852 +874 @@
         command_parts_list.add("-language");
         command_parts_list.add(Configuration.getLanguage());
+        
+        if(Gatherer.GS3) {
+        command_parts_list.add("-site");
+        command_parts_list.add(Configuration.site_name);
+        }
+
         if(!Gatherer.isGsdlRemote) {
         command_parts_list.add("-collectdir");
@@ -1166 +1194 @@
     command_parts_list.add("-language");
     command_parts_list.add(Configuration.getLanguage());
+
+    if(Gatherer.GS3) {
+        command_parts_list.add("-site");
+        command_parts_list.add(Configuration.site_name);
+    }
+
     if(!Gatherer.isGsdlRemote) {
         command_parts_list.add("-collectdir");
@@ -1586 +1620 @@
     if(Gatherer.GS3) {
         command_parts_list.add(Utility.GS3MODE_ARGUMENT); // add '-gs3mode' 
-    }
+        command_parts_list.add("-site");
+        command_parts_list.add(Configuration.site_name);
+    }
+
     if(!Gatherer.isGsdlRemote) {
         command_parts_list.add("-collectdir");

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

@@ -453 +453 @@
     // we want to be able to export items from other collect directories too
     String collectDir = Gatherer.getCollectDirectoryPath();
+
+    if(Gatherer.GS3) {
+        command_parts_list.add("-site");
+        command_parts_list.add(Configuration.site_name);
+    }
+
     if(collectDir != Gatherer.getDefaultGSCollectDirectoryPath(true)) {
         command_parts_list.add("-collectdir");