Changeset 714

Timestamp:

05/23/07 12:31:44 (6 years ago)

Author:

ggpolo

Message:

small changes in dbdatahandler.py

Files:

• branch/umitdb/datahandler/dbdatahandler.py (modified) (8 diffs)

branch/umitdb/datahandler/dbdatahandler.py

@@ -105 +105 @@
             
             #print "Comment:", host.comment
-            temp_d["distance"] = 'Empty'
+            temp_d["distance"] = empty()
             temp_d["uptime"] = host.uptime["seconds"]
             temp_d["lastboot"] = host.uptime["lastboot"]
@@ -203 +203 @@
         scan_d["args"] = parsedsax.nmap["nmaprun"]["args"]
         scan_d["start"] = parsedsax.nmap["nmaprun"]["start"]
-        scan_d["startstr"] = 'Empty'
+        scan_d["startstr"] = empty()
         scan_d["finish"] = parsedsax.nmap["runstats"]["finished_time"]
-        scan_d["finishstr"] = 'Empty'
+        scan_d["finishstr"] = empty()
         scan_d["xmloutputversion"] = parsedsax.nmap["nmaprun"]["xmloutputversion"]
         if self.store_original:
@@ -211 +211 @@
                                                  'r').readlines())
         else:
-            scan_d["xmloutput"] = 'Empty'
+            scan_d["xmloutput"] = empty()
 
         scan_d["verbose"] = parsedsax.nmap["verbose"]
@@ -344 +344 @@
         Create new record in osmatch with data from osmatch dict.
         """
-        osmatch["line"] = 'Empty' # check this, it seems parser isnt 
+        osmatch["line"] = empty() # check this, it seems parser isnt 
                                   # storing this
 
@@ -421 +421 @@
         service_name_id = self.get_service_name_id_from_db(info["service_name"])
         # NOT USING ostype FOR NOW
-        info["ostype"] = 'Empty'
+        info["ostype"] = empty()
 
         data = (info["service_product"], info["service_version"],
@@ -501 +501 @@
         """
         if not address["vendor"]:
-            vendor = 'Empty'
+            vendor = empty()
         else:
             vendor = address["vendor"]
@@ -900 +900 @@
     def parse(self, valid_xml):
         """
-        Parses an existent xml file.
+        Parses an existing xml file.
         """
         p = NmapParser(valid_xml)
@@ -925 +925 @@
         """
         Call this to normalize a dict. What it does: any empty value 
-        will be changed to 'Empty'.
+        will be changed to return value of empty().
         """
         # normalize hosts