Changeset 31988 for main/trunk/gli

Timestamp:

2017-09-25T16:35:22+13:00 (7 years ago)

Author:

ak19

Message:

Bugfix for remote GS server: there's no building/build.cfg only index/build.cfg, so need the later to be zipped up instead

File:

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

main/trunk/gli/src/org/greenstone/gatherer/shell/GShell.java

@@ -484 +484 @@
 
         else if(type == BUILD) {
-        // download the building directory (if gsdl server is remote)
+        // download the index (no longer building) directory if gsdl server is remote
         if ((Gatherer.isGsdlRemote) && (!Configuration.fedora_info.isActive())) {
             if (progress!=null) {
@@ -492 +492 @@
             if (!Gatherer.GS3){
             // Only need to download build.cfg file
-            File build_cfg_file = new File(CollectionManager.getLoadedCollectionBuildingDirectoryPath(), "build.cfg");
+            //File build_cfg_file = new File(CollectionManager.getLoadedCollectionBuildingDirectoryPath(), "build.cfg");
+            File build_cfg_file = new File(CollectionManager.getLoadedCollectionIndexDirectoryPath(), "build.cfg");
             Gatherer.remoteGreenstoneServer.downloadCollectionFile(col_name, build_cfg_file);
             }else{
             // Only need to download buildConfig.xml file
-            File buildConfig_xml_file = new File(CollectionManager.getLoadedCollectionBuildingDirectoryPath(), "buildConfig.xml");
+            //File buildConfig_xml_file = new File(CollectionManager.getLoadedCollectionBuildingDirectoryPath(), "buildConfig.xml");
+            File buildConfig_xml_file = new File(CollectionManager.getLoadedCollectionIndexDirectoryPath(), "buildConfig.xml");
             Gatherer.remoteGreenstoneServer.downloadCollectionFile(col_name, buildConfig_xml_file);
             }