2 files changed, 13 insertions, 10 deletions

diff --git a/src/postprocess/merge_entries.c b/src/postprocess/merge_entries.c
index f248a3f..0b35fc4 100644
--- a/src/postprocess/merge_entries.c
+++ b/src/postprocess/merge_entries.c
@@ -225,7 +225,7 @@ int main(int argc, char **args) {
   entry_t * sort_array;
   int outoff = 0, lines = COLUMNS;
   unsigned long current = 0, i, flag;
-  __uint128_t year_list = 0, revflag_list = 0, bizflag_list = 0;
+  __uint128_t year_list = 0, revflag_list = 0, bizflag_list = 0, one = 1;
 
   if (argc != 2) exit(1);
   tbuch = map_file(args[1], 1);
@@ -278,9 +278,9 @@ int main(int argc, char **args) {
   qsort(sort_array, current, sizeof(entry_t), sort_me);
 
   for (i=0; i<current; ++i) {
-    year_list |= 1LL << sort_array[i].year;
-    if (sort_array[i].flag & 0x80 ) bizflag_list |= 1LL << sort_array[i].year;
-    if (sort_array[i].flag & 0x40 ) revflag_list |= 1LL << sort_array[i].year;
+    year_list |= one << sort_array[i].year;
+    if (sort_array[i].flag & 0x80 ) bizflag_list |= one << sort_array[i].year;
+    if (sort_array[i].flag & 0x40 ) revflag_list |= one << sort_array[i].year;
 
     if ((i == current - 1) || compare_entries(sort_array+i, sort_array+i+1)) {
       // printf("%" PRIu64 "\t%" PRIu64 "\t%" PRIu64 "\t", year_list, bizflag_list, revflag_list);
diff --git a/src/postprocess/postgres.sql b/src/postprocess/postgres.sql
index 3c891d4..ec42a22 100644
--- a/src/postprocess/postgres.sql
+++ b/src/postprocess/postgres.sql
@@ -1,10 +1,16 @@
 \timing on
 
+CREATE EXTENSION IF NOT EXISTS pg_trgm;
+CREATE EXTENSION IF NOT EXISTS btree_gin;
+
+-- # Clean up the old ones
+DROP TABLE IF EXISTS Telefonbuch, table_nachname, table_vorname, table_zusaetze, table_strasse, table_hausnummer, table_zip, table_ort, table_verweise, table_vorwahl, table_rufnummer, table_web, table_email;
+
 CREATE TABLE telefonbuch (
     id SERIAL PRIMARY KEY,
-    presence_flag bigint,
-    reverse_flag bigint,
-    biz_flag bigint,
+    presence_flag int4multirange,
+    reverse_flag int4multirange,
+    biz_flag int4multirange,
     zip character varying(64)[] DEFAULT '{}',
     nachname character varying(256)[] DEFAULT '{}',
     vorname character varying(192)[] DEFAULT '{}',
@@ -22,9 +28,6 @@ CREATE TABLE telefonbuch (
 
 COPY Telefonbuch ( presence_flag, reverse_flag, biz_flag, zip, nachname, vorname, zusaetze, strasse, hausnummer, verweise, ort, vorwahl, rufnummer, web, email, coords ) FROM '/Users/erdgeist/Coding/Telefonbuch/work/telefonbuch.txt' WITH NULL AS '';
 
--- # Clean up the old ones
-DROP TABLE IF EXISTS table_nachname, table_vorname, table_zusaetze, table_strasse, table_hausnummer, table_zip, table_ort, table_verweise, table_vorwahl, table_rufnummer, table_web, table_email;
-
 -- # tables we use for indexing
 CREATE TABLE table_nachname   ( telefonbuch_id integer, offs integer, value text);
 CREATE TABLE table_vorname    ( telefonbuch_id integer, offs integer, value text);