X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fsettings.c;h=1355dc15007a37711d8dedae6da86c93bebd35f0;hb=8432e60d3fa90e5bb4abf49607fdeca3fa8a19ba;hp=55cd5122c481f5ffcd5ff4cefed5ac6f709bd1fd;hpb=837ce54389667b8c40b2961dd76403e932b6bd92;p=pazpar2-moved-to-github.git

diff --git a/src/settings.c b/src/settings.c
index 55cd512..1355dc1 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2009 Index Data
+   Copyright (C) 2006-2011 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <assert.h>
 #include <stdio.h>
 #include <sys/types.h>
-#include "direntz.h"
+#include <yaz/dirent.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 
@@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/nmem.h>
 #include <yaz/log.h>
 
-#include "pazpar2.h"
+#include "session.h"
 #include "database.h"
 #include "settings.h"
 
@@ -67,6 +67,16 @@ static char *hard_settings[] = {
     "pz:pqf_prefix",
     "pz:sort",
     "pz:recordfilter",
+    "pz:pqf_strftime",
+    "pz:negotiation_charset",
+    "pz:max_connections",
+    "pz:reuse_connections",     /* PZ_REUSE_CONNECTION    */
+    "pz:termlist_term_sort",    /* PZ_TERMLIST_TERM_SORT  */
+    "pz:termlist_term_count",   /* PZ_TERMLIST_TERM_COUNT */
+    "pz:termlist_term_factor",  /* PZ_TERMLIST_TERM_FACTOR*/
+    "pz:preferred",             /* PZ_PREFERRED           */
+    "pz:extra_args",            /* PZ_EXTRA_ARGS          */
+    "pz:query_syntax",          /* PZ_QUERY_SYNTAX        */
     0
 };
 
@@ -362,7 +372,7 @@ static void update_database(void *context, struct database *db)
                 // target-specific value trumps wildcard. Delete.
                 *sp = (*sp)->next; // unlink.....
             }
-            else if (!zurl_wildcard((*sp)->target))
+            else if (zurl_wildcard((*sp)->target) < zurl_wildcard(set->target))
                 // Db already contains higher-priority setting. Abort search
                 break;
             else