when adding Tiger data, check first if database is in frozen state

[nominatim.git] / utils / update_database.sh

diff --git a/utils/update_database.sh b/utils/update_database.sh
index 75d0de5d612b1e33315e41e1cd981230815049b5..58f7690a189ca370d0e4c0311eef7f7f50331a0a 100644 (file)
--- a/utils/update_database.sh
+++ b/utils/update_database.sh
@@ -22,25 +22,14 @@
 
 # REPLACE WITH LIST OF YOUR "COUNTRIES":
 #
-
-
 COUNTRIES="europe/monaco europe/andorra"
 
-# SET TO YOUR NOMINATIM build FOLDER PATH:
-#
-NOMINATIMBUILD="/srv/nominatim/build"
-UPDATEFILE="$NOMINATIMBUILD/utils/update.php"
-
-# SET TO YOUR update data FOLDER PATH:
-#
-UPDATEDIR="/srv/nominatim/update"
-
 UPDATEBASEURL="https://download.geofabrik.de"
 UPDATECOUNTRYPOSTFIX="-updates"
 
 # If you do not use Photon, let Nominatim handle (re-)indexing:
 #
-FOLLOWUP="$UPDATEFILE --index"
+FOLLOWUP="nominatim index"
 #
 # If you use Photon, update Photon and let it handle the index
 # (Photon server must be running and must have been started with "-database",
@@ -49,11 +38,10 @@ FOLLOWUP="$UPDATEFILE --index"
 #FOLLOWUP="curl http://localhost:2322/nominatim-update"
 
 # ******************************************************************************
-
+UPDATEDIR="update"
 
 for COUNTRY in $COUNTRIES;
 do
-    
     echo "===================================================================="
     echo "$COUNTRY"
     echo "===================================================================="
@@ -61,20 +49,16 @@ do
     FILE="$DIR/sequence.state"
     BASEURL="$UPDATEBASEURL/$COUNTRY$UPDATECOUNTRYPOSTFIX"
     FILENAME=${COUNTRY//[\/]/_}
-    
-    # mkdir -p ${DIR}
-    cd ${DIR}
 
     echo "Attempting to get changes"
+    rm -f ${DIR}/${FILENAME}.osc.gz
     pyosmium-get-changes -o ${DIR}/${FILENAME}.osc.gz -f ${FILE} --server $BASEURL -v
 
     echo "Attempting to import diffs"
-    ${NOMINATIMBUILD}/utils/update.php --import-diff ${DIR}/${FILENAME}.osc.gz
-    rm ${DIR}/${FILENAME}.osc.gz
-
+    nominatim add-data --diff ${DIR}/${FILENAME}.osc.gz
 done
 
 echo "===================================================================="
 echo "Reindexing" 
 ${FOLLOWUP}
-echo "===================================================================="
\ No newline at end of file
+echo "===================================================================="