Changeset 767

Timestamp:

06/04/07 17:49:43 (6 years ago)

Author:

ggpolo

Message:

minor changes

Location:

branch/ggpolo

Files:

• umitDB/retrieve.py (modified) (2 diffs)
• umitGUI/MainWindow.py (modified) (1 diff)
• umitInventory/viewer.py (modified) (4 diffs)

branch/ggpolo/umitDB/retrieve.py

@@ -467 +467 @@
                                    address.pk FROM address WHERE address = ?) \
                                    AND host.fk_scan IN (SELECT fk_scan FROM \
-                                   _inventory_scan WHERE fk_inventory = ?)", 
+                                   _inventory_scan WHERE fk_inventory = ?) \
+                                   ORDER BY host.pk DESC", 
                                  (host_address, fk_inventory)).fetchall()
         
@@ -482 +483 @@
         data = self.cursor.execute("SELECT scan.pk, scan.finish FROM scan \
                 JOIN _inventory_scan ON (_inventory_scan.fk_scan = scan.pk) \
-                WHERE _inventory_scan.fk_inventory = ?", 
+                WHERE _inventory_scan.fk_inventory = ? ORDER BY scan.pk DESC", 
                 (fk_inventory, )).fetchall()
         

branch/ggpolo/umitGUI/MainWindow.py

@@ -414 +414 @@
         dlg.destroy()
         
-        if self.running_ni: # update inventory tree
-            self.niwin._fill_tree()
+        if self.running_ni: # update inventory viewer
+            self.niwin._update_viewer()
             
 

branch/ggpolo/umitInventory/viewer.py

@@ -211 +211 @@
         
         if not len(self.pages): # last page in this inventory was just removed
-            self.daddy._delete_inventory_page()
+            self.daddy._delete_inventory_page() # delete notebook
 
 
@@ -513 +513 @@
             
         if not err: # tab wasn't in inventory tab
-            print "inv: %s" % title
-            
             if data["host_addr"]:
-                #print "load %s data" % data["host_addr"]
-                # load test
-                fk_inventory = self.invdb.get_inventory_id_for_name(title)
-                fk_hosts = self.invdb.get_hosts_base_data_for_inventory_from_db(data["host_addr"], 
-                                                                                fk_inventory)
-                finish_ts = self.invdb.get_finish_data_for_inventory_from_db(fk_inventory)
-                print finish_ts
-                print fk_hosts
-                #fk_hosts = (pk[0] for pk in fk_hosts)
-                
-                # get last created page
-                p = self.invnbpages_objects[self.invnbpages_titles.index(title)]
-                content = p.get_nth_page(p.get_n_pages() - 1)
-            
-                lstore = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
-                
-                for indx, item in enumerate(finish_ts):
-                    iter = lstore.append()
-                    lstore.set(iter, 0, item[1])
-                    if item[0] != fk_hosts[indx][0]:
-                        continue
-                    
-                treeview = gtk.TreeView(lstore)
-                content.add(treeview)
-                
-                # column for timestamp
-                column = gtk.TreeViewColumn('Timestamp', gtk.CellRendererText(),
-                                            text=0)
-                column.set_sort_column_id(0)
-                treeview.append_column(column)
-                # column for host id
-                column = gtk.TreeViewColumn('Host ID', gtk.CellRendererText(),
-                                            text=1)
-                column.set_sort_column_id(1)
-                treeview.append_column(column)
-                
-                treeview.show()
-    
-                    
-                # end load test
+                self._load_inventory_host_data(title, data["host_addr"])
+                
             else:
                 print "load inv info"
                 
-            # load data
-            # ...
-            #
-            # ...
+
+    def _load_inventory_host_data(self, inventory_name, host_addr):
+        """
+        Load data for a host in an inventory.
+        """
+        fk_inventory = self.invdb.get_inventory_id_for_name(inventory_name)
+        base_hosts_data = self.invdb.get_hosts_base_data_for_inventory_from_db(host_addr, 
+                                                                               fk_inventory)
+        finish_data = self.invdb.get_finish_data_for_inventory_from_db(fk_inventory)
+                
+        # get last created page
+        p = self.invnbpages_objects[self.invnbpages_titles.index(inventory_name)]
+        content = p.get_nth_page(p.get_n_pages() - 1)
+            
+        lstore = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
+                
+        # insert scan finish date and host status
+        host_count = 0
+        for item in finish_data:
+            iter = lstore.append()
+            lstore.set(iter, 0, item[1])
+                    
+            if base_hosts_data[host_count][0] == item[0]:
+                lstore.set(iter, 1, "up")
+                host_count += 1
+            else:
+                lstore.set(iter, 1, "down")
+                    
+        treeview = gtk.TreeView(lstore)
+        content.add(treeview)
+                
+        # column for scan finish timestamp
+        column = gtk.TreeViewColumn(_("Scan finish date"), 
+                                    gtk.CellRendererText(), text=0)
+        column.set_sort_column_id(0)
+        treeview.append_column(column)
+                
+        # column for host status
+        column = gtk.TreeViewColumn(_("Host status"), 
+                                    gtk.CellRendererText(), text=1)
+        treeview.append_column(column)
+                
+        treeview.show()
             
 
@@ -616 +615 @@
 
 
+    def _update_viewer(self):
+        """
+        Call this when needed to update Network Inventory Viewer.
+        """
+        self._fill_tree()
+        # ToDo: Reload data on openned tabs
+        
+
     def _create_ui_manager(self):
+        """
+        Set up user interface.
+        """
         self.ui_manager = gtk.UIManager()
         self.main_action_group = gtk.ActionGroup("MainActionGroup")
@@ -769 +779 @@
 
         left_pane_box = gtk.VBox()
-        #left_pane_box.set_border_width(3)
         left_pane_box.pack_start(self.invtree, True, True, 0)