Rewrite from scratch. Text conversion almost(TM) works

1 files changed, 14 insertions, 10 deletions

diff --git a/wikicvt.py b/wikicvt.py
index 758bcb1..a2e95e4 100644
--- a/wikicvt.py
+++ b/wikicvt.py
@@ -34,5 +34,7 @@ def main():
     kwdict = {}
+    debug = 0
+    
     try:
-        opts, args = getopt.getopt(sys.argv[1:], "hl:o:tv",
-                                   ["help", "lang=", "option=",
+        opts, args = getopt.getopt(sys.argv[1:], "d:hl:o:tv",
+                                   ["debug=", "help", "lang=", "option=",
                                     "text", "input-text", "verbose" ])
@@ -44,9 +46,9 @@ def main():
             usage()
-        if o in ("-v", "--verbose"):
+        elif o in ("-v", "--verbose"):
             verbose_flag = verbose_flag + 1
-        if o in ("-t", "--text"):
+        elif o in ("-t", "--text"):
             html = 0
-        if o in ("-l", "--lang"):
+        elif o in ("-l", "--lang"):
             lang = a
-        if o in ("-o", "--option"):
+        elif o in ("-o", "--option"):
             (kw,sep,val) = a.partition('=')
@@ -54,4 +56,6 @@ def main():
                 kwdict[kw] = eval(val)
-        if o == "--input-text":
+        elif o == "--input-text":
             input_text = True
+        elif o in ("-d", "--debug"):
+            debug = eval(a)
 
@@ -70,7 +74,7 @@ def main():
         markup = TextWiktionaryMarkup(**kwdict)
-    
+    markup.debug_level = debug
     markup.parse()
     print str(markup)
-    if verbose_flag > 0:
-        markup.output()
+#    if verbose_flag > 0:
+#        markup.output()