From f5a181640e97d02bf801d661ac31f3f40bd05200 Mon Sep 17 00:00:00 2001
From: User Erdgeist <erdgeist@avon.ccc.de>
Date: Thu, 13 Feb 2014 22:11:25 +0000
Subject: Make working on geo-coordinate-dump dependent on the coordinate file
being there
---
src/makecolumns.sh | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
(limited to 'src')
diff --git a/src/makecolumns.sh b/src/makecolumns.sh
index 5b76c91..e270e18 100755
--- a/src/makecolumns.sh
+++ b/src/makecolumns.sh
@@ -174,16 +174,17 @@ handle_old_format() {
else
mv 07_unknown 07_Strasse
fi
- rm ??_unknown
karto=$1/[Dd][Aa][Tt]/[Kk][Aa][Rr][Tt][Oo].[Dd][Aa][Tt]
- [ -f ${karto} ] && do_processfile_old ${karto} "geo coordinates" 90_Geokoordinaten_hnr_raw
+ if [ -f ${karto} ]; then
+ do_processfile_old ${karto} "geo coordinates" 90_Geokoordinaten_hnr_raw
- printf "Looking up geo coordinates for each phonebook entry ... "
- tr '\0' '\n' < 90_Geokoordinaten_hnr_raw | tr ';' '\t' | cut -f "1,2,3,4,6,7" | tr '\n' '\0' > 90_Geokoordinaten_hnr
- rm 90_Geokoordinaten_hnr_raw
- lam 10_Postleitzahl -s $'\t' 11_Ort -s $'\t' 07_Strasse -s $'\t' 08_Hausnummer | mapcoords 90_Geokoordinaten_hnr | convertcoords > 16_Koordinaten
- printf "done.\n"
+ printf "Looking up geo coordinates for each phonebook entry ... "
+ tr '\0' '\n' < 90_Geokoordinaten_hnr_raw | tr ';' '\t' | cut -f "1,2,3,4,6,7" | tr '\n' '\0' > 90_Geokoordinaten_hnr
+ rm 90_Geokoordinaten_hnr_raw
+ lam 10_Postleitzahl -s $'\t' 11_Ort -s $'\t' 07_Strasse -s $'\t' 08_Hausnummer | mapcoords 90_Geokoordinaten_hnr | convertcoords > 16_Koordinaten
+ printf "done.\n"
+ fi
}
handle_new_format() {
--
cgit v1.2.3