Changeset 9823 for src/django_gheat

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...

Location:

src/django_gheat

Files:

• fabfile.py (modified) (1 diff)
• gheat/management/commands/import_datafile.py (modified) (1 diff)
• import_scan_data.sh (modified) (2 diffs)

src/django_gheat/fabfile.py

@@ -41 +41 @@
     run("./manage.py sqlreset gheat | ./manage.py dbshell")
     sudo("./import_scan_data.sh", user='wlrobot')
-    sudo("svn up ../genesis", user='wlrobot')
-    sudo("../genesis/tools/genesis-to-yaml.pl", user='wlrobot')
-    sudo("../genesis/tools/gformat.py cleanup", user='wlrobot')
+    sudo("svn up ../genesis", user='www')
+    sudo("../genesis/tools/genesis-to-yaml.pl", user='www')
+    sudo("../genesis/tools/gformat.py cleanup", user='www')
     run("../genesis/tools/gformat.py full-export | ./manage.py import_nodes -")

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)

src/django_gheat/import_scan_data.sh

@@ -59 +59 @@
 done
 
-#Kismet netxml Imports
-FILES="`find $DATAROOT -name '*netxml*' | sort`"
-[ -n "$FILES" ] && $MANAGE import_datafile $ARGS $FILES
-
 # Import all measure data
 for USERDIR in `find $DATAROOT -mindepth 1 -maxdepth 1 -type d | sort`; do
@@ -70 +66 @@
     ARGS="-g $USERNAME -e $USERNAME@wirelessleiden.nl -k $DEVICE"
 
+    echo "# INFO: Processing $USERNAME/$DEVICE"
     # DroidStumber imports
     FILES=`find $DEVICEDIR -name 'ScanResult-*'`
-    [ -n "$FILES" ] && $MANAGE import_datafile $ARGS $FILES
+    if [ -n "$FILES" ]; then
+      $MANAGE import_datafile $ARGS $FILES
+    fi
 
-    #Kismet gpsxml Imports
+    #Kismet Imports
     FILES="`find $DEVICEDIR -name '*gpsxml*'`"
-    [ -n "$FILES" ] && $MANAGE import_datafile $ARGS $FILES
+    for GPSXML in $FILES; do
+      NETXML=`echo $GPSXML | sed 's/gpsxml/netxml/g' `
+      $MANAGE import_datafile $ARGS $NETXML $GPSXML
+    done
 
-    # Kismet imports
+    # NetStumbler imports
     FILES=`find $DEVICEDIR -name '*.ns1'`
-    [ -n "$FILES" ] && $MANAGE import_datafile $ARGS $FILES
+    if [ -n "$FILES" ]; then
+      $MANAGE import_datafile $ARGS $FILES
+    fi
   done
 done