Ticket #199: nosqlite_noumitdb.diff

umitGUI/MainWindow.py

@@ -54 +54 @@
 from umitCore.I18N import _
 from umitCore.UmitOptionParser import option_parser
 from umitCore.UmitConf import SearchConfig, is_maemo
-from umitCore.UmitDB import Scans, UmitDB
 
+try:
+    from umitCore.UmitDB import Scans, UmitDB
+except ImportError:
+    UmitDB = None
+    Scans = None
+
 from umitPlugin.Window import PluginWindow
 from umitPlugin.Engine import PluginEngine
 
@@ -518 +523 @@
             f.close()
 
         search_config = SearchConfig()
-        if search_config.store_results:
+        if search_config.store_results and Scans is not None:
             try:
                 log.debug(">>> Saving result into data base...")
                 scan = Scans(scan_name=self.scan_notebook.get_tab_title(page),
@@ -1024 +1029 @@
                 self.show_all()
                 return True
         else:
-            # Cleaning up data base
-            UmitDB().cleanup(SearchConfig().converted_save_time)
+            if UmitDB is not None:
+                # Cleaning up data base
+                UmitDB().cleanup(SearchConfig().converted_save_time)
 
             # Saving the plugins
             PluginEngine().plugins.save_changes()

umitCore/SearchResult.py

@@ -28 +28 @@
 from tempfile import mktemp
 from types import StringTypes
 
-from umitCore.UmitDB import UmitDB
 from umitCore.NmapParser import NmapParser
 from umitCore.UmitLogging import log
 
+try:
+    from umitCore.UmitDB import UmitDB
+except ImportError:
+    UmitDB = None
 
 class SearchResult(object):    
     def __init__(self):
@@ -255 +258 @@
 
     def get_scan_results(self):
         log.debug(">>> Getting scan results stored in data base")
+        if UmitDB is None:
+            log.debug(">>> UmitDB is disabled")
+            return
+
         u = UmitDB()
 
         for scan in u.get_scans():

umitCore/UmitDB.py

@@ -23 +23 @@
 import md5
 
 from umitCore.I18N import _
+from umitCore.UmitLogging import log
 
 sqlite = None
 OperationalError = None
@@ -34 +35 @@
         # In case this script is being running under python2.5 with sqlite3
         import sqlite3 as sqlite
     except ImportError:
-        raise ImportError(_("""No module named pysqlite2 or sqlite3.
-            Please install pysqlite2 or sqlite3."""))
+        log.debug("UmitDB will not be available.")
+        raise ImportError(
+                _("No module named pysqlite2 or sqlite3 found"))
     from sqlite3 import OperationalError
 
 from time import time