summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirk Engling <erdgeist@erdgeist.org>2014-02-20 22:42:56 +0100
committerDirk Engling <erdgeist@erdgeist.org>2014-02-20 22:42:56 +0100
commit046857dfb88f05e6b310fe9ef07b9f2d3ac5922d (patch)
tree9ce854f9572168c3ec1fe6751276430fa4a79cd9
parent64c85dfc1d3b546dd4b5f84168e9256817f3a741 (diff)
Restructure project, make names more clear
-rw-r--r--src/Makefile25
-rw-r--r--src/export/convert_coords.c (renamed from src/convertcoords.c)0
-rw-r--r--src/export/extract_version_2.c (renamed from src/extractblocks_new.c)0
-rw-r--r--src/export/extract_version_3.c (renamed from src/decompress.c)0
-rw-r--r--src/export/map_coords.c (renamed from src/mapcoords.c)0
-rw-r--r--src/export/mystdlib.c (renamed from src/mystdlib.c)0
-rw-r--r--src/export/mystdlib.h (renamed from src/mystdlib.h)0
-rw-r--r--src/export/split_version_2.c (renamed from src/splitold.c)0
-rwxr-xr-xsrc/makecolumns.sh42
9 files changed, 34 insertions, 33 deletions
diff --git a/src/Makefile b/src/Makefile
index 1a09455..21370a6 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,19 +1,20 @@
1all: decompress extractblocks mapcoords convertcoords splitold 1BINARIES=../bin/extract_version_2 ../bin/extract_version_3 ../bin/split_version_2 ../bin/map_coords ../bin/convert_coords
2binaries: $(BINARIES)
2 3
3decompress: decompress.c mystdlib.c 4../bin/extract_version_3: export/extract_version_3.c export/mystdlib.c
4 @$(CC) -O2 -o ../bin/decompress decompress.c mystdlib.c -lz 5 @$(CC) -O2 -o ../bin/extract_version_3 export/extract_version_3.c export/mystdlib.c -lz -I export
5 6
6extractblocks: extractblocks_new.c mystdlib.c 7../bin/extract_version_2: export/extract_version_2.c export/mystdlib.c
7 @$(CC) -o ../bin/extractblocks extractblocks_new.c mystdlib.c 8 @$(CC) -O2 -o ../bin/extract_version_2 export/extract_version_2.c export/mystdlib.c -I export
8 9
9mapcoords: mapcoords.c mystdlib.c 10../bin/split_version_2: export/split_version_2.c export/mystdlib.c
10 @$(CC) -o ../bin/mapcoords mapcoords.c mystdlib.c 11 @$(CC) -o ../bin/split_version_2 export/split_version_2.c export/mystdlib.c -I export
11 12
12splitold: splitold.c mystdlib.c 13../bin/map_coords: export/map_coords.c export/mystdlib.c
13 @$(CC) -o ../bin/splitold splitold.c mystdlib.c 14 @$(CC) -o ../bin/map_coords export/map_coords.c export/mystdlib.c -I export
14 15
15convertcoords: convertcoords.c 16../bin/convert_coords: export/convert_coords.c
16 @$(CC) -o ../bin/convertcoords convertcoords.c -lm 17 @$(CC) -o ../bin/convert_coords export/convert_coords.c -lm
17 18
18clean: 19clean:
19 @rm -f ../bin/{decompress,extractblocks,mapcoords,convertcoords,splitold} 20 @rm -f $(BINARIES)
diff --git a/src/convertcoords.c b/src/export/convert_coords.c
index 37d780a..37d780a 100644
--- a/src/convertcoords.c
+++ b/src/export/convert_coords.c
diff --git a/src/extractblocks_new.c b/src/export/extract_version_2.c
index fe85252..fe85252 100644
--- a/src/extractblocks_new.c
+++ b/src/export/extract_version_2.c
diff --git a/src/decompress.c b/src/export/extract_version_3.c
index fef4241..fef4241 100644
--- a/src/decompress.c
+++ b/src/export/extract_version_3.c
diff --git a/src/mapcoords.c b/src/export/map_coords.c
index b46f1cf..b46f1cf 100644
--- a/src/mapcoords.c
+++ b/src/export/map_coords.c
diff --git a/src/mystdlib.c b/src/export/mystdlib.c
index 17f123b..17f123b 100644
--- a/src/mystdlib.c
+++ b/src/export/mystdlib.c
diff --git a/src/mystdlib.h b/src/export/mystdlib.h
index 2e9499f..2e9499f 100644
--- a/src/mystdlib.h
+++ b/src/export/mystdlib.h
diff --git a/src/splitold.c b/src/export/split_version_2.c
index bd85775..bd85775 100644
--- a/src/splitold.c
+++ b/src/export/split_version_2.c
diff --git a/src/makecolumns.sh b/src/makecolumns.sh
index 04806fb..28dd0a8 100755
--- a/src/makecolumns.sh
+++ b/src/makecolumns.sh
@@ -20,7 +20,7 @@ main() {
20 fi 20 fi
21 21
22 # Compile all the binaries 22 # Compile all the binaries
23 make all 23 make binaries
24 24
25 printf "Cleaning up old working directory ... " 25 printf "Cleaning up old working directory ... "
26 rm -rf ../work_`basename ${1#white_}` 26 rm -rf ../work_`basename ${1#white_}`
@@ -29,18 +29,18 @@ main() {
29 cd ../work_`basename ${1#white_}` || exit 1 29 cd ../work_`basename ${1#white_}` || exit 1
30 30
31 if [ -f "$1/phonebook.db" ]; then 31 if [ -f "$1/phonebook.db" ]; then
32 handle_new_format $1 32 handle_format_version_3 $1
33 elif [ -f $1/[Dd][Aa][Tt]/[Tt][Ee][Ii][Ll][Nn].[Dd][Aa][Tt] ]; then 33 elif [ -f $1/[Dd][Aa][Tt]/[Tt][Ee][Ii][Ll][Nn].[Dd][Aa][Tt] ]; then
34 handle_old_format $1 34 handle_format_version_2 $1
35 else 35 else
36 echo "Not a recognized Telefonbuch folder" 36 echo "Not a recognized Telefonbuch folder"
37 fi 37 fi
38 cd .. 38 cd ..
39} 39}
40 40
41do_decompress_old() { 41do_decompress_version_2() {
42 printf "Extracting $2 chunks ... " 42 printf "Extracting $2 chunks ... "
43 extractblocks "${1}" 43 extract_version_2 "${1}"
44 printf "done.\n" 44 printf "done.\n"
45 45
46 printf "Decompressing $2 chunks ... " 46 printf "Decompressing $2 chunks ... "
@@ -55,10 +55,10 @@ do_decompress_old() {
55 printf "done.\n" 55 printf "done.\n"
56} 56}
57 57
58do_processfile_old() { 58do_processfile_version_2() {
59 working_on=`basename ${1}` 59 working_on=`basename ${1}`
60 mkdir $working_on && cd ${working_on} 60 mkdir $working_on && cd ${working_on}
61 do_decompress_old "${1}" "${2}" 61 do_decompress_version_2 "${1}" "${2}"
62 cd .. 62 cd ..
63 63
64 printf "Combining $2 into single file ... " 64 printf "Combining $2 into single file ... "
@@ -81,10 +81,10 @@ get_dword() {
81 hexdump -n 4 -v -e '" " 1/4 "%u"' `printf %0${filename_len}d ${1}` 81 hexdump -n 4 -v -e '" " 1/4 "%u"' `printf %0${filename_len}d ${1}`
82} 82}
83 83
84handle_old_format() { 84handle_format_version_2() {
85 echo "Working on $1. Detected pre-2004 Telefonbuch version." 85 echo "Working on $1. Detected pre-2004 Telefonbuch version."
86 # Extract teiln.dat 86 # Extract teiln.dat
87 do_decompress_old $1/[Dd][Aa][Tt]/[Tt][Ee][Ii][Ll][Nn].[Dd][Aa][Tt] "teiln.dat" 87 do_decompress_version_2 $1/[Dd][Aa][Tt]/[Tt][Ee][Ii][Ll][Nn].[Dd][Aa][Tt] "teiln.dat"
88 88
89 # See how long each filename is 89 # See how long each filename is
90 export filename_len=$(( `ls | head -n 1 | wc -c` - 1 )) 90 export filename_len=$(( `ls | head -n 1 | wc -c` - 1 ))
@@ -112,7 +112,7 @@ handle_old_format() {
112 112
113 # Now loop over all files and dump them 113 # Now loop over all files and dump them
114 printf "Splitting decompressed nname chunks into their columns ... " 114 printf "Splitting decompressed nname chunks into their columns ... "
115 jot -w %0${filename_len}d - ${nname_file} $(( number_of_files - 1 )) 3 | splitold 1 1 115 jot -w %0${filename_len}d - ${nname_file} $(( number_of_files - 1 )) 3 | split_version_2 1 1
116# set -- `hexdump -n 8 -v -e '" " 1/4 "%u"' ${file}` 116# set -- `hexdump -n 8 -v -e '" " 1/4 "%u"' ${file}`
117# tail -c +$(( $2 + 1 )) ${file} 117# tail -c +$(( $2 + 1 )) ${file}
118# done | tr '\n\0' '\t\n' > 01_02_Flags_Nachname 118# done | tr '\n\0' '\t\n' > 01_02_Flags_Nachname
@@ -126,7 +126,7 @@ handle_old_format() {
126 printf "done.\n" 126 printf "done.\n"
127 127
128 printf "Splitting decompress table file chunks into their columns ... " 128 printf "Splitting decompress table file chunks into their columns ... "
129 jot -w %0${filename_len}d - ${table_file} $(( number_of_files - 1 )) 3 | splitold 4 0 129 jot -w %0${filename_len}d - ${table_file} $(( number_of_files - 1 )) 3 | split_version_2 4 0
130# for file in `jot -w %0${filename_len}d - ${table_file} $(( number_of_files - 1 )) 3`; do 130# for file in `jot -w %0${filename_len}d - ${table_file} $(( number_of_files - 1 )) 3`; do
131# # Offset into first table entry tells us how many 131# # Offset into first table entry tells us how many
132# # fields are in table file 132# # fields are in table file
@@ -162,7 +162,7 @@ handle_old_format() {
162 # If street names come in an extra file, extract 162 # If street names come in an extra file, extract
163 # street names first 163 # street names first
164 streets=$1/[Dd][Aa][Tt]/[Ss][Tt][Rr][Aa][Ss][Ss][Ee][Nn].[Dd][Aa][Tt] 164 streets=$1/[Dd][Aa][Tt]/[Ss][Tt][Rr][Aa][Ss][Ss][Ee][Nn].[Dd][Aa][Tt]
165 [ -f ${streets} ] && do_processfile_old ${streets} "street name" 99_Strassenname convert_zeros 165 [ -f ${streets} ] && do_processfile_version_2 ${streets} "street name" 99_Strassenname convert_zeros
166 166
167 # extract street names if 07_unknown contains street indexes 167 # extract street names if 07_unknown contains street indexes
168 # instead of street names 168 # instead of street names
@@ -177,27 +177,27 @@ handle_old_format() {
177 177
178 karto=$1/[Dd][Aa][Tt]/[Kk][Aa][Rr][Tt][Oo].[Dd][Aa][Tt] 178 karto=$1/[Dd][Aa][Tt]/[Kk][Aa][Rr][Tt][Oo].[Dd][Aa][Tt]
179 if [ -f ${karto} ]; then 179 if [ -f ${karto} ]; then
180 do_processfile_old ${karto} "geo coordinates" 90_Geokoordinaten_hnr_raw 180 do_processfile_version_2 ${karto} "geo coordinates" 90_Geokoordinaten_hnr_raw
181 181
182 printf "Looking up geo coordinates for each phonebook entry ... " 182 printf "Looking up geo coordinates for each phonebook entry ... "
183 tr '\0' '\n' < 90_Geokoordinaten_hnr_raw | tr ';' '\t' | cut -f "1,2,3,4,6,7" | tr '\n' '\0' > 90_Geokoordinaten_hnr 183 tr '\0' '\n' < 90_Geokoordinaten_hnr_raw | tr ';' '\t' | cut -f "1,2,3,4,6,7" | tr '\n' '\0' > 90_Geokoordinaten_hnr
184 rm 90_Geokoordinaten_hnr_raw 184 rm 90_Geokoordinaten_hnr_raw
185 lam 10_Postleitzahl -s $'\t' 11_Ort -s $'\t' 07_Strasse -s $'\t' 08_Hausnummer | mapcoords 90_Geokoordinaten_hnr | convertcoords > 16_Koordinaten 185 lam 10_Postleitzahl -s $'\t' 11_Ort -s $'\t' 07_Strasse -s $'\t' 08_Hausnummer | map_coords 90_Geokoordinaten_hnr | convert_coords > 16_Koordinaten
186 printf "done.\n" 186 printf "done.\n"
187 fi 187 fi
188} 188}
189 189
190handle_new_format() { 190handle_format_version_3() {
191 echo "Working on $1. Detected post-2003 Telefonbuch version." 191 echo "Working on $1. Detected post-2003 Telefonbuch version."
192 printf "Extracting street names ... " 192 printf "Extracting street names ... "
193 decompress $1/streets.tl 193 extract_version_3 $1/streets.tl
194 194
195 cat file_* | tr '\n\0' '\t\n' > 99_Strassenname 195 cat file_* | tr '\n\0' '\t\n' > 99_Strassenname
196 rm file_* 196 rm file_*
197 printf "done.\n" 197 printf "done.\n"
198 198
199 printf "Extracting phonebook.db ... " 199 printf "Extracting phonebook.db ... "
200 decompress $1/phonebook.db 200 extract_version_3 $1/phonebook.db
201 201
202 rows=`find . -name file_\* | wc -l` 202 rows=`find . -name file_\* | wc -l`
203 printf "done.\n" 203 printf "done.\n"
@@ -237,19 +237,19 @@ handle_new_format() {
237 237
238 if [ -f $1/zip-streets-hn-geo.tl ]; then 238 if [ -f $1/zip-streets-hn-geo.tl ]; then
239 printf "Extracting geo coordinates (precision: house number) ... " 239 printf "Extracting geo coordinates (precision: house number) ... "
240 decompress $1/zip-streets-hn-geo.tl 240 extract_version_3 $1/zip-streets-hn-geo.tl
241 cat file_* > 90_Geokoordinaten_hnr 241 cat file_* > 90_Geokoordinaten_hnr
242 printf "done.\n" 242 printf "done.\n"
243 printf "Looking up geo coordinates for each phonebook entry ... " 243 printf "Looking up geo coordinates for each phonebook entry ... "
244 lam 10_Postleitzahl -s $'\t' 07_Strasse -s $'\t' 08_Hausnummer | mapcoords 90_Geokoordinaten_hnr | convertcoords > 16_Koordinaten 244 lam 10_Postleitzahl -s $'\t' 07_Strasse -s $'\t' 08_Hausnummer | map_coords 90_Geokoordinaten_hnr | convert_coords > 16_Koordinaten
245 printf "done.\n" 245 printf "done.\n"
246 elif [ -f $1/zip-streets-geo.tl ]; then 246 elif [ -f $1/zip-streets-geo.tl ]; then
247 printf "Extracting geo coordinates (precision: street) ... " 247 printf "Extracting geo coordinates (precision: street) ... "
248 decompress $1/zip-streets-geo.tl 248 extract_version_3 $1/zip-streets-geo.tl
249 cat file_* > 91_Geokoordinaten_str 249 cat file_* > 91_Geokoordinaten_str
250 printf "done.\n" 250 printf "done.\n"
251 printf "Looking up geo coordinates for each phonebook entry ... " 251 printf "Looking up geo coordinates for each phonebook entry ... "
252 lam 10_Postleitzahl -s $'\t' 07_Strasse | mapcoords 91_Geokoordinaten_str | convertcoords > 16_Koordinaten 252 lam 10_Postleitzahl -s $'\t' 07_Strasse | map_coords 91_Geokoordinaten_str | convert_coords > 16_Koordinaten
253 printf "done.\n" 253 printf "done.\n"
254 fi 254 fi
255 rm file_* 255 rm file_*