Changeset 9592 for src/django_gheat/gheat/management/commands

Timestamp:

Aug 28, 2011, 1:00:28 PM (14 years ago)

Author:

rick

Message:

Organization needs to be a special Model to make fudgings around with it more easy.

Location:

src/django_gheat/gheat/management/commands

Files:

• import_droidstumbler.py (modified) (2 diffs)
• import_kismet.py (modified) (2 diffs)

src/django_gheat/gheat/management/commands/import_droidstumbler.py

@@ -43 +43 @@
   return count
 
+organizations = dict(Organization.objects.all().values_list('name','id'))
+def get_organization_id_by_ssid(ssid):
+  name = Organization.get_name_by_ssid(ssid)
+  if not name:
+    return 'NULL'
+  else:
+    return int(organizations[name])
 
 def import_droidstumbler(filename, meetrondje):
@@ -96 +103 @@
       ssid, encryption = ap_pool[bssid]
       # Special trick in SSID ts avoid escaping in later stage
-      item = str((bssid.upper(),ssid.replace('%','%%'),encryption,Accespoint.get_organization(ssid)))
+      item = str((bssid.upper(),ssid.replace('%','%%'),encryption,get_organization_id_by_ssid(ssid)))
       sql_values.append(item)
-    counters['ap_added'] = bulk_sql('gheat_accespoint (`mac`, `ssid`, `encryptie`, `organization`)',sql_values)
+    counters['ap_added'] = bulk_sql('gheat_accespoint (`mac`, `ssid`, `encryptie`, `organization_id`)',sql_values)
 
   # Build mapping for meting import

src/django_gheat/gheat/management/commands/import_kismet.py

@@ -19 +19 @@
 from collections import defaultdict
 
-from import_droidstumbler import bulk_sql
+from import_droidstumbler import bulk_sql,get_organization_id_by_ssid
 
 logger = logging.getLogger(__name__)
@@ -76 +76 @@
       ssid, encryption = ap_pool[bssid]
       # Special trick in SSID ts avoid escaping in later stage
-      item = str((bssid.upper(),ssid.replace('%','%%'),encryption,Accespoint.get_organization(ssid)))
+      item = str((bssid.upper(),ssid.replace('%','%%'),encryption,get_organization_id_by_ssid(ssid)))
       sql_values.append(item)
-    counters['ap_added'] = bulk_sql('gheat_accespoint (`mac`, `ssid`, `encryptie`, `organization`)',sql_values)
+    counters['ap_added'] = bulk_sql('gheat_accespoint (`mac`, `ssid`, `encryptie`, `organization_id`)',sql_values)
 
   # Determine which Wireless Clients to add