Changeset 14567 for gli/trunk/src/org/greenstone/gatherer/Gatherer.java
- Timestamp:
- 2007-09-25T10:13:24+12:00 (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
gli/trunk/src/org/greenstone/gatherer/Gatherer.java
r14372 r14567 132 132 } 133 133 134 static private URL default_gliserver_url=null; 134 135 135 136 public Gatherer(String[] args) … … 291 292 if (Configuration.library_url == null) { 292 293 missingEXEC(); 293 if ((Configuration.library_url!=null) && isGsdlRemote && GS3 && (gliserver_url_string==null)){ 294 Configuration.gliserver_url = new URL(Configuration.library_url.toString() + "/cgi-bin/gliserver4gs3.pl"); 295 gliserver_url_string = Configuration.gliserver_url.toString(); 296 Configuration.setString("general.gliserver_url", true, gliserver_url_string); 294 if ((Configuration.library_url!=null) && isGsdlRemote && (gliserver_url_string==null)){ 295 if (GS3){ 296 default_gliserver_url = new URL(Configuration.library_url.toString() + "/cgi-bin/gliserver4gs3.pl"); 297 }else{ 298 default_gliserver_url = new URL(Configuration.library_url.toString().substring(0,Configuration.library_url.toString().lastIndexOf("/library")) + "/gliserver.pl"); 299 } 300 missingGLIServer(); 297 301 } 298 302 } … … 313 317 if (isGsdlRemote) { 314 318 if (Configuration.gliserver_url == null) { 319 if (Configuration.library_url != null) { 320 if (GS3){ 321 default_gliserver_url = new URL(Configuration.library_url.toString() + "/cgi-bin/gliserver4gs3.pl"); 322 }else{ 323 default_gliserver_url = new URL(Configuration.library_url.toString().substring(0,Configuration.library_url.toString().lastIndexOf("/library")) + "/gliserver.pl"); 324 } 325 } 315 326 missingGLIServer(); 316 327 } … … 781 792 } 782 793 dialog.setValueField(new URLField(Configuration.getColor("coloring.editable_foreground", false), Configuration.getColor("coloring.editable_background", false))); 794 795 if (Gatherer.default_gliserver_url!=null){ 796 dialog.setValueField(Gatherer.default_gliserver_url.toString()); 797 } 798 783 799 dialog.display(); 784 800 dialog.dispose(); 785 801 dialog = null; 786 802 787 803 String gliserver_url_string = Configuration.getString("general.gliserver_url", true); 788 804 if (!gliserver_url_string.equals("")) {
Note:
See TracChangeset
for help on using the changeset viewer.