Changeset 9823 for src/django_gheat/import_scan_data.sh

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/import_scan_data.sh (modified) (2 diffs)

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