diff --git a/CHANGELOG.md b/CHANGELOG.md index e532c4afd8c008a0c6f51e86342d78705c35f807..c6a798185326ee774c2ee07d3a6e58363126182c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ Upcoming version: ----------------- + - changes to match new argument naming in isochrone-tools project (Nikolaus Krismer) - updating neo4j to latest version (Nikolaus Krismer) - fixed open task (downloading without error checking for spatialite DB (Nikolaus Krismer) - fixed invalid file name (Nikolaus Krismer) diff --git a/bootstrap/importData.sh b/bootstrap/importData.sh index a4c5f319bf3d0d33b701cd768c333897893e3514..54a9d5bbe528727e93444ca6a99cdb27e2aede82 100755 --- a/bootstrap/importData.sh +++ b/bootstrap/importData.sh @@ -57,7 +57,7 @@ function fn_create_synthetic_networks() { fn_echo "An error occurred while creating the grid network. The process will exit now with status $?" "ERROR" exit $? fi - ${EXEC_JAVA} -cp ${DEPLOY_DIR}/isochrone-tools.jar at.uibk.dbis.isochrone.generator.density.DensityGenerator -t grid_s100 -d "$DENSITY" >> "$WORKING_DIR/generate_gridNetwork.log" 2>&1 + ${EXEC_JAVA} -cp ${DEPLOY_DIR}/isochrone-tools.jar at.uibk.dbis.isochrone.generator.density.DensityGenerator -ds grid_s100 -d "$DENSITY" >> "$WORKING_DIR/generate_gridNetwork.log" 2>&1 if [ $? -ne 0 ]; then fn_echo "An error occurred while creating the node_density table for 'grid_s100' using isochrone-tools. The process will exit now with status $?" "ERROR" exit $? @@ -69,7 +69,7 @@ function fn_create_synthetic_networks() { fn_echo "An error occurred while creating the spider network. The process will exit now with status $?" "ERROR" exit $? fi - ${EXEC_JAVA} -cp ${DEPLOY_DIR}/isochrone-tools.jar at.uibk.dbis.isochrone.generator.density.DensityGenerator -t spider_l1000 -d "$DENSITY" >> "$WORKING_DIR/generate_spiderNetwork.log" 2>&1 + ${EXEC_JAVA} -cp ${DEPLOY_DIR}/isochrone-tools.jar at.uibk.dbis.isochrone.generator.density.DensityGenerator -ds spider_l1000 -d "$DENSITY" >> "$WORKING_DIR/generate_spiderNetwork.log" 2>&1 if [ $? -ne 0 ]; then fn_echo "An error occurred while creating the node_density table for 'spider_l1000' using isochrone-tools. The process will exit now with status $?" "ERROR" exit $? @@ -100,7 +100,7 @@ function fn_import_dataset_neo4j_spatial() { CITY=${CITY,,} # We copy data from postgis for specified dataset (after postgis data import) - ${EXEC_JAVA} -cp ${DEPLOY_DIR}/isochrone-tools.jar at.uibk.dbis.isochrone.exporter.ImportDataNeo4j -t "${CITY}" > "$WORKING_DIR/import_neo4j_$CITY.log" 2>&1 + ${EXEC_JAVA} -cp ${DEPLOY_DIR}/isochrone-tools.jar at.uibk.dbis.isochrone.exporter.ImportDataNeo4j -ds "${CITY}" > "$WORKING_DIR/import_neo4j_$CITY.log" 2>&1 if [ $? -ne 0 ]; then fn_echo "An error occurred while importing data into neo4j using isochrone-tools. The process will exit now with status $?" "ERROR" exit $? @@ -158,7 +158,7 @@ function fn_import_dataset_postgis() { fn_echo " - nodes_density exists... not re-creating table" else fn_echo " - nodes_densities does not exist... creating table" - ${EXEC_JAVA} -cp "${DEPLOY_DIR}/isochrone-tools.jar" "at.uibk.dbis.isochrone.generator.density.DensityGenerator" -t "${CITY}" -d "${DENSITY}" >> "$WORKING_DIR/create_datamodel_${CITY}_${SRID}.log" 2>&1 + ${EXEC_JAVA} -cp "${DEPLOY_DIR}/isochrone-tools.jar" "at.uibk.dbis.isochrone.generator.density.DensityGenerator" -m -ds "${CITY}" -d "${DENSITY}" >> "$WORKING_DIR/create_datamodel_${CITY}_${SRID}.log" 2>&1 if [ $? -ne 0 ]; then fn_echo "An error occurred while creating the node_density table for '${CITY}' using isochrone-tools. The process will exit now with status $?" "ERROR" exit $?