Index: src/django_gheat/import_scan_data.sh
===================================================================
--- src/django_gheat/import_scan_data.sh	(revision 9563)
+++ src/django_gheat/import_scan_data.sh	(revision 9564)
@@ -3,11 +3,6 @@
 # Quick and dirty hack to import all data
 
-if [ `id -un` != "www" ]; then
-  echo "ERROR, run as www user: sudo -E -u www $0"
-  exit 1
-fi
-
-DATAROOT="/usr/local/var/scan-data"
-MAP_CACHE=/usr/local/var/httpd/cache/maps
+DATAROOT=${1:-"`pwd $0`/scan-data"}
+MAP_CACHE=${MAP_CACHE:-"/usr/local/var/httpd/cache/maps"}
 MANAGE="`dirname $0`/manage.py"
 SSH_USER=backup
@@ -16,5 +11,5 @@
 
 echo "# rsync webfolder"
-rsync -e "ssh -i $SSH_KEY -l $SSH_USER -o StrictHostKeyChecking=no" -az tyan.wirelessleiden.nl:/usr/local/www/webfolder/scan-data/ $DATAROOT || exit 1
+rsync -e "ssh -i $SSH_KEY -l $SSH_USER -o StrictHostKeyChecking=no" -az tyan.wirelessleiden.nl:/usr/local/www/webfolder/scan-data/ $DATAROOT
 
 
@@ -22,32 +17,31 @@
 for FILE in `find $DATAROOT -name '*.tar.gz'`; do
   TARDIR=`dirname $FILE`
-  if [ \! -r "$TARDIR/`tar -tf $FILE | head -1`" ]; then
-    tar -C $TARDIR -xzf $file
-  fi
+  tar -C $TARDIR -xkzf $FILE
 done
 
 ADDED=0
-# Import all data
-for USERDIR in `find $DATAROOT -depth 1 -type d`; do
-  for DEVICEDIR in `find $USERDIR -depth 1 -type d`; do
+
+#Kismet netxml Imports
+FILES="`find $DATAROOT -name '*netxml*'`"
+[ -n "$FILES" ] && $MANAGE import_kismet $ARGS $FILES
+
+# Import all measure data
+for USERDIR in `find $DATAROOT -maxdepth 1 -type d`; do
+  for DEVICEDIR in `find $USERDIR -maxdepth 1 -type d`; do
     USERNAME=`basename $USERDIR`
     DEVICE=`basename $DEVICEDIR`
     ARGS="-g $USERNAME -e $USERNAME@wirelessleiden.nl -k $DEVICE"
-    # Kismet Imports
-    for FILE in `find $DEVICEDIR -name 'Kismet*gpsxml*'`; do
-      $MANAGE import_kismet $ARGS -m `basename $FILE` $FILE
-    done
-    
+
+    #Kismet gpsxml Imports
+    FILES="`find $DEVICEDIR -name '*netxml*'` `find $DEVICEDIR -name '*gpsxml*'`"
+    [ -n "$FILES" ] && $MANAGE import_kismet $ARGS $FILES
+
     # DroidStumber imports
-    for FILE in `find $DEVICEDIR -name 'ScanResult-*'`; do
-      $MANAGE import_droidstumbler $ARGS -m `basename $FILE` $FILE
-      if [ $? -eq 0 ]; then
-        ADDED=1
-      fi
-    done
+    FILES=`find $DEVICEDIR -name 'ScanResult-*'`
+    [ -n "$FILES" ] && $MANAGE import_droidstumbler $ARGS $FILES
   done
 done
 
-if [ "$ADDED" -eq 1 ]; then
+if [ "$ADDED" -eq 1 -a -r $MAP_CACHE ]; then
   echo "# Clear cache $MAP_CACHE"
   htcacheclean -l10K -p$MAP_CACHE