Issue 72: revert r857, just define everything in launcher.py

git-svn-id: https://wikiteam.googlecode.com/svn/trunk@860 31edc4fc-5e31-b4c4-d58b-c8bc928bcb95

batchdownload/launcher.py

@@ -32,7 +32,8 @@ for wiki in wikis:
     print "# Downloading", wiki
     print "#"*73
     wiki = wiki.lower()
-    prefix = dumpgenerator.domain2prefix(config={'api': wiki})
+    # Make the prefix in standard way; api and index must be defined, not important which is which
+    prefix = dumpgenerator.domain2prefix(config={'api': wiki, 'index': wiki})
     
     #check if compressed, in that case it is finished
     compressed = False

dumpgenerator.py

@@ -706,12 +706,15 @@ def saveLogs(config={}):
     delay(config=config)
 
 def domain2prefix(config={}):
-    """ Convert domain name to a valid prefix filename """
+    """ Convert domain name to a valid prefix filename. """
+    # At this point, both api and index are supposed to be defined
     domain = ''
-    if 'api' in config:
+
+    if config['api']:
         domain = config['api']
-    elif 'index' in config:
+    elif config['index']:
         domain = config['index']
+
     domain = domain.lower()
     domain = re.sub(r'(https?://|www\.|/index\.php|/api\.php)', '', domain)
     domain = re.sub(r'/', '_', domain)