Changeset 9818 for src/django_gheat/gheat/dataimport

Timestamp:

Dec 23, 2011, 8:28:57 AM (13 years ago)

Author:

rick

Message:

Type is needed to start playing around with filters based on the function/type of a unit.

File:

• src/django_gheat/gheat/dataimport/__init__.py (modified) (2 diffs)

src/django_gheat/gheat/dataimport/__init__.py

@@ -44 +44 @@
   try:
     # Make sure the special NULL is preserved
-    sql = "INSERT INTO %s VALUES %s" % (sql_table, ','.join(sql_values).replace("'NULL'",'NULL'))
+    sql = "INSERT INTO %s VALUES %s" % (sql_table, ','.join(sql_values).replace("None",'NULL').replace("'NULL'",'NULL'))
     count = cursor.execute(sql)
     transaction.commit_unless_managed()
@@ -85 +85 @@
     for bssid in bssid_list_insert:
       ssid, encryption = ap_pool[bssid]
+      type = Accespoint.get_type_by_ssid(ssid)
       # Special trick in SSID ts avoid escaping in later stage
       item = str((bssid.upper(),ssid.replace('%','%%'),encryption,
+         Accespoint.get_type_by_ssid(ssid),
         get_organization_id_by_ssid(ssid)))
       sql_values.append(item)
     counters['ap_added'] = bulk_sql('gheat_accespoint (`mac`, `ssid`,\
-      `encryptie`, `organization_id`)',sql_values)
+      `encryptie`, `type`, `organization_id`)',sql_values)
   return counters