add debug/import/export option, delete database option

diff --git a/ti2.py b/ti2.py
index 07e1a47..f91d011 100755 (executable)
--- a/ti2.py
+++ b/ti2.py
@@ -9,12 +9,8 @@
 #
 __version__ = '1.1'
 
-import sys
-import os
-import re
 from optparse import OptionParser, OptionGroup
 from linkpair.collect.collector import Collector
-from linkpair.linkpair import LinkPair
 from linkpair.formatter.grapheasy import GraphEasyFormatter
 from linkpair.formatter.springy import SpringyFormatter
 from linkpair.formatter.springy_raphael import SpringyRaphaelFormatter
@@ -24,12 +20,13 @@ from linkpair.dbutils import DBUtils
 
 
 def print_linkpair_records(lps):
-    util = CommonUtils()
-    format.set_linkpairs(lps)
-    for lp in format.format_linkpairs():
+    util.debug_out("start print_linkpair_records()")
+    formatatter.set_linkpairs(lps)
+    for lp in formatatter.format_linkpairs():
         util.message_out(lp)
+    util.debug_out("end print_linkpair_records()")
 
-if __name__ == "__main__":
+if __name__ == "__main__":    
     # init program options
     p = OptionParser(version="ver:%s" % __version__)
     g1 = OptionGroup(p, "Remote connection",
@@ -47,10 +44,12 @@ if __name__ == "__main__":
                  default="graph-easy",
                  help="specify output format [FORMAT: g/graph-easy, s/springy, r/springy-raphael, t/graphviz-tb]",
                  metavar="FORMAT")
-    p.add_option('-d', '--database', dest='database', default="",
-                 help="store record to database", metavar="FILE")
-    p.add_option('-t', '--datatype', dest='datatype', default="json",
-                 help="specify database type(default: json)", metavar="TYPE")
+    p.add_option('-d', '--debug', dest='debug', action="store_true", default=False,
+                 help="enable debug output")
+    p.add_option('-e', '--export_file', dest='export_file', 
+                 help="export linkpairs to json file", metavar="FILE")
+    p.add_option('-i', '--import_file', dest='import_file', 
+                 help="import json file as linkpairs", metavar="FILE")
     g2 = OptionGroup(p, "Collector Agent flags",
                      "disable Collector Agents")
     g2.add_option(
@@ -82,24 +81,29 @@ if __name__ == "__main__":
         '-v', '--verbose', dest='verbose', action="store_true", default=False,
         help="verbose output.")
     (opts, args) = p.parse_args()
+    util = CommonUtils()
+    util.set_opts(opts)
+    util.debug_out("init program options")
     dbu = DBUtils()
-    if opts.database is not None and opts.database != "":
-        dbu.db_enable = True
+    #if opts.database is not None and opts.database != "":
+    #    dbu.db_enable = True
         # sql_conn = dbu.open_db(opts.database)
         # dbu.create_tables()
 
     if opts.format == "g" or opts.format == "graph-easy":
-        format = GraphEasyFormatter()
+        formatatter = GraphEasyFormatter()
     elif opts.format == "s" or opts.format == "springy":
-        format = SpringyFormatter()
+        formatatter = SpringyFormatter()
     elif opts.format == "r" or opts.format == "springy-raphael":
-        format = SpringyRaphaelFormatter()
+        formatatter = SpringyRaphaelFormatter()
     elif opts.format == "t" or opts.format == "graphviz-tb":
-        format = GraphvizTBFormatter()
+        formatatter = GraphvizTBFormatter()
     else:
-        format = GraphEasyFormatter()
+        formatatter = GraphEasyFormatter()
+    util.debug_out("formatter: " + str(formatatter))
 
-    col = Collector(opts, dbu, format)
+    
+    col = Collector(opts, dbu, formatatter)
     if opts.remote_sshkey is not None:
         col.set_remote_sshkey(opts.remote_sshkey)
     if opts.remote_password is not None:
@@ -107,8 +111,8 @@ if __name__ == "__main__":
 
     col.run()
     linkpairs = col.get_linkpairs()
-    if dbu.db_enable:
-        dbu.store_to_db(opts.database, linkpairs)
+    #if dbu.db_enable:
+    #    dbu.store_to_db(opts.database, linkpairs)
 
     print_linkpair_records(linkpairs)