From eee51a2aad552b76fc37817065d9beeb57a196c2 Mon Sep 17 00:00:00 2001 From: Sebastian Hammer Date: Thu, 29 Mar 2007 13:44:38 +0000 Subject: [PATCH] Added settings --- src/database.c | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/src/database.c b/src/database.c index 5ee51bb..dea337b 100644 --- a/src/database.c +++ b/src/database.c @@ -1,4 +1,4 @@ -/* $Id: database.c,v 1.4 2007-03-23 03:26:22 quinn Exp $ */ +/* $Id: database.c,v 1.5 2007-03-29 13:44:38 quinn Exp $ */ #include #include @@ -6,6 +6,8 @@ #include #include #include +#include +#include #include "pazpar2.h" #include "config.h" @@ -43,6 +45,7 @@ static struct conf_queryprofile *database_queryprofile(const char *id) static xmlDoc *get_explain_xml(const char *id) { + struct stat st; char *dir; char path[256]; char ide[256]; @@ -59,8 +62,10 @@ static xmlDoc *get_explain_xml(const char *id) dir = config->targetprofiles->src; urlencode(id, ide); sprintf(path, "%s/%s", dir, ide); - yaz_log(YLOG_LOG, "Path: %s", path); - return xmlParseFile(path); + if (!stat(path, &st)) + return xmlParseFile(path); + else + return 0; } // Create a new host structure for hostport @@ -165,6 +170,7 @@ static struct database *load_database(const char *id) db->explain = explain; db->qprofile = query; db->rprofile = retrieval; + db->settings = 0; db->next = databases; databases = db; @@ -185,6 +191,26 @@ struct database *find_database(const char *id, int new) return load_database(id); } +static int match_zurl(const char *zurl, const char *pattern) +{ + if (!strcmp(pattern, "*")) + return 1; + else if (!strncmp(pattern, "*/", 2)) + { + char *db = strchr(zurl, '/'); + if (!db) + return 0; + if (!strcmp(pattern + 2, db)) + return 1; + else + return 0; + } + else if (!strcmp(pattern, zurl)) + return 1; + else + return 0; +} + // This will be generalized at some point static int match_criterion(struct database *db, struct database_criterion *c) { @@ -192,7 +218,7 @@ static int match_criterion(struct database *db, struct database_criterion *c) { struct database_criterion_value *v; for (v = c->values; v; v = v->next) - if (!strcmp(v->value, db->url)) + if (match_zurl(db->url, v->value)) return 1; return 0; } -- 1.7.10.4