From 6ecb989269db41d7d53c8d52dfceae9f1c9ee923 Mon Sep 17 00:00:00 2001
From: Nikolaus Krismer <nikolaus.krismer@uibk.ac.at>
Date: Mon, 1 Feb 2016 11:10:40 +0100
Subject: [PATCH] deactivating invalid datasets
---
CHANGELOG.md | 1 +
bootstrap/importData.sh | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 348d8f9..943fc66 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
Upcoming version:
-----------------
+ - deactivating invalid datasets (Nikolaus Krismer)
- added some more logging output to dataset generation (Nikolaus Krismer)
- improved error handling in bash script (Nikolaus Krismer)
- improved some messages and the documentation (Nikolaus Krismer)
diff --git a/bootstrap/importData.sh b/bootstrap/importData.sh
index cbc27a7..b202dd4 100755
--- a/bootstrap/importData.sh
+++ b/bootstrap/importData.sh
@@ -189,7 +189,7 @@ function fn_init_geoserver() {
fn_filter_osm_data "SanFrancisco" "${OSM_FILE_US_CALIFORNIA}"
fn_filter_osm_data "WashingtonDC" "${OSM_FILE_US_DC}"
if $DEPLOY_ALL_DATASETS; then
- fn_filter_osm_data "Italy" "${OSM_FILE_ITALY}"
+# fn_filter_osm_data "Italy" "${OSM_FILE_ITALY}"
fn_filter_osm_data "AltoAdige" "${OSM_FILE_ITALY}"
fi
@@ -207,7 +207,7 @@ function fn_init_geoserver() {
sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft_sanfrancisco.gs >> setup_geoserver_neo4j.log 2>&1
sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft_washingtondc.gs >> setup_geoserver_neo4j.log 2>&1
if $DEPLOY_ALL_DATASETS; then
- sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft_italy.gs >> setup_geoserver_neo4j.log 2>&1
+# sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft_italy.gs >> setup_geoserver_neo4j.log 2>&1
sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft_altoadige.gs >> setup_geoserver_neo4j.log 2>&1
fi
sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft.gs >> setup_geoserver_neo4j.log 2>&1
@@ -224,7 +224,7 @@ function fn_init_geoserver() {
sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft_sanfrancisco.gs >> setup_geoserver_postgis.log 2>&1
sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft_washingtondc.gs >> setup_geoserver_postgis.log 2>&1
if $DEPLOY_ALL_DATASETS; then
- sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft_italy.gs >> setup_geoserver_postgis.log 2>&1
+# sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft_italy.gs >> setup_geoserver_postgis.log 2>&1
sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft_altoadige.gs >> setup_geoserver_postgis.log 2>&1
fi
sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft.gs >> setup_geoserver_postgis.log 2>&1
@@ -321,7 +321,7 @@ if $DEPLOY_ANY_DATASET; then
fn_import_dataset "SanFrancisco" "$CURRENT_SRID"
fn_import_dataset "WashingtonDC" "$CURRENT_SRID"
if $DEPLOY_ALL_DATASETS; then
- fn_import_dataset "Italy" "$CURRENT_SRID"
+# fn_import_dataset "Italy" "$CURRENT_SRID"
fn_import_dataset "AltoAdige" "$CURRENT_SRID"
fi
--
GitLab