From f218753d6d777c202a2bdd14b9da73d95cb80fcf Mon Sep 17 00:00:00 2001
From: Nikolaus Krismer <nikolaus.krismer@uibk.ac.at>
Date: Fri, 2 Dec 2016 11:03:17 +0100
Subject: [PATCH] not re-download sql dump if it is already present in sql
directory (and UPDATE_DATA is not set to true)
---
CHANGELOG.md | 1 +
bootstrap/importData.sh | 17 ++++++++++++-----
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 872a130..619aee9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
Upcoming version:
-----------------
+ - not re-download sql dump if it is already present in sql directory (and UPDATE_DATA is not set to true) (Nikolaus Krismer)
- updating gradle to version 3.2.1 (Nikolaus Krismer)
- updating gradle to version 3.2 (Nikolaus Krismer)
- updating geoserver to latest version (Nikolaus Krismer)
diff --git a/bootstrap/importData.sh b/bootstrap/importData.sh
index ca223ca..0adb681 100755
--- a/bootstrap/importData.sh
+++ b/bootstrap/importData.sh
@@ -120,14 +120,21 @@ function fn_import_dataset_postgis() {
CITY=${CITY,,}
local SQL_EXPORT_FILE="${NAME,,}_export_${SRID}.sql.gz"
- if $USE_3D; then
+ if ${USE_3D}; then
SQL_EXPORT_FILE="${NAME,,}_export_${SRID}_srtm${SRTM_RESOLUTION}.sql.gz"
fi
+ local EXPORT_FOUND=false
+ if [ -f "$DATA_DIR/$SQL_EXPORT_FILE" ]; then
+ EXPORT_FOUND=true
+ fi
+
if ! $UPDATE_DATA; then
fn_echo " - downloading SQL export"
- fn_download_newer $DOWNLOAD_DIR/$SQL_EXPORT_FILE "${CACHE_DIR_REMOTE}${SQL_EXPORT_FILE}"
- cp $DOWNLOAD_DIR/$SQL_EXPORT_FILE $DATA_DIR/$SQL_EXPORT_FILE >> /dev/null 2>&1
+ if ! ${EXPORT_FOUND}; then
+ fn_download_newer $DOWNLOAD_DIR/$SQL_EXPORT_FILE "${CACHE_DIR_REMOTE}${SQL_EXPORT_FILE}"
+ cp $DOWNLOAD_DIR/$SQL_EXPORT_FILE $DATA_DIR/$SQL_EXPORT_FILE >> /dev/null 2>&1
+ fi
fn_echo " - importing SQL export into PostGIS database"
gunzip -c $DATA_DIR/$SQL_EXPORT_FILE | PGPASSWORD="$DB_PASSWORD" ${EXEC_PSQL} -U "$DB_USERNAME" -h localhost "$DB_NAME" >> "$WORKING_DIR/import_datamodel_$CITY_$SRID.log" 2>&1
@@ -141,7 +148,7 @@ function fn_import_dataset_postgis() {
done
fi
- if $UPDATE_DATA && [ -f "$DATA_DIR/$SQL_EXPORT_FILE" ]; then
+ if $UPDATE_DATA && ${EXPORT_FOUND}; then
fn_echo " - deleting outdated SQL export (forced data update)"
rm -rf "$DATA_DIR/$SQL_EXPORT_FILE"
fi
@@ -160,7 +167,7 @@ function fn_import_dataset_postgis() {
PGPASSWORD="$DB_PASSWORD" ${EXEC_PSQL} -qAt -U "$DB_USERNAME" -h localhost -d isochrone -c "DROP TABLE IF EXISTS ${CITY}_nodes_density" >> "$WORKING_DIR/create_datamodel_${CITY}_${SRID}.log" 2>&1
PGPASSWORD="spatial" ${EXEC_PGDUMP} -U spatial -h localhost -d spatial --clean --if-exists --no-privileges --no-owner -t "transformed.${CITY}_*" | sed -e "s/transformed/public/g" | PGPASSWORD="$DB_PASSWORD" ${EXEC_PSQL} -qAt -U "$DB_USERNAME" -h localhost -d isochrone >> "$WORKING_DIR/create_datamodel_${CITY}_${SRID}.log" 2>&1
- if $USE_3D; then
+ if ${USE_3D}; then
fn_echo " - adding node elevation for city \"${CITY}\" (using isochrone-tools)"
${EXEC_JAVA} -cp "${DEPLOY_DIR}/isochrone-tools.jar" at.uibk.dbis.isochrone.generator.elevation.SRTMGeneratorNode -ds "${CITY}" -r ${SRTM_RESOLUTION} -p "${SRTM_PASSWORD}" -u "${SRTM_USERNAME}" >> "$WORKING_DIR/create_elevation_${CITY}_${SRID}.log" 2>&1
fn_check_status
--
GitLab