Changeset 4766

Timestamp:

05/07/09 01:29:38 (4 years ago)

Author:

rcarvalho

Message:

Merged revisions 4188-4189 via svnmerge from
http://svn.umitproject.org/svnroot/umit/trunk

................

r4188 | gpolo | 2009-02-23 20:23:55 -0300 (Seg, 23 Fev 2009) | 13 lines

Merged revisions 4186-4187 via svnmerge from
http://svn.umitproject.org/svnroot/umit/branch/NetworkInventory

........

r4186 | gpolo | 2009-02-23 18:05:03 -0300 (Mon, 23 Feb 2009) | 1 line

Fixed ticket #219

........

r4187 | gpolo | 2009-02-23 18:17:36 -0300 (Mon, 23 Feb 2009) | 1 line

Default to daily view in timeline

........

................

r4189 | gpolo | 2009-02-23 22:32:13 -0300 (Seg, 23 Fev 2009) | 1 line

test -> tests (so it doesn't conflict with python's test package)

................

Location:

branch/umitweb-ng

Files:

• . (modified) (1 prop)
• share/umit/config/timeline-settings.conf (modified) (1 diff)
• test (deleted)
• tests (copied) (copied from trunk/tests)
• tests/__init__.py (copied) (copied from trunk/tests/__init__.py)
• tests/core (copied) (copied from trunk/tests/core)
• tests/core/__init__.py (copied) (copied from trunk/tests/core/__init__.py)
• tests/core/data (copied) (copied from trunk/tests/core/data)
• tests/core/data/nmap-output-error.xml (copied) (copied from trunk/tests/core/data/nmap-output-error.xml)
• tests/core/data/teste1.usr (copied) (copied from trunk/tests/core/data/teste1.usr)
• tests/core/data/teste2.usr (copied) (copied from trunk/tests/core/data/teste2.usr)
• tests/core/data/teste3.usr (copied) (copied from trunk/tests/core/data/teste3.usr)
• tests/core/data/xml_test1.xml (copied) (copied from trunk/tests/core/data/xml_test1.xml)
• tests/core/data/xml_test10.xml (copied) (copied from trunk/tests/core/data/xml_test10.xml)
• tests/core/data/xml_test11.xml (copied) (copied from trunk/tests/core/data/xml_test11.xml)
• tests/core/data/xml_test12.xml (copied) (copied from trunk/tests/core/data/xml_test12.xml)
• tests/core/data/xml_test2.xml (copied) (copied from trunk/tests/core/data/xml_test2.xml)
• tests/core/data/xml_test3.xml (copied) (copied from trunk/tests/core/data/xml_test3.xml)
• tests/core/data/xml_test4.xml (copied) (copied from trunk/tests/core/data/xml_test4.xml)
• tests/core/data/xml_test5.xml (copied) (copied from trunk/tests/core/data/xml_test5.xml)
• tests/core/data/xml_test6.xml (copied) (copied from trunk/tests/core/data/xml_test6.xml)
• tests/core/data/xml_test7.xml (copied) (copied from trunk/tests/core/data/xml_test7.xml)
• tests/core/data/xml_test8.xml (copied) (copied from trunk/tests/core/data/xml_test8.xml)
• tests/core/data/xml_test9.xml (copied) (copied from trunk/tests/core/data/xml_test9.xml)
• tests/core/test_nmapcommand.py (copied) (copied from trunk/tests/core/test_nmapcommand.py)
• tests/core/test_option_parser.py (copied) (copied from trunk/tests/core/test_option_parser.py)
• tests/core/test_paths.py (copied) (copied from trunk/tests/core/test_paths.py)
• tests/core/test_target_list.py (copied) (copied from trunk/tests/core/test_target_list.py)
• tests/core/test_umit_conf.py (copied) (copied from trunk/tests/core/test_umit_conf.py)
• tests/diff_test1 (copied) (copied from trunk/tests/diff_test1)
• tests/diff_test2 (copied) (copied from trunk/tests/diff_test2)
• tests/higwidgets (copied) (copied from trunk/tests/higwidgets)
• tests/higwidgets/__init__.py (copied) (copied from trunk/tests/higwidgets/__init__.py)
• tests/higwidgets/alerts.py (copied) (copied from trunk/tests/higwidgets/alerts.py)
• tests/higwidgets/data (copied) (copied from trunk/tests/higwidgets/data)
• tests/higwidgets/data/gnome-green-spinner.png (copied) (copied from trunk/tests/higwidgets/data/gnome-green-spinner.png)
• tests/higwidgets/entries_packing.py (copied) (copied from trunk/tests/higwidgets/entries_packing.py)
• tests/higwidgets/gdk_pixbuf.py (copied) (copied from trunk/tests/higwidgets/gdk_pixbuf.py)
• tests/higwidgets/labeled_progress_bar.py (copied) (copied from trunk/tests/higwidgets/labeled_progress_bar.py)
• tests/higwidgets/notebook.py (copied) (copied from trunk/tests/higwidgets/notebook.py)
• tests/higwidgets/spinner.py (copied) (copied from trunk/tests/higwidgets/spinner.py)
• umitDB/InventoryChanges.py (modified) (4 diffs)

branch/umitweb-ng/share/umit/config/timeline-settings.conf

@@ -18 +18 @@
 [Startup]
 date = 
-mode = hourly
+mode = daily
 kind = category
 

branch/umitweb-ng/umitDB/InventoryChanges.py

@@ -140 +140 @@
                 pcdata2 = self.invdb.get_portid_and_fks_for_host_from_db(
                     hostB[1])
-                
+
                 # compare old data against new data
                 category, diff_text = self._compare_data(pdata2, fpinfo2,
@@ -259 +259 @@
         # dont consider uptime and lastboot in fingerprint (will probably
         # not consider others too)
-        if fpinfo1 and (fpinfo1[2:] != fpinfo2[2:]):
+        if (fpinfo1 and not fpinfo2) or (not fpinfo1 and fpinfo2) or \
+                (fpinfo1 and fpinfo2 and fpinfo1[2:] != fpinfo2[2:]):
             space = host_diff and ' ' or ''
             common_text = space + _("Fingerprint, ")
@@ -284 +285 @@
             fp_only = False
             ports_only = False
-                
+
         if common_text:
             if fp_only or len(common_text) == len(" Fingerprint, "):
@@ -304 +305 @@
             # changes in extraports for example.
             affected = 'nothing'
-            host_diff = _("No noticeables changes since last sucessfull scan.")
+            host_diff = _("No noticeables changes since last sucessful scan.")