Changeset 9823 for src/django_gheat/gheat/management

Timestamp:

Dec 23, 2011, 9:16:20 AM (13 years ago)

Author:

rick

Message:

Importer fails if one file files, this makes it more reliable...

File:

• src/django_gheat/gheat/management/commands/import_datafile.py (modified) (1 diff)

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

@@ -123 +123 @@
     apparatuur, created = Apparatuur.objects.get_or_create(kaart=options['kaart'])
 
+    # Meetrondje is deducted and checked from first filename
+    filename = args[0]
+    logger.info("Processing '%s'" % filename)
+    meetrondje, created = MeetRondje.objects.get_or_create(
+      datum=get_date(filename), naam=get_meetrondje(filename),
+      gebruiker=gebruiker, apparatuur=apparatuur)
+    if not options['force'] and not created:
+      raise CommandError("Meetrondje '%s' already imported",  meetrondje)
+
     # Check if all files are valid
     for filename in args:
-      logger.info("Processing '%s'" % filename)
-      meetrondje, created = MeetRondje.objects.get_or_create(
-        datum=get_date(filename), naam=get_meetrondje(filename),
-        gebruiker=gebruiker, apparatuur=apparatuur)
-      if not options['force'] and not created:
-        logger.error("Meetrondje '%s' already imported",  meetrondje)
-        continue
-
       logger.info('Meetrondje: %s', meetrondje)
       meetbestand = MeetBestand(meetrondje=meetrondje,is_imported=True)