1.1 --- a/convert.py Sun Apr 22 19:16:47 2012 +0200
1.2 +++ b/convert.py Sun Apr 22 20:48:55 2012 +0200
1.3 @@ -33,10 +33,11 @@
1.4
1.5 "Handle content from a Confluence Wiki dump."
1.6
1.7 - def __init__(self, space):
1.8 + def __init__(self, space, no_translate=False):
1.9 self.content = {}
1.10 self.elements = []
1.11 self.space = space
1.12 + self.no_translate = no_translate
1.13
1.14 def handle_object(self, name, elements, attributes, all_text, text):
1.15
1.16 @@ -107,7 +108,13 @@
1.17 body = content["body"]
1.18 if not body:
1.19 body = "## Empty page."
1.20 - translate(join(versions_dir, content["content"]), body)
1.21 +
1.22 + if no_translate:
1.23 + fn = write
1.24 + else:
1.25 + fn = translate
1.26 +
1.27 + fn(join(versions_dir, content["content"]), body)
1.28
1.29 self.content = {}
1.30
1.31 @@ -232,8 +239,9 @@
1.32
1.33 filename = sys.argv[1]
1.34 is_zipfile = splitext(filename)[-1] == extsep + "zip"
1.35 + space = sys.argv[2]
1.36
1.37 - space = sys.argv[2]
1.38 + no_translate = "--no-translate" in sys.argv
1.39
1.40 if exists(space):
1.41 print >>sys.stderr, "Directory exists for space %s. Please choose another or remove its contents." % space
1.42 @@ -250,7 +258,7 @@
1.43 mkdirs(join(space, "versions"))
1.44
1.45 p = xmlread.ConfigurableParser()
1.46 - handler = ConfluenceHandler(space)
1.47 + handler = ConfluenceHandler(space, no_translate)
1.48
1.49 p["object"] = handler.handle_object
1.50 p["property"] = handler.handle_property