Changeset 4198 for trunk/umitInventory/TLChangesTree.py

Timestamp:

02/24/09 23:23:20 (4 years ago)

Author:

gpolo

Message:

Merged revisions 4193,4196-4197 via svnmerge from
http://svn.umitproject.org/svnroot/umit/branch/NetworkInventory

........

r4193 | gpolo | 2009-02-23 23:31:08 -0300 (Mon, 23 Feb 2009) | 1 line

Moving to log

........

r4196 | gpolo | 2009-02-24 20:08:10 -0300 (Tue, 24 Feb 2009) | 1 line

Fixed ticket #225: Use the i18n version of category names

........

r4197 | gpolo | 2009-02-24 20:13:11 -0300 (Tue, 24 Feb 2009) | 1 line

data_lenght -> data_length

........

Location:

trunk

Files:

• . (modified) (1 prop)
• umitInventory/TLChangesTree.py (modified) (9 diffs)

trunk/umitInventory/TLChangesTree.py

@@ -23 +23 @@
 from umitCore.I18N import _
 
+from umitInventory.TLBase import categories
+
 ALLCHANGES = _("View all changes")
 LISTCHANGES = _("Changes listing")
@@ -31 +33 @@
     """
 
-    def __init__(self, connector, datagrabber, categories, inventory,
+    def __init__(self, connector, datagrabber, db_categories, inventory,
         hostaddr):
 
@@ -38 +40 @@
         self.connector = connector
         self.datagrabber = datagrabber
-        self.categories = categories
+        self.db_categories = db_categories
         self.inventory = inventory
         self.hostaddr = hostaddr
@@ -66 +68 @@
         # startup situation
         self.treestore.append(None, [ALLCHANGES])
-        for category in self.categories:
-            self.treestore.append(None, ["%s (0)" % category])
+        for category in self.db_categories:
+            self.treestore.append(None, ["%s (0)" % categories[category]])
 
 
@@ -85 +87 @@
 
             elif len(path) == 2:
-                # clicked on View all changes inside a category
+                # clicked on "View all changes" inside a category
                 category_id = path[0]
                 category_load = { }
@@ -142 +144 @@
         Grabs changes from range_start to range_end and then update tree.
         """
-        categories = self.datagrabber.get_categories()
-        self.categories = [value[1] for key, value in categories.items()]
+        db_categories = self.datagrabber.get_categories()
+        self.db_categories = [value[1] for key, value in db_categories.items()]
 
         data = { }
@@ -149 +151 @@
         # grab changes in timerange
         self.datagrabber.use_dict_cursor()
-        for key in categories.keys():
+        for key in db_categories.keys():
             if not range_start or not range_end:
                 data[key] = { }
@@ -190 +192 @@
 
                 # update clean_data
-                #if clean_data[category].has_key(inventories[fk_inventory]):
                 if inventories[fk_inventory] in clean_data[category]:
                     cdata = clean_data[category][inventories[fk_inventory]]
 
-                    #if cdata.has_key(addresses[fk_address]):
                     if addresses[fk_address] in cdata:
                         cdata[addresses[fk_address]] += 1
@@ -213 +213 @@
         self.treestore.append(None, [ALLCHANGES])
 
-        for indx, item in enumerate(self.categories):
-            data_lenght = len(data[indx + 1]) # keys starting at 1
-            changes_sum += data_lenght
-
-            root = self.treestore.append(None, ["%s (%d)" % (item,
-                data_lenght)])
-
-            if data_lenght > 0:
+        for indx, item in enumerate(self.db_categories):
+            data_length = len(data[indx + 1]) # keys starting at 1
+            changes_sum += data_length
+
+            root = self.treestore.append(None, ["%s (%d)" % (categories[item],
+                data_length)])
+
+            if data_length > 0:
                 self.treestore.append(root, [ALLCHANGES])