Changeset 9559

Timestamp:

Aug 25, 2011, 12:08:25 PM (13 years ago)

Author:

rick

Message:

Code cleanup

File:

• src/django_gheat/gheat/management/commands/import_droidstumbler.py (modified) (6 diffs)

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

@@ -94 +94 @@
       ssid, encryption = ap_pool[bssid]
       # Special trick in SSID ts avoid escaping in later stage
-      value_str = str((bssid,ssid.replace('%','%%'),encryption))
-      sql_values.append(value_str)
+      item = str((bssid,ssid.replace('%','%%'),encryption))
+      sql_values.append(item)
     counters['ap_added'] = bulk_sql('gheat_accespoint (`mac`, `ssid`, `encryptie`)',sql_values)
 
@@ -105 +105 @@
   sql_values = []
   for (bssid,lat,lon),signal in meting_pool.iteritems():
-    value_str = str((int(meetrondje.id),mac2id[bssid],float(lat),float(lon),int(signaal)))
-    sql_values.append(value_str)
+    item = str((int(meetrondje.id),mac2id[bssid],float(lat),float(lon),int(signaal)))
+    sql_values.append(item)
 
   # Bulk Import data if possible
@@ -123 +123 @@
     make_option('-d', '--datum', dest='datum', default=None, help="Provide date  \
       in following format: %Y-%m-%d-%H%M%S, by default it will be generated from \
-      the filename"),)
+      the filename"),
+  )
 
   def handle(self, *args, **options):
@@ -134 +135 @@
       if not os.path.isfile(csv_file):
         raise CommandError("csv file '%s' does not exists" % csv_file)
-      self.stdout.write("#INFO: Processing '%s'\n" % csv_file)
+      logger.info("Processing '%s'" % csv_file)
 
       # Meetrondje from filename if needed
@@ -151 +152 @@
         raise CommandError("Invalid date '%s'" % options['datum'])
 
-      logger.info("Going to import '%s'" % (os.path.basename(csv_file)))
       # Create meetrondje object
       g, created = Gebruiker.objects.get_or_create(naam=options['gebruiker'] , email=options['email'])
@@ -161 +161 @@
         sys.exit(1)
       counters = import_droidstumbler(csv_file,mr)
-      logger.info("Summary accespoints: added:%(ap_added)-6s processed:%(ap_total)-6s" % counters)
-      logger.info("Summary metingen   : added:%(meting_added)-6s processed:%(meting_total)-6s" % counters)
+      logger.info("summary accespoints: added:%(ap_added)-6s processed:%(ap_total)-6s" % counters)
+      logger.info("summary metingen   : added:%(meting_added)-6s processed:%(meting_total)-6s" % counters)