/* This file is part of Pazpar2.
- Copyright (C) 2006-2009 Index Data
+ Copyright (C) 2006-2010 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
#include <assert.h>
#include <stdio.h>
#include <sys/types.h>
-#include "direntz.h"
+#include <yaz/dirent.h>
#include <stdlib.h>
#include <sys/stat.h>
#include <yaz/nmem.h>
#include <yaz/log.h>
-#include "pazpar2.h"
+#include "session.h"
#include "database.h"
#include "settings.h"
"pz:pqf_prefix",
"pz:sort",
"pz:recordfilter",
+ "pz:pqf_strftime",
+ "pz:negotiation_charset",
+ "pz:max_connections",
0
};
// 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
struct update_database_context context;
context.set = set;
context.service = service;
- predef_grep_databases(&context, service, 0, update_database);
+ predef_grep_databases(&context, service, update_database);
}
// This simply copies the 'hard' (application-specific) settings
// If target address is not wildcard, add the database
if (*set->target && !zurl_wildcard(set->target))
- find_database(set->target, 0, service);
+ find_database(set->target, service);
// Determine if we already have a dictionary entry
if (!strncmp(set->name, "pz:", 3) && (p = strchr(set->name + 3, ':')))