Changeset 34168

Show
Ignore:
Timestamp:
14.06.2020 02:34:57 (4 weeks ago)
Author:
ak19
Message:

Stupid oversight on my part yesterday: when fixing up client-GLI so that it could use a variable library servlet (whichever is the current one, instead of always the default 'library') to contact when activating a collection, I should have thought of fixing it for the local GLI with local Greenstone case too. Fortunately caught a possible bug in my previous fix related to this (svn revision 34158), which would pass the library_name to activate for GS3 as well as GS2. But only GS3 uses library servlets.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

    r34160 r34168  
    229229        command_parts_list.add("-site"); 
    230230        command_parts_list.add(Configuration.site_name); 
    231     } 
    232  
    233     if(!Gatherer.isGsdlRemote) { 
    234         command_parts_list.add("-collectdir"); 
    235         command_parts_list.add(getCollectDirectory()); // <../collect/> 
    236     } else { // actually this should work in local Greenstone case too: 
     231 
     232        // Whether remote or local, contact the correct (current) library 
     233        // to actually get this collection activated 
    237234        command_parts_list.add("-library_name"); 
    238235        String library_servlet_name = Configuration.servlet_path; 
     
    242239        command_parts_list.add(library_servlet_name); 
    243240    } 
     241 
     242    if(!Gatherer.isGsdlRemote) { 
     243        command_parts_list.add("-collectdir"); 
     244        command_parts_list.add(getCollectDirectory()); // <../collect/> 
     245    }    
    244246 
    245247    String[] build_options = collection.build_options.getValues(); 
     
    342344        build_list.add("-site"); 
    343345        build_list.add(Configuration.site_name); 
    344     } 
    345  
    346     if(!Gatherer.isGsdlRemote) { 
    347         build_list.add("-collectdir"); 
    348         build_list.add(getCollectDirectory()); 
    349     } else { // actually this should work in local Greenstone case too: 
     346 
     347        // Whether GS is remote or local, contact the correct (current) library 
     348        // to actually get this collection activated 
    350349        build_list.add("-library_name"); 
    351350        String library_servlet_name = Configuration.servlet_path; 
     
    353352        library_servlet_name = library_servlet_name.substring(1); 
    354353        } 
    355         build_list.add(library_servlet_name); 
     354        build_list.add(library_servlet_name);        
     355    } 
     356 
     357    if(!Gatherer.isGsdlRemote) { 
     358        build_list.add("-collectdir"); 
     359        build_list.add(getCollectDirectory()); 
    356360    } 
    357361