Changeset 18948 for gli/trunk/src/org/greenstone
- Timestamp:
- 2009-04-14T14:39:22+12:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
gli/trunk/src/org/greenstone/gatherer/collection/CollectionManager.java
r18606 r18948 207 207 command_parts_list.add(collection.getName()); 208 208 209 // Run the buildcol.pl command209 // Run the buildcol.pl and 210 210 String[] command_parts = (String[]) command_parts_list.toArray(new String[0]); 211 211 GShell shell = new GShell(command_parts, GShell.BUILD, BUILDING, this, build_monitor, GShell.GSHELL_BUILD); … … 507 507 try { 508 508 // first make sure that the collect directory exists 509 File collect_dir = new File(get CollectDirectory());509 File collect_dir = new File(getDefaultCollectDirectory()); 510 510 if (!collect_dir.exists()) { 511 511 collect_dir.mkdirs(); … … 837 837 static public String getLoadedCollectionDirectoryPath() 838 838 { 839 return Gatherer.getCollectDirectoryPath() + collection.getName() + File.separator;839 return collection.getCollectionDirectory().getPath() + File.separator; 840 840 } 841 841 … … 1403 1403 1404 1404 command_parts_list.add("-collectdir"); 1405 command_parts_list.add(get CollectDirectory());1405 command_parts_list.add(getDefaultCollectDirectory()); 1406 1406 1407 1407 command_parts_list.add("-win31compat"); … … 1685 1685 } 1686 1686 1687 1688 // used as arg in the perl scripts 1689 private String getCollectDirectory() { 1687 private String getDefaultCollectDirectory() { 1690 1688 String collect_dir = Gatherer.getCollectDirectoryPath(); 1691 1692 1689 // Remove erroneous file windows file separator as it causes problems when running import.pl 1693 1690 if(collect_dir.length() > 2 && collect_dir.endsWith("\\")) { 1694 1691 collect_dir = collect_dir.substring(0, collect_dir.length() - 1); 1695 1692 } 1696 1693 return collect_dir; 1694 } 1695 1696 // used as arg in the perl scripts 1697 private String getCollectDirectory() { 1698 1699 String collect_dir = collection.getCollectionDirectory().getParentFile().getPath(); 1697 1700 return collect_dir; 1698 1701 }
Note:
See TracChangeset
for help on using the changeset viewer.