Changeset 34168
- Timestamp:
- 2020-06-14T02:34:57+12:00 (4 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java
r34160 r34168 229 229 command_parts_list.add("-site"); 230 230 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 237 234 command_parts_list.add("-library_name"); 238 235 String library_servlet_name = Configuration.servlet_path; … … 242 239 command_parts_list.add(library_servlet_name); 243 240 } 241 242 if(!Gatherer.isGsdlRemote) { 243 command_parts_list.add("-collectdir"); 244 command_parts_list.add(getCollectDirectory()); // <../collect/> 245 } 244 246 245 247 String[] build_options = collection.build_options.getValues(); … … 342 344 build_list.add("-site"); 343 345 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 350 349 build_list.add("-library_name"); 351 350 String library_servlet_name = Configuration.servlet_path; … … 353 352 library_servlet_name = library_servlet_name.substring(1); 354 353 } 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()); 356 360 } 357 361
Note:
See TracChangeset
for help on using the changeset viewer.