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 @@
-all: decompress extractblocks mapcoords convertcoords splitold
+BINARIES=../bin/extract_version_2 ../bin/extract_version_3 ../bin/split_version_2 ../bin/map_coords ../bin/convert_coords
+binaries: $(BINARIES)
 
-decompress: decompress.c mystdlib.c
-        @$(CC) -O2 -o ../bin/decompress decompress.c mystdlib.c -lz
+../bin/extract_version_3: export/extract_version_3.c export/mystdlib.c
+        @$(CC) -O2 -o ../bin/extract_version_3 export/extract_version_3.c export/mystdlib.c -lz -I export
 
-extractblocks: extractblocks_new.c mystdlib.c
-        @$(CC) -o ../bin/extractblocks extractblocks_new.c mystdlib.c
+../bin/extract_version_2: export/extract_version_2.c export/mystdlib.c
+        @$(CC) -O2 -o ../bin/extract_version_2 export/extract_version_2.c export/mystdlib.c -I export
 
-mapcoords: mapcoords.c mystdlib.c
-        @$(CC) -o ../bin/mapcoords mapcoords.c mystdlib.c
+../bin/split_version_2: export/split_version_2.c export/mystdlib.c
+        @$(CC) -o ../bin/split_version_2 export/split_version_2.c export/mystdlib.c -I export
 
-splitold: splitold.c mystdlib.c
-        @$(CC) -o ../bin/splitold splitold.c mystdlib.c
+../bin/map_coords: export/map_coords.c export/mystdlib.c
+        @$(CC) -o ../bin/map_coords export/map_coords.c export/mystdlib.c -I export
 
-convertcoords: convertcoords.c
-        @$(CC) -o ../bin/convertcoords convertcoords.c -lm
+../bin/convert_coords: export/convert_coords.c
+        @$(CC) -o ../bin/convert_coords export/convert_coords.c -lm
 
 clean:
