From 7cc9439c8801147fee0dd554efb0d32403a7d4bc Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 23 Jan 2012 10:11:14 +0100
Subject: Path to tagstats program now in main config

---
 sources/db/update.sh        | 12 ++++++++----
 taginfo-config-example.json |  3 +++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/sources/db/update.sh b/sources/db/update.sh
index 5c9a0c6..9831ff9 100755
--- a/sources/db/update.sh
+++ b/sources/db/update.sh
@@ -36,8 +36,7 @@ sqlite3 $DATABASE <../init.sql
 echo "`$DATECMD` Running pre.sql..."
 sqlite3 $DATABASE <pre.sql
 
-echo "`$DATECMD` Running count... "
-
+echo "`$DATECMD` Running tagstats... "
 top=`../../bin/taginfo-config.rb geodistribution.top`
 right=`../../bin/taginfo-config.rb geodistribution.right`
 bottom=`../../bin/taginfo-config.rb geodistribution.bottom`
@@ -45,8 +44,13 @@ left=`../../bin/taginfo-config.rb geodistribution.left`
 width=`../../bin/taginfo-config.rb geodistribution.width`
 height=`../../bin/taginfo-config.rb geodistribution.height`
 
-#valgrind --leak-check=full --show-reachable=yes ./tagstats $PLANETFILE $DATABASE >valgrind.log 2>&1
-./tagstats -T $DIR/interesting_tags.lst --left=$left --bottom=$bottom --top=$top --right=$right --width=$width --height=$height $PLANETFILE $DATABASE
+TAGSTATS=`../../bin/taginfo-config.rb sources.db.tagstats`
+if [ "x" = "x$TAGSTATS" ]; then
+    TAGSTATS="./tagstats"
+fi
+
+#TAGSTATS="valgrind --leak-check=full --show-reachable=yes $TAGSTATS"
+$TAGSTATS -T $DIR/interesting_tags.lst --left=$left --bottom=$bottom --top=$top --right=$right --width=$width --height=$height $PLANETFILE $DATABASE
 
 echo "`$DATECMD` Running update_characters... "
 ./update_characters.pl $DIR
diff --git a/taginfo-config-example.json b/taginfo-config-example.json
index 4c4a275..7ab4fc6 100644
--- a/taginfo-config-example.json
+++ b/taginfo-config-example.json
@@ -48,6 +48,9 @@
         // These sources will be created from the actual sources.
         "create": "db",
         "db": {
+            // Path to the 'tagstats' program (absolute path or relative to sources/db directory).
+            "tagstats": "./tagstats",
+            // The OSM planet file or extract where we read the OSM data from.
             "planetfile": "/osm/planet/var/current-planet.osm.pbf"
         }
     }
-- 
cgit v1.2.3