Changeset 9142 for src/django_gheat/gheat

Timestamp:

May 4, 2011, 11:04:37 AM (14 years ago)

Author:

dennisw

Message:

Figuring out the tile generation & data flow.

File:

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

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

@@ -33 +33 @@
 import csv
 
-def import_file(location, meetrondje, gebruiker, email):
+# Function that imports a csv and processes it.
+def import_file(location, meetrondje, gebruiker, email, antenne, kaart):
 
+  # Creating some objects that have to be created only once. Uses 'get_or_create' to rule out duplicates.
+  # Creating user object. Depends on basecommand options.
   g, created = Gebruiker.objects.get_or_create(naam=gebruiker , email=email)
-  a, created = Apparatuur.objects.get_or_create(antenne='test' , kaart='test')
+  # Creating equipment object. Depends on basecomand options.
+  a, created = Apparatuur.objects.get_or_create(antenne=antenne , kaart=kaart)
+  # Creating dataset object. Depends on baseommand options.
   mr = MeetRondje.objects.create(datum=datetime.datetime.now() , naam=meetrondje , gebruiker=g , apparatuur=a)
 
+  # Open the csv.
   csvfile = csv.reader(open(location, 'rb'), delimiter='\t')
+  # Read every row individually and extract the required data.
   for row in csvfile:
+    # '.replace' & '.strip' are for replacing and stripping some unwished characters. Edit where necessary.
     lat = row[0].replace('N ', '')
     lon = row[1].replace('E ', '')
@@ -51 +59 @@
     print lat, lon, ssid, bssid, enc, sig
 
+    # Creating accespoint objects. Avoiding duplicates.
     ap, created = Accespoint.objects.get_or_create(mac=bssid, ssid=ssid, encryptie=enc)
+    # Creating the measurement objects.
     m = Meting.objects.create(meetrondje=mr, accespoint=ap, latitude=lat, longitude=lon, signaal=sig)
 
-
+# Basecommand with options. This gives the user some control over the execution of this script.
 class Command(BaseCommand):
   option_list = BaseCommand.option_list + (
@@ -61 +71 @@
     make_option('-g', '--gebruiker', dest='gebruiker', default='username'),
     make_option('-e', '--email', dest='email', default='foo@bar.org'),
+    make_option('-a', '--antenne', dest='antenne', default='geen'),
+    make_option('-k', '--kaart', dest='kaart', default='interne kaart'),
     )
-
+  
+  # The function 'import_file' will be executed with the default option values, or the values specified by the user.
   def handle(self, *args, **options):
-    import_file(options['location'],options['meetrondje'],options['gebruiker'],options['email'])
+    import_file(options['location'],options['meetrondje'],options['gebruiker'],options['email'],options['antenne'],options['kaart'])