diff --git a/CHANGELOG.md b/CHANGELOG.md index 7aa1fce1107d7f51d464a48931eec4bd967399fc..d3294aac546057443c924e90ddb49f1029ec6806 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 b202dd4dd70d7099f413eb5618952c50e209f2bc..a8bfb569e2944eb49bd8a5e2f36811333877ec79 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 99b366bdb911e77c2706f4c29805dcbef5069a5e..a8e645a3734f1e28f3cff665a0f29abf0154a3ca 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