-        @rm -f ../bin/{decompress,extractblocks,mapcoords,convertcoords,splitold}
+        @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() {
     fi
 
     # Compile all the binaries
-    make all
+    make binaries
 
     printf "Cleaning up old working directory ... "
     rm -rf ../work_`basename ${1#white_}`
@@ -29,18 +29,18 @@ main() {
     cd ../work_`basename ${1#white_}` || exit 1
 
     if [ -f "$1/phonebook.db" ]; then
-        handle_new_format $1
+        handle_format_version_3 $1
     elif [ -f $1/[Dd][Aa][Tt]/[Tt][Ee][Ii][Ll][Nn].[Dd][Aa][Tt] ]; then
-        handle_old_format $1
+        handle_format_version_2 $1
     else
         echo "Not a recognized Telefonbuch folder"
     fi
     cd ..
 }
 
-do_decompress_old() {
+do_decompress_version_2() {
     printf "Extracting $2 chunks ... "
-    extractblocks "${1}"
+    extract_version_2 "${1}"
     printf "done.\n"
 
     printf "Decompressing $2 chunks ... "
@@ -55,10 +55,10 @@ do_decompress_old() {
     printf "done.\n"
 }
 
-do_processfile_old() {
+do_processfile_version_2() {
     working_on=`basename ${1}`
     mkdir $working_on && cd ${working_on}
-    do_decompress_old "${1}" "${2}"
+    do_decompress_version_2 "${1}" "${2}"
     cd ..
 
     printf "Combining $2 into single file ... "
@@ -81,10 +81,10 @@ get_dword() {
     hexdump -n 4 -v -e '" " 1/4 "%u"' `printf %0${filename_len}d ${1}`
 }
 
-handle_old_format() {
+handle_format_version_2() {
     echo "Working on $1. Detected pre-2004 Telefonbuch version."
     # Extract teiln.dat
-    do_decompress_old $1/[Dd][Aa][Tt]/[Tt][Ee][Ii][Ll][Nn].[Dd][Aa][Tt] "teiln.dat"
+    do_decompress_version_2 $1/[Dd][Aa][Tt]/[Tt][Ee][Ii][Ll][Nn].[Dd][Aa][Tt] "teiln.dat"
 
     # See how long each filename is
     export filename_len=$(( `ls | head -n 1 | wc -c` - 1 ))
@@ -112,7 +112,7 @@ handle_old_format() {
 
     # Now loop over all files and dump them
     printf "Splitting decompressed nname chunks into their columns ... "
-    jot -w %0${filename_len}d - ${nname_file} $(( number_of_files - 1 )) 3 | splitold 1 1
+    jot -w %0${filename_len}d - ${nname_file} $(( number_of_files - 1 )) 3 | split_version_2 1 1
 #        set -- `hexdump -n 8 -v -e '" " 1/4 "%u"' ${file}`
 #        tail -c +$(( $2 + 1 )) ${file}
 #    done | tr '\n\0' '\t\n' > 01_02_Flags_Nachname
@@ -126,7 +126,7 @@ handle_old_format() {
     printf "done.\n"
 
     printf "Splitting decompress table file chunks into their columns ... "
-    jot -w %0${filename_len}d - ${table_file} $(( number_of_files - 1 )) 3 | splitold 4 0
+    jot -w %0${filename_len}d - ${table_file} $(( number_of_files - 1 )) 3 | split_version_2 4 0
 #    for file in `jot -w %0${filename_len}d - ${table_file} $(( number_of_files - 1 )) 3`; do
 #        # Offset into first table entry tells us how many
 #        # fields are in table file
@@ -162,7 +162,7 @@ handle_old_format() {
     # If street names come in an extra file, extract
     # street names first
     streets=$1/[Dd][Aa][Tt]/[Ss][Tt][Rr][Aa][Ss][Ss][Ee][Nn].[Dd][Aa][Tt]
-    [ -f ${streets} ] && do_processfile_old ${streets} "street name" 99_Strassenname convert_zeros
+    [ -f ${streets} ] && do_processfile_version_2 ${streets} "street name" 99_Strassenname convert_zeros
 
     # extract street names if 07_unknown contains street indexes
     # instead of street names
@@ -177,27 +177,27 @@ handle_old_format() {
 
     karto=$1/[Dd][Aa][Tt]/[Kk][Aa][Rr][Tt][Oo].[Dd][Aa][Tt]
     if [ -f ${karto} ]; then
-      do_processfile_old ${karto} "geo coordinates" 90_Geokoordinaten_hnr_raw
+      do_processfile_version_2 ${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
+      lam 10_Postleitzahl -s $'\t' 11_Ort -s $'\t' 07_Strasse -s $'\t' 08_Hausnummer | map_coords 90_Geokoordinaten_hnr | convert_coords > 16_Koordinaten
       printf "done.\n"
     fi
 }
 
-handle_new_format() {
+handle_format_version_3() {
     echo "Working on $1. Detected post-2003 Telefonbuch version."
     printf "Extracting street names ... "
-    decompress $1/streets.tl
+    extract_version_3 $1/streets.tl
 
     cat file_* | tr '\n\0' '\t\n' > 99_Strassenname
     rm file_*
     printf "done.\n"
 
     printf "Extracting phonebook.db ... "
-    decompress $1/phonebook.db
+    extract_version_3 $1/phonebook.db
 
     rows=`find . -name file_\* | wc -l`
     printf "done.\n"
@@ -237,19 +237,19 @@ handle_new_format() {
 
     if [ -f $1/zip-streets-hn-geo.tl ]; then
       printf "Extracting geo coordinates (precision: house number) ... "
-      decompress $1/zip-streets-hn-geo.tl
+      extract_version_3 $1/zip-streets-hn-geo.tl
       cat file_* > 90_Geokoordinaten_hnr
       printf "done.\n"
       printf "Looking up geo coordinates for each phonebook entry ... "
-      lam 10_Postleitzahl -s $'\t' 07_Strasse -s $'\t' 08_Hausnummer | mapcoords 90_Geokoordinaten_hnr | convertcoords > 16_Koordinaten
+      lam 10_Postleitzahl -s $'\t' 07_Strasse -s $'\t' 08_Hausnummer | map_coords 90_Geokoordinaten_hnr | convert_coords > 16_Koordinaten
       printf "done.\n"
     elif [ -f $1/zip-streets-geo.tl ]; then
       printf "Extracting geo coordinates (precision: street) ... "
-      decompress $1/zip-streets-geo.tl
+      extract_version_3 $1/zip-streets-geo.tl
       cat file_*  > 91_Geokoordinaten_str
       printf "done.\n"
       printf "Looking up geo coordinates for each phonebook entry ... "
-      lam 10_Postleitzahl -s $'\t' 07_Strasse | mapcoords 91_Geokoordinaten_str | convertcoords > 16_Koordinaten
+      lam 10_Postleitzahl -s $'\t' 07_Strasse | map_coords 91_Geokoordinaten_str | convert_coords > 16_Koordinaten
       printf "done.\n"
     fi
     rm file_*