changes for 3.0

[monitor.git] / pkl2php.py

diff --git a/pkl2php.py b/pkl2php.py
index 9602525..677a54f 100755 (executable)
--- a/pkl2php.py
+++ b/pkl2php.py
@@ -1,19 +1,23 @@
 #!/usr/bin/python
 
-import soltesz
-from config import config
-from optparse import OptionParser
-parser = OptionParser()
+import database 
+import parser as parsermodule
+
+parser = parsermodule.getParser()
 parser.set_defaults(filename=None)
-parser.add_option("-f", "--dbname", dest="dbname", metavar="FILE", 
-                                       help="Provide the input file to convert")
-config = config(parser)
-config.parse_args()
+parser.add_option("-i", "--idb", dest="input", metavar="dbname", 
+                                       help="Provide the input dbname to convert")
+parser.add_option("-o", "--odb", dest="output", metavar="dbname", 
+                                       help="Provide the output dbname to save to")
+config = parsermodule.parse_args(parser)
 
-if config.dbname is None:
+if config.input is None:
        print "please provide a pickle file to convert"
        import sys
        sys.exit(1)
+if config.output is None:
+       # just use the input name.
+       config.output = config.input
 
-data = soltesz.dbLoad(config.dbname)
-soltesz.dbDump(config.dbname, data, 'php')
+data = database.dbLoad(config.input)
+database.dbDump(config.output, data, 'php')