Changeset 9563

Timestamp:

Aug 25, 2011, 1:16:15 PM (13 years ago)

Author:

rick

Message:

Order matters, make sure files are imported the right way

File:

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

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

@@ -178 +178 @@
       raise CommandError("Not all arguments are provided")
 
+    # Please first the netxml and then the gpsxml files
+    sorted_args = [x for x in args if "netxml" in x] + [x for x in args if "gpsxml" in x]
+    remainder = list(set(args) - set(sorted_args))
+    args = sorted_args + remainder
+    logger.debug("Parsing files in the following order: %s", args)
+
     for xml_file in args:
       if not os.path.isfile(xml_file):
         raise CommandError("xml file '%s' does not exists" % xml_file)
-
 
     for xml_file in args: