Changeset 753

Timestamp:

05/29/07 05:09:56 (6 years ago)

Author:

ggpolo

Message:

Continued adaptation for new database, adapted TimeLine? to work correctly when placed in site-packages

Location:

branch/ggpolo

Files:

• umitDB/connection.py (modified) (1 diff)
• umitDB/retrieve.py (modified) (2 diffs)
• umitDB/store.py (modified) (1 diff)
• umitDB/xmlstore.py (modified) (1 diff)
• umitGUI/MainWindow.py (modified) (2 diffs)
• umitInventory/timeline-demo.py (deleted)
• umitInventory/tl-demo (added)
• umitInventory/tl-demo/README (added)
• umitInventory/tl-demo/timeline-demo.py (added)
• umitInventory/tl/Arrow.py (deleted)
• umitInventory/tl/Base.py (deleted)
• umitInventory/tl/Calendar.py (deleted)
• umitInventory/tl/EventPopup.py (deleted)
• umitInventory/tl/Events.py (deleted)
• umitInventory/tl/Legend.py (deleted)
• umitInventory/tl/TimeLine.py (deleted)
• umitInventory/tl/YouAreHere.py (deleted)
• umitInventory/tl/__init__.py (modified) (1 diff)
• umitInventory/tl/arrow.py (added)
• umitInventory/tl/base.py (added)
• umitInventory/tl/calendar.py (added)
• umitInventory/tl/colors_evt_std.conf (deleted)
• umitInventory/tl/eventpopup.py (added)
• umitInventory/tl/events.py (added)
• umitInventory/tl/legend.py (added)
• umitInventory/tl/timeline.py (added)
• umitInventory/tl/tl.conf (deleted)
• umitInventory/tl/youarehere.py (added)
• umitInventory/viewer.py (added)

branch/ggpolo/umitDB/connection.py

@@ -22 +22 @@
 """
 
-from _database import sql
-from _database import database
-from utils import debug
+from umitDB._database import sql
+from umitDB._database import database
+from umitDB.utils import debug
 
 class ConnectDB:

branch/ggpolo/umitDB/retrieve.py

@@ -18 +18 @@
 # USA
 
-from utils import empty
-from utils import debug
-from utils import normalize
+from umitDB.utils import empty
+from umitDB.utils import debug
+from umitDB.utils import normalize
+from umitDB.connection import ConnectDB
 
 """
@@ -303 +304 @@
             return id[0]
 
+
+class InventoryRetrieve(ConnectDB, RawRetrieve):
+    """
+    Retrieves Inventories from Database.
+    """
+
+    def __init__(self, db):
+        """
+        Expects an umit database.
+        """
+        ConnectDB.__init__(self, db)
+        RawRetrieve.__init__(self, self.conn, self.cursor)
+
+
+    def get_inventories_names(self):
+        """
+        Returns all inventories names from database.
+        """
+        debug("Getting all inventories name..")
+
+        names = self.cursor.execute("SELECT name FROM inventory").fetchall()
+
+        return names
+
+
+    def get_inventory_name_for_id(self, id):
+        """
+        Return inventory name for id.
+        """
+        debug("Getting inventory name for id %d.." % id)
+        
+        name = self.cursor.execute("SELECT name FROM inventory WHERE pk = ?", 
+                                    (id ,)).fetchone()
+
+        if name:
+            return name[0]
+
+

branch/ggpolo/umitDB/store.py

@@ -18 +18 @@
 # USA
 
-from utils import empty
-from utils import debug
+from umitDB.utils import empty
+from umitDB.utils import debug
     
 """

branch/ggpolo/umitDB/xmlstore.py

@@ -20 +20 @@
 from datetime import datetime
 from umitCore.NmapParser import NmapParser
-from connection import ConnectDB
-from store import RawStore
-from retrieve import RawRetrieve
-from utils import empty
-from utils import debug
-from utils import normalize
+from umitDB.connection import ConnectDB
+from umitDB.store import RawStore
+from umitDB.retrieve import RawRetrieve
+from umitDB.utils import empty
+from umitDB.utils import debug
+from umitDB.utils import normalize
 
 """

branch/ggpolo/umitGUI/MainWindow.py

@@ -51 +51 @@
 
 from umitDB.xmlstore import XMLStore
+from umitInventory.viewer import InvViewer
 
 root = False
@@ -340 +341 @@
 
     def _view_inv(self, action):
-        dlg = HIGAlertDialog(self, message_format=_('No Inventory viewer yet!'),
-                             secondary_text=_("Working on this right now."))
-        dlg.run()
-        dlg.destroy()
+        win = InvViewer()
+        win.show_all()
+
 
     def _add_scan_inv(self, action):

branch/ggpolo/umitInventory/tl/__init__.py

@@ -18 +18 @@
 # USA
 
-from umitInventory.tl import TimeLine
-from umitInventory.tl import Arrow
-from umitInventory.tl import Legend
-from umitInventory.tl import YouAreHere
-
+from umitInventory.tl import timeline as _timeline
+from umitInventory.tl import arrow as _arrow
+from umitInventory.tl import legend as _legend
+from umitInventory.tl import youarehere as _youarehere
 
 def main(*args, **kwds):
-    return TimeLine.TL(*args, **kwds)
+    return _timeline.TL(*args, **kwds)
 
 def arrow(*args, **kwds):
-    return Arrow.TL_Arrow(*args, **kwds)
+    return _arrow.TL_Arrow(*args, **kwds)
 
 def legend(*args, **kwds):
-    return Legend.TL_Legend(*args, **kwds)
+    return _legend.TL_Legend(*args, **kwds)
 
 def youarehere(*args, **kwds):
-    return YouAreHere.TL_YouAreHere(*args, **kwds)
+    return _youarehere.TL_YouAreHere(*args, **kwds)
+