Changeset 9552 for src/django_gheat/gheat/management/commands/import_droidstumbler.py

Timestamp:

Aug 24, 2011, 7:43:40 PM (13 years ago)

Author:

rick

Message:

Some awefull hacks to allow data to be imported.

File:

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

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

@@ -31 +31 @@
 
 
-def import_droidstumbler(location, meetrondje, gebruiker, email, datum,show_progres=False,output=sys.stdout,bulk_import=True):
+def import_droidstumbler(location, meetrondje, gebruiker, kaart, email, datum,show_progres=False,output=sys.stdout,bulk_import=True):
   """ Import all points, return tuple with summary"""
   g, created = Gebruiker.objects.get_or_create(naam=gebruiker , email=email)
-  a, created = Apparatuur.objects.get_or_create(antenne='buildin' , kaart='mobilePhone')
+  a, created = Apparatuur.objects.get_or_create(kaart=kaart)
   mr, created = MeetRondje.objects.get_or_create(datum=datum , naam=meetrondje , gebruiker=g , apparatuur=a)
+  if not created:
+    logging.error("Meetrondje '%s' already imported" % mr)
+    sys.exit(1)
 
   meting_count = 0
@@ -114 +117 @@
     make_option('-g', '--gebruiker', dest='gebruiker', default=os.environ['USER']),
     make_option('-e', '--email', dest='email', default=os.environ['USER'] + '@example.org'),
+    make_option('-k', '--kaart', dest='kaart', default='onbekend', help="Kaart gebruikt"),
     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 \
@@ -146 +150 @@
       self.stdout.write('#INFO: Meetrondje: %s @ %s\n' % (meetrondje, datum))
       self.stdout.write("#INFO: Going to import '%s' for gebruiker '%s <%s>'\n" % (os.path.basename(csv_file), options['gebruiker'], options['email']))
-      (ap_count, new_ap_count, meting_count, meting_error_count) = import_droidstumbler(csv_file,meetrondje,options['gebruiker'],options['email'], datum, True)
+      (ap_count, new_ap_count, meting_count, meting_error_count) = import_droidstumbler(csv_file,meetrondje,options['kaart'],options['gebruiker'],options['email'], datum, True)
       self.stdout.write("#INFO: Import summary accespoints: added:%s processed:%s\n" % (new_ap_count, ap_count))
       self.stdout.write("#INFO: Import summary metingen: added:%s error:%s\n" % (meting_count, meting_error_count))