| Index: branches/ariel/xmldumps-backup/WikiDump.py |
| — | — | @@ -427,16 +427,19 @@ |
| 428 | 428 | return os.path.join(self.config.privateDir, self.dbName) |
| 429 | 429 | |
| 430 | 430 | def webDir(self): |
| 431 | | - return "/".join((self.config.webRoot, self.dbName)) |
| | 431 | + webRoot = self.config.webRoot |
| | 432 | + if webRoot[-1] == '/': |
| | 433 | + webRoot = webRoot[:-1] |
| | 434 | + return "/".join((webRoot, self.dbName)) |
| 432 | 435 | |
| 433 | 436 | def webDirRelative(self): |
| 434 | 437 | webRootRelative = self.webDir() |
| 435 | 438 | i = webRootRelative.find("://") |
| 436 | 439 | if i >= 0: |
| 437 | | - webRootRelative = webRootRelative[i:] |
| | 440 | + webRootRelative = webRootRelative[i+3:] |
| 438 | 441 | i = webRootRelative.find("/") |
| 439 | 442 | if i >= 0: |
| 440 | | - webRootRelative = webRootRelative[i:] |
| | 443 | + webRootRelative = webRootRelative[i:] |
| 441 | 444 | return webRootRelative |
| 442 | 445 | |
| 443 | 446 | # Actions! |