Changeset 26573 for main/trunk
- Timestamp:
- 2012-12-11T17:21:17+13:00 (11 years ago)
- Location:
- main/trunk/gli/src/org/greenstone/gatherer
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java
r26402 r26573 215 215 command_parts_list.add("-language"); 216 216 command_parts_list.add(Configuration.getLanguage()); 217 218 if(Gatherer.GS3) { 219 command_parts_list.add("-site"); 220 command_parts_list.add(Configuration.site_name); 221 } 222 217 223 if(!Gatherer.isGsdlRemote) { 218 224 command_parts_list.add("-collectdir"); … … 264 270 import_list.add("-language"); 265 271 import_list.add(Configuration.getLanguage()); 272 273 if(Gatherer.GS3) { 274 import_list.add("-site"); 275 import_list.add(Configuration.site_name); 276 } 277 266 278 if(!Gatherer.isGsdlRemote) { 267 279 import_list.add("-collectdir"); … … 306 318 build_list.add("-language"); 307 319 build_list.add(Configuration.getLanguage()); 320 321 if(Gatherer.GS3) { 322 build_list.add("-site"); 323 build_list.add(Configuration.site_name); 324 } 325 308 326 if(!Gatherer.isGsdlRemote) { 309 327 build_list.add("-collectdir"); … … 452 470 // } 453 471 // command_parts_list.add(Configuration.getGS3ScriptPath() + "convert_coll_from_gs2.pl"); 472 // 473 // command_parts_list.add("-site"); 474 // command_parts_list.add(Configuration.site_name); 475 // 454 476 // command_parts_list.add("-collectdir"); 455 477 // command_parts_list.add(getCollectDirectory()); … … 852 874 command_parts_list.add("-language"); 853 875 command_parts_list.add(Configuration.getLanguage()); 876 877 if(Gatherer.GS3) { 878 command_parts_list.add("-site"); 879 command_parts_list.add(Configuration.site_name); 880 } 881 854 882 if(!Gatherer.isGsdlRemote) { 855 883 command_parts_list.add("-collectdir"); … … 1166 1194 command_parts_list.add("-language"); 1167 1195 command_parts_list.add(Configuration.getLanguage()); 1196 1197 if(Gatherer.GS3) { 1198 command_parts_list.add("-site"); 1199 command_parts_list.add(Configuration.site_name); 1200 } 1201 1168 1202 if(!Gatherer.isGsdlRemote) { 1169 1203 command_parts_list.add("-collectdir"); … … 1586 1620 if(Gatherer.GS3) { 1587 1621 command_parts_list.add(Utility.GS3MODE_ARGUMENT); // add '-gs3mode' 1588 } 1622 command_parts_list.add("-site"); 1623 command_parts_list.add(Configuration.site_name); 1624 } 1625 1589 1626 if(!Gatherer.isGsdlRemote) { 1590 1627 command_parts_list.add("-collectdir"); -
main/trunk/gli/src/org/greenstone/gatherer/gui/ExportAsPrompt.java
r22848 r26573 453 453 // we want to be able to export items from other collect directories too 454 454 String collectDir = Gatherer.getCollectDirectoryPath(); 455 456 if(Gatherer.GS3) { 457 command_parts_list.add("-site"); 458 command_parts_list.add(Configuration.site_name); 459 } 460 455 461 if(collectDir != Gatherer.getDefaultGSCollectDirectoryPath(true)) { 456 462 command_parts_list.add("-collectdir");
Note:
See TracChangeset
for help on using the changeset viewer.