Mercurial > dive4elements > river

changeset 6825:3aff1b00618a double-precision

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
import_rivers.sh: skip cross sections instead of WST-file in first run.
author Tom Gottfried <tom.gottfried@intevation.de>
date Wed, 14 Aug 2013 12:54:00 +0200
parents 3717d9d2f659
children 5ce6a3d7d632
files backend/contrib/import_river.sh
diffstat 1 files changed, 23 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/backend/contrib/import_river.sh	Wed Aug 14 12:21:13 2013 +0200
+++ b/backend/contrib/import_river.sh	Wed Aug 14 12:54:00 2013 +0200
@@ -75,13 +75,13 @@
    --skip-hydro                    Skip import of hydrological data
    --skip-morpho                   Skip import of morphological data
    --skip-geo                      Skip import of geographic data
-   --skip-wst                      Skip import of wst data
+   --skip-prf                      Skip import of cross section data
 EOF
 exit 0
 }
 
 OPTS=`getopt -o ?u:w:h:p:d: \
-     -l help,username:,password:,host:,port:,db-name:,skip-hydro,skip-morpho,skip-geo,skip-wst,postgres \
+     -l help,username:,password:,host:,port:,db-name:,skip-hydro,skip-morpho,skip-geo,skip-prf,postgres \
      -n $0 -- "$@"`
 if [ $? != 0 ] ; then usage; fi
 eval set -- "$OPTS"
@@ -116,8 +116,8 @@
     "--skip-morpho")
       SKIP_MORPHO="TRUE"
       shift;;
-    "--skip-wst")
-      SKIP_WST="TRUE"
+    "--skip-prf")
+      SKIP_PRF="TRUE"
       shift;;
     "--skip-geo")
       SKIP_GEO="TRUE"
@@ -205,8 +205,6 @@
     -Dflys.backend.importer.dry.run=$IMPORTER_DRY_RUN \
     -Dflys.backend.importer.skip.annotations=false \
     -Dflys.backend.importer.skip.bwastr=false \
-    -Dflys.backend.importer.skip.da50s=false \
-    -Dflys.backend.importer.skip.da66s=false \
     -Dflys.backend.importer.skip.extra.wsts=false \
     -Dflys.backend.importer.skip.fixations=false \
     -Dflys.backend.importer.skip.flood.water=false \
@@ -215,10 +213,12 @@
     -Dflys.backend.importer.skip.historical.discharge.tables=false \
     -Dflys.backend.importer.skip.hyks=false \
     -Dflys.backend.importer.skip.official.lines=false \
-    -Dflys.backend.importer.skip.prfs=false \
-    -Dflys.backend.importer.skip.w80s=false \
-    -Dflys.backend.importer.skip.w80.csvs=false \
-    -Dflys.backend.importer.skip.wst=true \
+    -Dflys.backend.importer.skip.prfs=true \
+    -Dflys.backend.importer.skip.w80s=true \
+    -Dflys.backend.importer.skip.w80.csvs=true \
+    -Dflys.backend.importer.skip.da50s=true \
+    -Dflys.backend.importer.skip.da66s=true \
+    -Dflys.backend.importer.skip.wst=false \
     -Dflys.backend.importer.skip.measurement.stations=true \
     -Dflys.backend.importer.skip.waterlevel.differences=true \
     -Dflys.backend.importer.skip.waterlevels=true \
@@ -252,8 +252,6 @@
     -Dflys.backend.importer.dry.run=$IMPORTER_DRY_RUN \
     -Dflys.backend.importer.skip.annotations=true \
     -Dflys.backend.importer.skip.bwastr=true \
-    -Dflys.backend.importer.skip.da50s=true \
-    -Dflys.backend.importer.skip.da66s=true \
     -Dflys.backend.importer.skip.extra.wsts=true \
     -Dflys.backend.importer.skip.fixations=true \
     -Dflys.backend.importer.skip.flood.water=true \
@@ -265,6 +263,8 @@
     -Dflys.backend.importer.skip.prfs=true \
     -Dflys.backend.importer.skip.w80s=true \
     -Dflys.backend.importer.skip.w80.csvs=true \
+    -Dflys.backend.importer.skip.da50s=true \
+    -Dflys.backend.importer.skip.da66s=true \
     -Dflys.backend.importer.skip.wst=true \
     -Dflys.backend.importer.skip.measurement.stations=false \
     -Dflys.backend.importer.skip.waterlevel.differences=false \
@@ -279,9 +279,9 @@
     $JAR
 }
 
-import_wst(){
-    LOG_FILE=${LOG_DIR}/wst.log
-    echo Importing WST data.
+import_prf(){
+    LOG_FILE=${LOG_DIR}/prf.log
+    echo Importing cross section data.
     echo Logging into: $LOG_FILE
     sed 's!./import.log!'"$LOG_FILE"'!' conf/log4j.properties > $LOG_DIR/log4j.properties
     java -jar \
@@ -299,8 +299,6 @@
     -Dflys.backend.importer.dry.run=$IMPORTER_DRY_RUN \
     -Dflys.backend.importer.skip.annotations=true \
     -Dflys.backend.importer.skip.bwastr=true \
-    -Dflys.backend.importer.skip.da50s=true \
-    -Dflys.backend.importer.skip.da66s=true \
     -Dflys.backend.importer.skip.extra.wsts=true \
     -Dflys.backend.importer.skip.fixations=true \
     -Dflys.backend.importer.skip.flood.water=true \
@@ -309,10 +307,12 @@
     -Dflys.backend.importer.skip.historical.discharge.tables=true \
     -Dflys.backend.importer.skip.hyks=true \
     -Dflys.backend.importer.skip.official.lines=true \
-    -Dflys.backend.importer.skip.prfs=true \
-    -Dflys.backend.importer.skip.w80s=true \
-    -Dflys.backend.importer.skip.w80.csvs=true \
-    -Dflys.backend.importer.skip.wst=false \
+    -Dflys.backend.importer.skip.prfs=false \
+    -Dflys.backend.importer.skip.w80s=false \
+    -Dflys.backend.importer.skip.w80.csvs=false \
+    -Dflys.backend.importer.skip.da50s=false \
+    -Dflys.backend.importer.skip.da66s=false \
+    -Dflys.backend.importer.skip.wst=true \
     -Dflys.backend.importer.skip.measurement.stations=true \
     -Dflys.backend.importer.skip.waterlevel.differences=true \
     -Dflys.backend.importer.skip.waterlevels=true \
@@ -350,8 +350,8 @@
 if [ "$SKIP_HYDRO" != "TRUE" ]; then
 import_hydro
 fi
-if [ "$SKIP_WST" != "TRUE" ]; then
-import_wst
+if [ "$SKIP_PRF" != "TRUE" ]; then
+import_prf
 fi
 if [ "$SKIP_MORPHO" != "TRUE" ]; then
 import_morpho
http://dive4elements.wald.intevation.org