Merge branch 'master' of https://github.com/WikiTeam/wikiteam

commonssql.py

@@ -34,7 +34,7 @@ queries = [
 ]
 
 f = csv.writer(open(filename, 'a'), delimiter='|', quotechar='"', quoting=csv.QUOTE_MINIMAL)
-conn = MySQLdb.connect(host='sql-s4', db='commonswiki_p', read_default_file='~/.my.cnf')
+conn = MySQLdb.connect(host='commonswiki.labsdb', db='commonswiki_p', read_default_file='~/.my.cnf')
 for query in queries:
     conn.query(query)
     r = conn.store_result()

dumpgenerator.py

@@ -1403,8 +1403,11 @@ def getParameters(params=[]):
         api = check[2]
         print 'API is OK: ' + api
     else:
-        print 'Error in API. Please, provide a correct path to API'
-        sys.exit(1)
+        if index and not args.wiki:
+            print 'API not available. Trying with index.php only.'
+        else:
+            print 'Error in API. Please, provide a correct path to API'
+            sys.exit(1)
 
     if index and checkIndex(
             index=index,