Changeset 10244
- Timestamp:
- 2005-07-13T15:00:55+12:00 (19 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gli/src/org/greenstone/gatherer/Gatherer.java
r10242 r10244 90 90 91 91 static public boolean isApplet = false; 92 static public boolean isGsdlRemote = true;92 static public boolean isGsdlRemote = false; 93 93 static public String cgiBase = ""; 94 94 … … 128 128 } 129 129 130 // Set the Greenstone path and collect directory specially when running with a remote Greenstone 131 if (isGsdlRemote) { 132 go.gsdl_path = Utility.getGLIUserFolder() + File.separator; 133 Gatherer.setCollectDirectoryPath(go.gsdl_path + "collect" + File.separator); 134 } 135 136 // Users may specify a non-standard collect directory (eg. when running one GLI in a network environment) 130 137 if (go.collect_directory_path != null) { 131 // Use non-standard collect directory (for when running one GLI in a network environment)132 138 Gatherer.setCollectDirectoryPath(go.collect_directory_path); 133 139 } … … 137 143 File gli_user_directory = Utility.getGLIUserFolder(); 138 144 139 Utility.BASE_DIR = gli_user_directory.toString(); 140 if (!Utility.BASE_DIR.endsWith(File.separator)) { 141 Utility.BASE_DIR += File.separator; 142 } 143 145 Utility.BASE_DIR = go.gsdl_path; 144 146 Utility.METADATA_DIR = Utility.BASE_DIR + "metadata" + File.separator; 145 147 Utility.TMP_DIR = Utility.BASE_DIR + "tmp" + File.separator; … … 149 151 Configuration.GS3_CONFIG_XML = "config3Remote.xml"; 150 152 151 Gatherer.setCollectDirectoryPath(go.gsdl_path + "collect" + File.separator);152 153 File col_dir = new File(Gatherer.getCollectDirectoryPath()); 153 154 if (!col_dir.exists()) { 154 155 155 if (JarTools.isInJar(Utility.COLLECT_ZIP)) { 156 156 // Dig out collect.zip from JAR file and unzip it (thereby
Note:
See TracChangeset
for help on using the changeset viewer.