From 128e7ac9bf397539834148ca9c7b58fd44cbfbf6 Mon Sep 17 00:00:00 2001 From: Jochen Topf Date: Thu, 26 Feb 2015 16:00:16 +0100 Subject: Run 'similarity' binary from db update script if it is available. This also introduces a 'bindir' config setting which must contain the directory where the binaries such as 'tagstats' and 'similarity' live. This setting will replace the current 'tagstats' setting in the future. --- sources/db/update.sh | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'sources') diff --git a/sources/db/update.sh b/sources/db/update.sh index f003426..3e42094 100755 --- a/sources/db/update.sh +++ b/sources/db/update.sh @@ -46,6 +46,7 @@ width=`../../bin/taginfo-config.rb geodistribution.width` height=`../../bin/taginfo-config.rb geodistribution.height` min_tag_combination_count=`../../bin/taginfo-config.rb sources.master.min_tag_combination_count 1000` +BINDIR=`../../bin/taginfo-config.rb sources.db.bindir ../../tagstats` TAGSTATS=`../../bin/taginfo-config.rb sources.db.tagstats ../../tagstats/tagstats` if [ -f $SELECTION_DB ]; then @@ -62,6 +63,13 @@ fi #TAGSTATS="valgrind --leak-check=full --show-reachable=yes $TAGSTATS" $TAGSTATS $OPEN_SELECTION_DB --min-tag-combination-count=$min_tag_combination_count --left=$left --bottom=$bottom --top=$top --right=$right --width=$width --height=$height $PLANETFILE $DATABASE +if [ -e $BINDIR/similarity ]; then + echo "`$DATECMD` Running similarity... " + $BINDIR/similarity $DATABASE +else + echo "WARNING: Not running 'similarity', because binary not found. Please compile it." +fi + echo "`$DATECMD` Running update_characters... " ./update_characters.rb $DIR -- cgit v1.2.3