Revert r874: breaks backwards compatibility, no usecase provided

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

uploader.py

@@ -76,9 +76,6 @@ def upload(wikis):
         print "#"*73
         wiki = wiki.lower()
         prefix = dumpgenerator.domain2prefix(config={'api': wiki})
-        domain = re.sub(r'(/index\.php|/api\.php)', '', wiki)
-        domain = re.sub(r'(http://|https://)', '', domain)
-        domain = re.sub(r'/', '_', domain)
 
         wikiname = prefix.split('-')[0]
         dumps = []
@@ -211,7 +208,7 @@ def upload(wikis):
                 ]
             
             curl += ['--upload-file', "%s" % (dump),
-                    "http://s3.us.archive.org/wiki-%s/%s" % (domain, dump), # It could happen that the identifier is taken by another user; only wikiteam collection admins will be able to upload more files to it, curl will fail immediately and get a permissions error by s3.
+                    "http://s3.us.archive.org/wiki-%s/%s" % (wikiname, dump), # It could happen that the identifier is taken by another user; only wikiteam collection admins will be able to upload more files to it, curl will fail immediately and get a permissions error by s3.
             ]
             curlline = ' '.join(curl)
             os.system(curlline)