Changeset 10330
- Timestamp:
- 2005-07-27T16:38:09+12:00 (19 years ago)
- Location:
- trunk/gli/src/org/greenstone/gatherer
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gli/src/org/greenstone/gatherer/Configuration.java
r10006 r10330 99 99 /** The path to the Greenstone Suite installation directory. */ 100 100 static public String gsdl_path = ""; 101 /** If we are using GLI in Greenstone 3, the path to gsdl3 directory*/101 /** If we are using GLI in Greenstone 3, the path to gsdl3 home (== web dir) */ 102 102 static public String gsdl3_path = ""; 103 /** If we are using GLI in Greenstone 3, the path to gsdl3 src directory (== gsdl3 dir)*/ 104 static public String gsdl3_src_path = ""; 103 105 /** The path to the PERL executable, up to and including Perl.exe. */ 104 106 static public String perl_path = ""; … … 132 134 /** Constructor. 133 135 * @param gsdl_path The path to the Greenstone directory as a <strong>String</strong>. 134 * @param gsdl3_path The path to the Greenstone 3 directory as a <strong>String</strong>. 136 * @param gsdl3_path The path to the Greenstone 3 home (web) directory as a <strong>String</strong>. 137 * @param gsdl3_src_path The path to the Greenstone 3 src directory as a <strong>String</strong>. 135 138 * @param site_name The name of the Greenstone 3 site currently in use. 136 139 */ 137 public Configuration(String gsdl_path, String gsdl3_path, String site_name)140 public Configuration(String gsdl_path, String gsdl3_path, String gsdl3_src_path, String site_name) 138 141 { 139 142 super(); … … 142 145 this.gsdl_path = gsdl_path; 143 146 this.gsdl3_path = gsdl3_path; 147 this.gsdl3_src_path = gsdl3_src_path; 144 148 this.site_name = site_name; 145 149 … … 679 683 680 684 static public String getGS3ScriptPath() { 681 return gsdl3_ path + "bin" + File.separator + "script" + File.separator;685 return gsdl3_src_path + "bin" + File.separator + "script" + File.separator; 682 686 } 683 687 -
trunk/gli/src/org/greenstone/gatherer/Gatherer.java
r10250 r10330 204 204 } 205 205 206 init(go.gsdl_path, go.gsdl3_path, go. local_library_path, go.library_url_string, go.debug,206 init(go.gsdl_path, go.gsdl3_path, go.gsdl3_src_path, go.local_library_path, go.library_url_string, go.debug, 207 207 go.perl_path, go.no_load, go.filename, go.site_name, go.servlet_path, go.wget_path); 208 208 } 209 209 210 210 211 public void init(String gsdl_path, String gsdl3_path, String local_library_path,211 public void init(String gsdl_path, String gsdl3_path, String gsdl3_src_path, String local_library_path, 212 212 String library_url_string, boolean debug_enabled, String perl_path, 213 213 boolean no_load, String open_collection, … … 218 218 } else { 219 219 gsdl3_path = null; 220 gsdl3_src_path = null; 220 221 } 221 222 … … 236 237 try { 237 238 // Load GLI config file 238 new Configuration(gsdl_path, gsdl3_path, site_name);239 new Configuration(gsdl_path, gsdl3_path, gsdl3_src_path, site_name); 239 240 if (Configuration.just_updated_config_xml_file) { 240 241 // Delete the plugins.dat and classifiers.dat files … … 557 558 static public String getSitesDirectoryPath() 558 559 { 559 return Configuration.gsdl3_path + File.separator + "web" + File.separator +"sites" + File.separator;560 return Configuration.gsdl3_path + "sites" + File.separator; 560 561 } 561 562 -
trunk/gli/src/org/greenstone/gatherer/GetOpt.java
r10242 r10330 42 42 public String gsdl_path = null; 43 43 public String gsdl3_path = null; 44 public String gsdl3_src_path = null; 44 45 public String library_url_string = null; 45 46 public String local_library_path = null; … … 154 155 } 155 156 } 157 // GSDL3 src path 158 if(argument_name.equals(StaticStrings.GSDL3_SRC_ARGUMENT)) { 159 if(argument_value.endsWith(File.separator)) { 160 gsdl3_src_path = argument_value; 161 } 162 else { 163 gsdl3_src_path = argument_value + File.separator; 164 } 165 } 166 156 167 else if (argument_name.equals(StaticStrings.SITE_ARGUMENT)) { 157 168 site_name = argument_value; -
trunk/gli/src/org/greenstone/gatherer/ServletConfiguration.java
r10006 r10330 67 67 68 68 //String web_xml_path = gsdl3_path + File.separator + "web" + File.separator + "WEB-INF"+ File.separator + "web.xml"; 69 File web_xml = new File(gsdl3_path + File.separator + "web" + File.separator +"WEB-INF"+ File.separator + "web.xml");69 File web_xml = new File(gsdl3_path + "WEB-INF"+ File.separator + "web.xml"); 70 70 71 71 if (!web_xml.exists()) { -
trunk/gli/src/org/greenstone/gatherer/gems/GEMS.java
r10013 r10330 177 177 this.self = this; 178 178 JarTools.initialise(this); 179 config = new Configuration(gsdl_path, null, null );179 config = new Configuration(gsdl_path, null, null, null); 180 180 181 181 // Read Dictionary -
trunk/gli/src/org/greenstone/gatherer/util/StaticStrings.java
r10006 r10330 116 116 static final public String GSDL_ARGUMENT = "-gsdl"; 117 117 static final public String GSDL3_ARGUMENT = "-gsdl3"; 118 static final public String GSDL3_SRC_ARGUMENT = "-gsdl3src"; 118 119 static final public String HFILE_ARGUMENT = "-hfile"; 119 120 static final public String HIDDENGLI_ELEMENT = "HiddenGLI"; -
trunk/gli/src/org/greenstone/gatherer/util/Utility.java
r10250 r10330 443 443 444 444 static public String getSitesDir(String gsdl3_path) { 445 return gsdl3_path + File.separator + "web" 446 + File.separator + "sites" + File.separator; 445 return gsdl3_path + "sites" + File.separator; 447 446 448 447 }
Note:
See TracChangeset
for help on using the changeset viewer.