Revision: 48539
Author:   rainman
Date:     2009-03-18 21:22:41 +0000 (Wed, 18 Mar 2009)

Log Message:
-----------
Make sure we tell the user when invalid directory is supplied, instead of 
spewing out all kinds of strange errors. 

Modified Paths:
--------------
    branches/lucene-search-2.1/src/org/wikimedia/lsearch/util/Configure.java

Modified: 
branches/lucene-search-2.1/src/org/wikimedia/lsearch/util/Configure.java
===================================================================
--- branches/lucene-search-2.1/src/org/wikimedia/lsearch/util/Configure.java    
2009-03-18 21:14:33 UTC (rev 48538)
+++ branches/lucene-search-2.1/src/org/wikimedia/lsearch/util/Configure.java    
2009-03-18 21:22:41 UTC (rev 48539)
@@ -1,6 +1,7 @@
 package org.wikimedia.lsearch.util;
 
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -39,6 +40,12 @@
                if(mediawiki.endsWith(System.getProperty("file.separator")))
                        mediawiki = mediawiki.substring(0,mediawiki.length()-1);
                
+               if( ! new File(mediawiki+"/LocalSettings.php").exists() ){
+                       System.out.println("ERROR: "+mediawiki+" does not 
appear to contain a MediaWiki installation. ");
+                       System.out.println("Please give full path to root 
directory (where LocaliseSettings.php is) of your MediWiki installation. ");
+                       return;
+               }
+               
                String dbname = getVariable(mediawiki,"wgDBname");
                String scriptPath = getVariable(mediawiki,"wgScriptPath");
                String server = getVariable(mediawiki,"wgServer");



_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to