diff options
Diffstat (limited to 'src/postprocess/merge_entries.c')
-rw-r--r-- | src/postprocess/merge_entries.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/postprocess/merge_entries.c b/src/postprocess/merge_entries.c index f9ee67d..1dd7d50 100644 --- a/src/postprocess/merge_entries.c +++ b/src/postprocess/merge_entries.c | |||
@@ -148,9 +148,10 @@ static int sort_me(const void *f_a, const void *f_b) { | |||
148 | outvec_t *oa_row = oa + row * COLUMNS; | 148 | outvec_t *oa_row = oa + row * COLUMNS; |
149 | outvec_t *ob_row = ob + row * COLUMNS; | 149 | outvec_t *ob_row = ob + row * COLUMNS; |
150 | 150 | ||
151 | if ((res = STRCMP_n(oa_row[ 2].ptr, ob_row[ 2].ptr))) return res; /* PLZ */ | ||
152 | if ((res = STRCMP_n(oa_row[ 9].ptr, ob_row[ 9].ptr))) return res; /* Ort */ | ||
151 | if ((res = STRCMP_n(oa_row[10].ptr, ob_row[10].ptr))) return res; /* Vorwahl */ | 153 | if ((res = STRCMP_n(oa_row[10].ptr, ob_row[10].ptr))) return res; /* Vorwahl */ |
152 | if ((res = STRCMP_n(oa_row[11].ptr, ob_row[11].ptr))) return res; /* Rufnummer */ | 154 | if ((res = STRCMP_n(oa_row[11].ptr, ob_row[11].ptr))) return res; /* Rufnummer */ |
153 | if ((res = STRCMP_n(oa_row[ 2].ptr, ob_row[ 2].ptr))) return res; /* PLZ */ | ||
154 | if ((res = STRCMP_n(oa_row[ 6].ptr, ob_row[ 6].ptr))) return res; /* Strasse */ | 155 | if ((res = STRCMP_n(oa_row[ 6].ptr, ob_row[ 6].ptr))) return res; /* Strasse */ |
155 | if ((res = STRCMP_n(oa_row[ 7].ptr, ob_row[ 7].ptr))) return res; /* Hausnummer */ | 156 | if ((res = STRCMP_n(oa_row[ 7].ptr, ob_row[ 7].ptr))) return res; /* Hausnummer */ |
156 | if ((res = STRCMP_n(oa_row[ 3].ptr, ob_row[ 3].ptr))) return res; /* Nachname */ | 157 | if ((res = STRCMP_n(oa_row[ 3].ptr, ob_row[ 3].ptr))) return res; /* Nachname */ |
@@ -200,7 +201,7 @@ int main(int argc, char **args) { | |||
200 | unsigned long current = 0, i, flag; | 201 | unsigned long current = 0, i, flag; |
201 | uint64_t year_list = 0, revflag_list = 0, bizflag_list = 0; | 202 | uint64_t year_list = 0, revflag_list = 0, bizflag_list = 0; |
202 | 203 | ||
203 | if (argc != 1) exit(1); | 204 | if (argc != 2) exit(1); |
204 | tbuch = map_file(args[1], 1); | 205 | tbuch = map_file(args[1], 1); |
205 | 206 | ||
206 | /* Estimate upper bound for amount of lines */ | 207 | /* Estimate upper bound for amount of lines */ |