X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=src%2Flogic.c;h=959dc3d2e9341fe9fff5c7dd5f6442b6cd7c721d;hb=bcaec360ed6f6746e122d3dd0681d0f29dd558c3;hp=f54b3039f30dca47650056213deb91b47b2d179f;hpb=badc6391cc7169540e1a063a311adf3c649a6360;p=pazpar2-moved-to-github.git

diff --git a/src/logic.c b/src/logic.c
index f54b303..959dc3d 100644
--- a/src/logic.c
+++ b/src/logic.c
@@ -1,4 +1,4 @@
-/* $Id: logic.c,v 1.29 2007-05-16 17:16:21 quinn Exp $
+/* $Id: logic.c,v 1.33 2007-05-24 10:57:38 adam Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -82,7 +82,8 @@ struct parameters global_parameters =
     "",
     "",
     0,
-    0,
+    0, /* dump_records */
+    0, /* debug_mode */
     30,
     "81",
     "Index Data PazPar2",
@@ -493,7 +494,16 @@ static void session_init_databases_fun(void *context, struct database *db)
 
     new->database = db;
     new->yaz_marc = 0;
-    new->pct = pp2_charset_create();
+    
+#ifdef HAVE_ICU
+    if (global_parameters.server && global_parameters.server->icu_chn)
+        new->pct = pp2_charset_create(global_parameters.server->icu_chn);
+    else
+        new->pct = pp2_charset_create(0);
+#else // HAVE_ICU
+    new->pct = pp2_charset_create(0);
+#endif // HAVE_ICU
+
     new->map = 0;
     new->settings 
         = nmem_malloc(se->session_nmem, sizeof(struct settings *) * num);
@@ -566,11 +576,12 @@ void session_apply_setting(struct session *se, char *dbname, char *setting,
         yaz_log(YLOG_WARN, "Unknown setting %s", setting);
         return;
     }
-    if (offset == PZ_ID)
+    // Jakub: This breaks the filter setting.
+    /*if (offset == PZ_ID)
     {
         yaz_log(YLOG_WARN, "No need to set pz:id setting. Ignoring");
         return;
-    }
+    }*/
     new->precedence = 0;
     new->target = dbname;
     new->name = setting;