Changeset 14302
- Timestamp:
- 2007-08-06T09:40:37+12:00 (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
gli/trunk/src/org/greenstone/gatherer/Configuration.java
r13749 r14302 92 92 93 93 static public Configuration self = null; 94 static p rivateString gli_user_directory_path = null;94 static public String gli_user_directory_path = null; 95 95 96 96 static public boolean just_updated_config_xml_file = false; … … 147 147 // Try to load the configuration file from the user specific location 148 148 String config_xml_file_name = CONFIG_XML; 149 if (gsdl3_path != null ) {149 if (gsdl3_path != null || (Gatherer.isGsdlRemote && Gatherer.GS3)) { 150 150 config_xml_file_name = GS3_CONFIG_XML; 151 151 } … … 193 193 } 194 194 } 195 196 if (gsdl3_path != null ) {195 196 if (gsdl3_path != null || (Gatherer.GS3 && Gatherer.isGsdlRemote)) { 197 197 if (this.site_name == null || this.site_name.equals("")) { 198 198 this.site_name = getString("general.site_name", true); … … 690 690 if (gsdl3_path!=null) { 691 691 config_xml_name = GS3_CONFIG_XML; 692 } 693 694 if (Gatherer.isGsdlRemote) { 695 if (Gatherer.GS3){ 696 config_xml_name = GS3_CONFIG_XML; 697 }else{ 698 config_xml_name = CONFIG_XML; 699 } 692 700 } 693 701 try {
Note:
See TracChangeset
for help on using the changeset viewer.