Changeset 9818

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.

Location:

src/django_gheat/gheat

Files:

• admin.py (modified) (1 diff)
• dataimport/__init__.py (modified) (2 diffs)
• models.py (modified) (3 diffs)

src/django_gheat/gheat/admin.py

@@ -3 +3 @@
 
 class AccespointAdmin(admin.ModelAdmin):
-  list_display = ['ssid','mac', 'organization']
+  list_display = ['ssid','type', 'mac', 'organization']
   search_fields = ['ssid', 'mac', 'organization']
   ordering = ['ssid']

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
 

src/django_gheat/gheat/models.py

@@ -7 +7 @@
 MAX_SIGNAL = 100
 
+ACCESPOINT_TYPE_CHOICES= (
+  ('accespoint', 'Acess Point'),
+  ('interlink', 'InterLink'),
+)
 
 # http://stackoverflow.com/questions/849142/how-to-limit-the-maximum-value-of-a-numeric-field-in-a-django-model/849426#849426
@@ -71 +75 @@
   mac = models.CharField(max_length=17)
   ssid = models.CharField(max_length=64)
+  type = models.CharField(max_length=20, null=True, blank=True, choices=ACCESPOINT_TYPE_CHOICES)
   organization = models.ForeignKey(Organization,null=True, blank=True)
   encryptie = models.BooleanField()
@@ -78 +83 @@
     return "%s - %s" % (self.mac, self.ssid)
 
+  @staticmethod
+  def get_type_by_ssid(ssid):
+    if ssid.startswith('ap'):
+      type = 'accespoint'
+    elif ssid.startswith('il'):
+      type = 'interlink'
+    else:
+      type = None
+    return type
 
   def save(self, *args, **kwargs):
-    self.organization = self.get_organization(self.ssid)
     super(Accespoint, self).save(*args, **kwargs)