From bb13d48546ae44c1a64b6978cb89c4d7e099e3ac Mon Sep 17 00:00:00 2001
From: Nikolaus Krismer <nikolaus.krismer@uibk.ac.at>
Date: Mon, 8 Feb 2016 16:16:16 +0100
Subject: [PATCH] changes due to rename in isochrone-datamodel
---
CHANGELOG.md | 1 +
bootstrap/importData.sh | 2 +-
bootstrap/prepareEnvironment.sh | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7aa1fce..d3294aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
Upcoming version:
-----------------
+ - changes due to rename in isochrone-datamodel (Nikolaus Krismer)
- version updates (Nikolaus Krismer)
- deactivating invalid datasets (Nikolaus Krismer)
- added some more logging output to dataset generation (Nikolaus Krismer)
diff --git a/bootstrap/importData.sh b/bootstrap/importData.sh
index b202dd4..a8bfb56 100755
--- a/bootstrap/importData.sh
+++ b/bootstrap/importData.sh
@@ -147,7 +147,7 @@ function fn_import_dataset_postgis() {
if $AVAILABLE_ISOCHRONE_DATAMODEL && [ ! -f "$DATA_DIR/$SQL_EXPORT_FILE" ]; then
echo " - creating datamodel using isochrone-datamodel"
# Create datamodel using isochrone-datamodel project
- DB_USERNAME="$PG_DB_USER" DB_PASSWORD="$PG_DB_PASSWORD" "$DEPLOY_DIR/isochrone-datamodel/builder.sh" -d -s -b -l -t${SRID} -c${CITY} >> "$WORKING_DIR/create_datamodel_${CITY}_${SRID}.log" 2>&1
+ DB_USERNAME="$PG_DB_USER" DB_PASSWORD="$PG_DB_PASSWORD" "$DEPLOY_DIR/isochrone-datamodel/osmPti2mmds.sh" -d -s -b -l -t${SRID} -c${CITY} >> "$WORKING_DIR/create_datamodel_${CITY}_${SRID}.log" 2>&1
if [ $? -ne 0 ]; then
printf "%s\n" "[ERROR] An error occurred while creating datamodel using isochrone-datamodel. The process will exit now with status $?"
exit $?
diff --git a/bootstrap/prepareEnvironment.sh b/bootstrap/prepareEnvironment.sh
index 99b366b..a8e645a 100755
--- a/bootstrap/prepareEnvironment.sh
+++ b/bootstrap/prepareEnvironment.sh
@@ -542,7 +542,7 @@ if $INSTALL_ISOCHRONE_DATAMODEL; then
cp $DOWNLOAD_DIR/$NEXUS_ARTIFACT_NAME_DATAMODEL.jar $DEPLOY_DIR/ >> $WORKING_DIR/install_isochrone_datamodel.log 2>&1
unzip -o -d "$DEPLOY_DIR/isochrone-datamodel" $DEPLOY_DIR/$NEXUS_ARTIFACT_NAME_DATAMODEL.jar >> $WORKING_DIR/install_isochrone_datamodel.log 2>&1
- DATAMODEL_VERSION_STRING=$(grep $DEPLOY_DIR/isochrone-datamodel/builder.sh -e "^VERSION=\".*\"$")
+ DATAMODEL_VERSION_STRING=$(grep $DEPLOY_DIR/isochrone-datamodel/osmPti2mmds.sh -e "^VERSION=\".*\"$")
DATAMODEL_VERSION_STRING=${DATAMODEL_VERSION_STRING#*\"}
DATAMODEL_VERSION_STRING=${DATAMODEL_VERSION_STRING%\"*}
mkdir -p "$DEPLOY_DIR/isochrone-datamodel/build/libs" >> $WORKING_DIR/install_isochrone_datamodel.log 2>&1
--
GitLab