Changeset 721

Timestamp:

05/25/07 22:40:00 (6 years ago)

Author:

ggpolo

Message:

storing timestamps correctly now

Location:

branch/umitdb/datahandler

Files:

• connection.py (modified) (1 diff)
• demo_xml_insertion.py (modified) (2 diffs)
• retrieve.py (modified) (1 diff)
• store.py (modified) (1 diff)
• xmlstore.py (modified) (5 diffs)

branch/umitdb/datahandler/connection.py

@@ -37 +37 @@
         debug("Openning connection to database; %s" % database)
         
-        self.conn = sqlite.connect(database)
+        self.conn = sqlite.connect(database, detect_types=sqlite.PARSE_COLNAMES)
         self.cursor = self.conn
         

branch/umitdb/datahandler/demo_xml_insertion.py

@@ -1 +1 @@
 import sys
+import time
 import timing
 from xmlstore import XMLStore
@@ -5 +6 @@
 if __name__ == "__main__":
     if len(sys.argv) < 2:
-        print "Specify a XML file."
+        print "Specify at least one XML file."
         sys.exit(0)
 
+    start = time.ctime()
+
     timing.start()
+    storing = XMLStore("schema-testing.db")
+    for file in sys.argv[1:]:
+        storing.store_xml(file)
+    timing.finish()
 
-    XMLStore("schema-testing.db", sys.argv[1])
-
-    timing.finish()
-    print timing.milli()
+    print "Started on:", start
+    print "Finished on:", time.ctime()
+    print "No. of files specified:", len(sys.argv[1:])
+    print "It took", timing.milli(), "miliseconds to complete operation."

branch/umitdb/datahandler/retrieve.py

@@ -50 +50 @@
         normalize(info)
 
-        info["ostype"] = empty() # FIX: Parser not handling this yet.
+        info["ostype"] = empty() # ToFix: Parser isnt storing this
 
         data = (info["service_product"], info["service_version"],

branch/umitdb/datahandler/store.py

@@ -189 +189 @@
         debug("Inserting new osmatch into database")
         
-        osmatch["line"] = empty() # FIX: it seems parser isnt storing this
+        osmatch["line"] = empty() # ToFix: Parser isnt storing this
         self.cursor.execute("INSERT INTO osmatch (name, accuracy, line, \
                     fk_host) VALUES (?, ?, ?, ?)", (osmatch["name"], 

branch/umitdb/datahandler/xmlstore.py

@@ -18 +18 @@
 # USA
 
+from datetime import datetime
 from umitCore.NmapParser import NmapParser
 from connection import ConnectDB
@@ -44 +45 @@
         
         if xml_file:
-            self.insert_xml(xml_file)
+            self.store_xml(xml_file)
          
             
-    def insert_xml(self, xml_file):
+    def store_xml(self, xml_file):
         """
         Inserts xml file into database.
@@ -73 +74 @@
             temp_d = { }
             
-            temp_d["distance"] = empty()
+            temp_d["distance"] = empty() # ToFix: Parser isnt storing this
             temp_d["uptime"] = host.uptime["seconds"]
             temp_d["lastboot"] = host.uptime["lastboot"]
@@ -371 +372 @@
         scan_d = { }
         scan_d["args"] = parsedsax.nmap["nmaprun"]["args"]
-        scan_d["start"] = parsedsax.nmap["nmaprun"]["start"]
-        scan_d["startstr"] = empty()
-        scan_d["finish"] = parsedsax.nmap["runstats"]["finished_time"]
-        scan_d["finishstr"] = empty()
+        timestamp_start = parsedsax.nmap["nmaprun"]["start"]
+        scan_d["start"] = datetime.fromtimestamp(float(timestamp_start))
+        scan_d["startstr"] = empty() # ToFix: Parser isnt storing this
+        timestamp_finish = parsedsax.nmap["runstats"]["finished_time"]
+        scan_d["finish"] = datetime.fromtimestamp(float(timestamp_finish))
+        scan_d["finishstr"] = empty() # ToFix: Parser isnt storing this
         scan_d["xmloutputversion"] = parsedsax.nmap["nmaprun"]["xmloutputversion"]
         if self.store_original:
@@ -392 +395 @@
         # get fk_scanner
         scanner_id = self.get_scanner_id_from_db(scanner_name,
-                                                        scanner_version)
+                                                 scanner_version)
         if not scanner_id:
             self.insert_scanner_db(scanner_name, scanner_version)