Changeset 31988 for main/trunk/gli

Show
Ignore:
Timestamp:
25.09.2017 16:35:22 (2 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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gli/src/org/greenstone/gatherer/shell/GShell.java

    r31733 r31988  
    484484 
    485485        else if(type == BUILD) { 
    486         // download the building directory (if gsdl server is remote) 
     486        // download the index (no longer building) directory if gsdl server is remote 
    487487        if ((Gatherer.isGsdlRemote) && (!Configuration.fedora_info.isActive())) { 
    488488            if (progress!=null) { 
     
    492492            if (!Gatherer.GS3){ 
    493493            // Only need to download build.cfg file 
    494             File build_cfg_file = new File(CollectionManager.getLoadedCollectionBuildingDirectoryPath(), "build.cfg"); 
     494            //File build_cfg_file = new File(CollectionManager.getLoadedCollectionBuildingDirectoryPath(), "build.cfg"); 
     495            File build_cfg_file = new File(CollectionManager.getLoadedCollectionIndexDirectoryPath(), "build.cfg"); 
    495496            Gatherer.remoteGreenstoneServer.downloadCollectionFile(col_name, build_cfg_file); 
    496497            }else{ 
    497498            // Only need to download buildConfig.xml file 
    498             File buildConfig_xml_file = new File(CollectionManager.getLoadedCollectionBuildingDirectoryPath(), "buildConfig.xml"); 
     499            //File buildConfig_xml_file = new File(CollectionManager.getLoadedCollectionBuildingDirectoryPath(), "buildConfig.xml"); 
     500            File buildConfig_xml_file = new File(CollectionManager.getLoadedCollectionIndexDirectoryPath(), "buildConfig.xml"); 
    499501            Gatherer.remoteGreenstoneServer.downloadCollectionFile(col_name, buildConfig_xml_file); 
    500502            }