[Dive4elements-commits] [PATCH 2 of 2] merge

[Wald Commits]

# HG changeset patch
# User Tom Gottfried <tom.gottfried at intevation.de>
# Date 1364395087 -3600
# Node ID 16c14e5ab00f4a0a90942f51bc61fa103b493f33
# Parent  c2bd97cd127f8079962312a7a9519ad7d0bbf61c
# Parent  7c646d4d5103a55a79b335faf0a602f2fb1059cd
merge

diff -r c2bd97cd127f -r 16c14e5ab00f flys-backend/contrib/import_river.sh
--- a/flys-backend/contrib/import_river.sh	Wed Mar 27 15:37:25 2013 +0100
+++ b/flys-backend/contrib/import_river.sh	Wed Mar 27 15:38:07 2013 +0100
@@ -156,9 +156,9 @@
 fi
 
 GEW_FILE="$1"
-RIVER_NAME=$(grep "Gew.sser" "$1" | awk '{print $2}')
+RIVER_NAME=$(grep "Gew.sser" "$1" | sed 's/Gew.sser: //')
 DATE=$(date +%Y.%m.%d_%H%M)
-LOG_DIR=${LOG}/${RIVER_NAME}-$DATE
+LOG_DIR=${LOG}/`basename $GEW_FILE .gew`-$DATE
 mkdir -p ${LOG_DIR}
 
 if [ "$POSTGRES" = "TRUE" ]; then