Skip to content
Snippets Groups Projects
Commit 1a9e94b6 authored by User expired's avatar User expired
Browse files

changes to match new argument naming in isochrone-tools project

parent 12e6412a
No related branches found
No related tags found
No related merge requests found
Pipeline #
Upcoming version: Upcoming version:
----------------- -----------------
- changes to match new argument naming in isochrone-tools project (Nikolaus Krismer)
- updating neo4j to latest version (Nikolaus Krismer) - updating neo4j to latest version (Nikolaus Krismer)
- fixed open task (downloading without error checking for spatialite DB (Nikolaus Krismer) - fixed open task (downloading without error checking for spatialite DB (Nikolaus Krismer)
- fixed invalid file name (Nikolaus Krismer) - fixed invalid file name (Nikolaus Krismer)
......
...@@ -57,7 +57,7 @@ function fn_create_synthetic_networks() { ...@@ -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" fn_echo "An error occurred while creating the grid network. The process will exit now with status $?" "ERROR"
exit $? exit $?
fi 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 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" 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 $? exit $?
...@@ -69,7 +69,7 @@ function fn_create_synthetic_networks() { ...@@ -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" fn_echo "An error occurred while creating the spider network. The process will exit now with status $?" "ERROR"
exit $? exit $?
fi 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 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" 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 $? exit $?
...@@ -100,7 +100,7 @@ function fn_import_dataset_neo4j_spatial() { ...@@ -100,7 +100,7 @@ function fn_import_dataset_neo4j_spatial() {
CITY=${CITY,,} CITY=${CITY,,}
# We copy data from postgis for specified dataset (after postgis data import) # 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 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" fn_echo "An error occurred while importing data into neo4j using isochrone-tools. The process will exit now with status $?" "ERROR"
exit $? exit $?
...@@ -158,7 +158,7 @@ function fn_import_dataset_postgis() { ...@@ -158,7 +158,7 @@ function fn_import_dataset_postgis() {
fn_echo " - nodes_density exists... not re-creating table" fn_echo " - nodes_density exists... not re-creating table"
else else
fn_echo " - nodes_densities does not exist... creating table" 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 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" 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 $? exit $?
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment