Changeset 949

Timestamp:

07/05/07 19:10:49 (6 years ago)

Author:

ggpolo

Message:

small fix in changeslist.py for checking host availability, fix for checking database updates, added new cursor (dict_factory) for umitDB

Location:

branch/ggpolo

Files:

• umitDB/connection.py (modified) (2 diffs)
• umitDB/retrieve.py (modified) (2 diffs)
• umitDB/search.py (modified) (1 diff)
• umitInventory/changeslist.py (modified) (1 diff)
• umitInventory/invtree.py (modified) (1 diff)
• umitInventory/viewer.py (modified) (4 diffs)

branch/ggpolo/umitDB/connection.py

@@ -25 +25 @@
 from umitDB._database import database
 from umitDB.utils import debug
+
+def dict_factory(cursor, row):
+    """
+    Convert a standard row to a dict.
+    """
+    d = {}
+
+    for idx, col in enumerate(cursor.description):
+        d[col[0]] = row[idx]
+        
+    return d
+
 
 class ConnectDB:
@@ -55 +67 @@
     
     
+    def use_dict_cursor(self):
+        """
+        Change to dict_factory cursor.
+        """
+        self.cursor.close()
+        self.conn.row_factory = dict_factory
+        self.cursor = self.conn.cursor()
+
+        
+    def use_standard_cursor(self):
+        """
+        Change to standard cursor.
+        """
+        self.cursor.close()
+        self.conn.row_factory = None
+        self.cursor = self.conn.cursor()
+        
+    
     def get_id_for(self, table_name):
         """

branch/ggpolo/umitDB/retrieve.py

@@ -422 +422 @@
         debug("Getting port data for pdata..")
         
-        fullpdata = self.cursor.execute("SELECT protocol.name, \
+        fullpdata = self.cursor.execute("SELECT protocol.name as protocol, \
                         port_state.state, service_info.product, \
                         service_info.version, service_info.extrainfo, \
@@ -430 +430 @@
                         port_state.pk = ? AND service_info.pk = ? AND \
                         service_name.pk = service_info.fk_service_name",
-                        (protocol_id, port_state_id, service_info_id)).fetchall()[0]
+                        (protocol_id, port_state_id, 
+                         service_info_id)).fetchall()[0]
         
         return fullpdata

branch/ggpolo/umitDB/search.py

@@ -149 +149 @@
             # search for port with number in looking_for
             if compare:
-                #self.conn.create_function("compare", 3, perform_comparison)
-                #search = self.cursor.execute("SELECT port.portid FROM port \
-                #               JOIN _host_port ON (_host_port.fk_port=port.pk) \
-                #               WHERE _host_port.fk_host=? AND \
-                #               compare(port.portid, ?, ?)", (host_id,
-                #                                             compare, 
-                #                                             looking_for)).fetchall()
                 search = self.cursor.execute("SELECT port.portid FROM port \
                                JOIN _host_port ON (_host_port.fk_port=port.pk) \

branch/ggpolo/umitInventory/changeslist.py

@@ -291 +291 @@
                 if item[0] == host_scans[d][0]:
                     d += 1
+                else:
+                    down_order.append(item[0])
+                    down_d[item[0]] = item[1]
         
         return (down_d, down_order)

branch/ggpolo/umitInventory/invtree.py

@@ -37 +37 @@
 class InventoryTree(gtk.HBox):
     """
-    A hbox that holds a gtk.TreeView that holds all inventories in database.
+    A HBox that holds a Notebook that holds a ScrolledWindow that holds a 
+    TreeView that holds all inventories in database.
     """
     

branch/ggpolo/umitInventory/viewer.py

@@ -61 +61 @@
     umitdb = Path.umitdb_ng
 
+NI_VER = '0.2'
 controller = Path.sched_control
 inventory_info = _("Info")
@@ -836 +837 @@
         # check for database changes
         prev_stat = self.db_stat
-        possibly_new = os.stat(umitdb).st_mtime
+        try:
+            possibly_new = os.stat(umitdb).st_mtime
+        except OSError:
+            return True
+
         if prev_stat != possibly_new:
             #print "db changed"
@@ -844 +849 @@
         # check for changes in schemas
         prev_state = self.schema_stat
-        possibly_new = os.stat(Path.sched_schemas).st_mtime
+        try:
+            possibly_new = os.stat(Path.sched_schemas).st_mtime
+        except OSError:
+            return True
+
         if prev_state != possibly_new:
             #print "schemas changed"
@@ -857 +866 @@
         Set window properties.
         """
-        self.set_title(_("UMIT Network Inventory 0.1.5"))
+        self.set_title(_("UMIT Network Inventory %s" % NI_VER))
         # a size for testing
         self.set_position(gtk.WIN_POS_CENTER)