From a8c932648e68d9f74e79601502eaf1d272d9e2f5 Mon Sep 17 00:00:00 2001
From: Alex Zolotarev <deathbaba@gmail.com>
Date: Wed, 17 Aug 2011 10:29:09 +0200
Subject: [PATCH] Added search index generation to scripts

---
 tools/unix/make_index_of.sh | 13 +++++++------
 tools/unix/polygons.sh      | 16 ++++++++--------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/tools/unix/make_index_of.sh b/tools/unix/make_index_of.sh
index a914ab2018..410feaebff 100755
--- a/tools/unix/make_index_of.sh
+++ b/tools/unix/make_index_of.sh
@@ -103,10 +103,11 @@ else
   LIGHT_NODES=true
 fi
 
-$PV $OSM_BZ2 | bzip2 -d | $GENERATOR_TOOL --intermediate_data_path=$TMPDIR \
-  --use_light_nodes=$LIGHT_NODES \
-  --preprocess_xml
+$PV $OSM_BZ2 | bzip2 -d | $GENERATOR_TOOL -intermediate_data_path=$TMPDIR \
+  -use_light_nodes=$LIGHT_NODES \
+  -preprocess_xml
 
-$PV $OSM_BZ2 | bzip2 -d | $GENERATOR_TOOL --intermediate_data_path=$TMPDIR \
-  --use_light_nodes=$LIGHT_NODES \
-  --generate_features --sort_features --generate_geometry --generate_index --output=$1 --bucketing_level=$DEFAULT_BUCKETING_LEVEL
+$PV $OSM_BZ2 | bzip2 -d | $GENERATOR_TOOL -intermediate_data_path=$TMPDIR \
+  -use_light_nodes=$LIGHT_NODES \
+  -generate_features -sort_features -generate_geometry -generate_index \
+  -output=$1 -bucketing_level=$DEFAULT_BUCKETING_LEVEL -generate_search_index
diff --git a/tools/unix/polygons.sh b/tools/unix/polygons.sh
index 99b2940f13..caa59f5c48 100755
--- a/tools/unix/polygons.sh
+++ b/tools/unix/polygons.sh
@@ -109,16 +109,16 @@ fi
 # skip 1st pass if intermediate data path was given
 if [ $# -lt 3 ]; then
   # 1st pass - not paralleled
-  $PV $OSM_BZ2 | bzip2 -d | $GENERATOR_TOOL --intermediate_data_path=$TMPDIR \
-    --use_light_nodes=$LIGHT_NODES \
-    --preprocess_xml
+  $PV $OSM_BZ2 | bzip2 -d | $GENERATOR_TOOL -intermediate_data_path=$TMPDIR \
+    -use_light_nodes=$LIGHT_NODES \
+    -preprocess_xml
 fi
 
 # 2nd pass - not paralleled
-$PV $OSM_BZ2 | bzip2 -d | $GENERATOR_TOOL --intermediate_data_path=$TMPDIR \
-  --use_light_nodes=$LIGHT_NODES --split_by_polygons --simplify_countries_level=$SIMPLIFY \
-  --generate_features --generate_world_scale=9 --merge_coastlines=true \
-  --data_path=$DATA_PATH
+$PV $OSM_BZ2 | bzip2 -d | $GENERATOR_TOOL -intermediate_data_path=$TMPDIR \
+  -use_light_nodes=$LIGHT_NODES -split_by_polygons -simplify_countries_level=$SIMPLIFY \
+  -generate_features -generate_world_scale=9 -merge_coastlines=true \
+  -data_path=$DATA_PATH
 
 # 3rd pass - do in parallel
 for file in $DATA_PATH/*.mwm; do
@@ -126,7 +126,7 @@ for file in $DATA_PATH/*.mwm; do
     filename=$(basename "$file")
     extension="${filename##*.}"
     filename="${filename%.*}"
-    $GENERATOR_TOOL --data_path=$DATA_PATH --generate_geometry --sort_features --generate_index --output="$filename" &
+    $GENERATOR_TOOL -data_path=$DATA_PATH -generate_geometry -sort_features -generate_index -generate_search_index -output="$filename" &
     forky $PROCESSORS
   fi
 done