X-Git-Url: http://git.indexdata.com/?p=pazpar2-moved-to-github.git;a=blobdiff_plain;f=src%2Fdatabase.c;h=2064feebf2064c09228cb3bb9cc657f4c8511682;hp=df6f11aae57c3a1a7b631de91b763a318597f7f5;hb=HEAD;hpb=dedbc922fbe49e599466f41c618ba9ba8ddb9477 diff --git a/src/database.c b/src/database.c index df6f11a..2064fee 100644 --- a/src/database.c +++ b/src/database.c @@ -1,7 +1,5 @@ -/* $Id: database.c,v 1.23 2007-04-21 12:00:54 adam Exp $ - Copyright (c) 2006-2007, Index Data. - -This file is part of Pazpar2. +/* This file is part of Pazpar2. + Copyright (C) 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 @@ -14,157 +12,111 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with Pazpar2; see the file LICENSE. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. - */ +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + +#if HAVE_CONFIG_H +#include +#endif -#include -#include -#include -#include -#include #include #include #include +#include +#include -#include "pazpar2.h" -#include "config.h" +#include "ppmutex.h" +#include "session.h" +#include "pazpar2_config.h" #include "settings.h" #include "http.h" -#include "zeerex.h" +#include "database.h" #include -#include -#include -#include -static struct host *hosts = 0; // The hosts we know about -static struct database *databases = 0; // The databases we know about -static NMEM nmem = 0; +enum pazpar2_database_criterion_type { + PAZPAR2_STRING_MATCH, + PAZPAR2_SUBSTRING_MATCH +}; -static xmlDoc *get_explain_xml(const char *id) -{ - struct stat st; - char *dir; - char path[256]; - char ide[256]; - if (!config || !config->targetprofiles) - { - yaz_log(YLOG_WARN, "Config must be loaded and specify targetprofiles"); - return 0; - } - if (config->targetprofiles->type != Targetprofiles_local) - { - yaz_log(YLOG_FATAL, "Only supports local type"); - return 0; - } - dir = config->targetprofiles->src; - urlencode(id, ide); - sprintf(path, "%s/%s", dir, ide); - if (!stat(path, &st)) - return xmlParseFile(path); - else - return 0; -} +struct database_criterion_value { + char *value; + struct database_criterion_value *next; +}; -// Create a new host structure for hostport -static struct host *create_host(const char *hostport) -{ - struct host *host; - - host = xmalloc(sizeof(struct host)); - host->hostport = xstrdup(hostport); - host->connections = 0; - host->ipport = 0; - - if (host_getaddrinfo(host)) - { - xfree(host->hostport); - xfree(host); - return 0; - } - host->next = hosts; - hosts = host; - return host; -} +struct database_criterion { + char *name; + enum pazpar2_database_criterion_type type; + struct database_criterion_value *values; + struct database_criterion *next; +}; -static struct host *find_host(const char *hostport) +struct database *new_database(const char *id, NMEM nmem) { - struct host *p; - for (p = hosts; p; p = p->next) - if (!strcmp(p->hostport, hostport)) - return p; - return create_host(hostport); + return new_database_inherit_settings(id, nmem, 0); } - -static struct database *load_database(const char *id) +struct database *new_database_inherit_settings(const char *id, NMEM nmem, struct settings_array *service_settings) { - xmlDoc *doc = 0; - struct zr_explain *explain = 0; struct database *db; - struct host *host; - char hostport[256]; - char *dbname; - - yaz_log(YLOG_LOG, "New database: %s", id); - if (!nmem) - nmem = nmem_create(); + struct setting *idset; - if (config && config->targetprofiles - && (doc = get_explain_xml(id))) - { - explain = zr_read_xml(nmem, xmlDocGetRootElement(doc)); - if (!explain) - return 0; - } - - if (strlen(id) > 255) - return 0; - strcpy(hostport, id); - if ((dbname = strchr(hostport, '/'))) - *(dbname++) = '\0'; - else - dbname = "Default"; - if (!(host = find_host(hostport))) - return 0; db = nmem_malloc(nmem, sizeof(*db)); - memset(db, 0, sizeof(*db)); - db->host = host; - db->url = nmem_strdup(nmem, id); - db->databases = xmalloc(2 * sizeof(char *)); - db->databases[0] = nmem_strdup(nmem, dbname); - db->databases[1] = 0; - db->errors = 0; - db->explain = explain; - db->settings = 0; - db->next = databases; - databases = db; + db->id = nmem_strdup(nmem, id); + db->next = 0; + + if (service_settings && service_settings->num_settings > 0) { + yaz_log(YLOG_DEBUG, "copying settings from service to database %s settings", db->id); + db->num_settings = service_settings->num_settings; + db->settings = nmem_malloc(nmem, sizeof(*db->settings) * db->num_settings); + // Initialize database settings with service settings + memcpy(db->settings, service_settings->settings, sizeof(*db->settings) * db->num_settings); + } + else { + yaz_log(YLOG_DEBUG, "No service settings to database %s ", db->id); + db->num_settings = PZ_MAX_EOF; + db->settings = nmem_malloc(nmem, sizeof(*db->settings) * db->num_settings); + memset(db->settings, 0, sizeof(*db->settings) * db->num_settings); + } + idset = nmem_malloc(nmem, sizeof(*idset)); + idset->precedence = 0; + idset->name = "pz:id"; + idset->target = idset->value = db->id; + idset->next = db->settings[PZ_ID]; + db->settings[PZ_ID] = idset; return db; } // Return a database structure by ID. Load and add to list if necessary // new==1 just means we know it's not in the list -struct database *find_database(const char *id, int new) +struct database *create_database_for_service(const char *id, + struct conf_service *service) { struct database *p; - if (!new) - { - for (p = databases; p; p = p->next) - if (!strcmp(p->url, id)) - return p; - } - return load_database(id); + for (p = service->databases; p; p = p->next) + if (!strcmp(p->id, id)) + return p; + + yaz_log(YLOG_DEBUG, "new database %s under service %s", id, + service->id ? service->id : "null"); + p = new_database_inherit_settings(id, service->nmem, service->settings); + p->next = service->databases; + service->databases = p; + + return p; } -// This whole session_grep database thing should be moved to pazpar2.c +// This whole session_grep database thing should be moved elsewhere int match_zurl(const char *zurl, const char *pattern) { + int len; + if (!strcmp(pattern, "*")) return 1; - else if (!strncmp(pattern, "*/", 2)) + else if (!strncmp(pattern, "*/", 2)) // host wildcard.. what the heck is that for? { char *db = strchr(zurl, '/'); if (!db) @@ -174,6 +126,13 @@ int match_zurl(const char *zurl, const char *pattern) else return 0; } + else if (*(pattern + (len = strlen(pattern) - 1)) == '*') // db wildcard + { + if (!strncmp(pattern, zurl, len)) + return 1; + else + return 0; + } else if (!strcmp(pattern, zurl)) return 1; else @@ -181,9 +140,11 @@ int match_zurl(const char *zurl, const char *pattern) } // This will be generalized at some point -static int match_criterion(struct setting **settings, struct database_criterion *c) +static int match_criterion(struct setting **settings, + struct conf_service *service, + struct database_criterion *c) { - int offset = settings_offset(c->name); + int offset = settings_lookup_offset(service, c->name); struct database_criterion_value *v; if (offset < 0) @@ -195,14 +156,22 @@ static int match_criterion(struct setting **settings, struct database_criterion return 0; for (v = c->values; v; v = v->next) { - if (offset == PZ_ID) + if (c->type == PAZPAR2_STRING_MATCH) { - if (match_zurl(settings[offset]->value, v->value)) - break; + if (offset == PZ_ID) + { + if (match_zurl(settings[offset]->value, v->value)) + break; + } + else + { + if (!strcmp(settings[offset]->value, v->value)) + break; + } } - else + else if (c->type == PAZPAR2_SUBSTRING_MATCH) { - if (!strcmp(settings[offset]->value, v->value)) + if (strstr(settings[offset]->value, v->value)) break; } } @@ -212,10 +181,65 @@ static int match_criterion(struct setting **settings, struct database_criterion return 0; } -int database_match_criteria(struct setting **settings, struct database_criterion *cl) +// parses crit1=val1,crit2=val2|val3,... +static struct database_criterion *create_database_criterion(NMEM m, + const char *buf) +{ + struct database_criterion *res = 0; + char **values; + int num; + int i; + + if (!buf || !*buf) + return 0; + nmem_strsplit(m, ",", buf, &values, &num); + for (i = 0; i < num; i++) + { + char **subvalues; + int subnum; + int subi; + struct database_criterion *new = nmem_malloc(m, sizeof(*new)); + char *eq; + for (eq = values[i]; *eq; eq++) + if (*eq == '=') + { + new->type = PAZPAR2_STRING_MATCH; + break; + } + else if (*eq == '~') + { + new->type = PAZPAR2_SUBSTRING_MATCH; + break; + } + if (!*eq) + { + yaz_log(YLOG_WARN, "Missing equal-sign/tilde in filter"); + return 0; + } + *(eq++) = '\0'; + new->name = values[i]; + nmem_strsplit(m, "|", eq, &subvalues, &subnum); + new->values = 0; + for (subi = 0; subi < subnum; subi++) + { + struct database_criterion_value *newv + = nmem_malloc(m, sizeof(*newv)); + newv->value = subvalues[subi]; + newv->next = new->values; + new->values = newv; + } + new->next = res; + res = new; + } + return res; +} + +static int database_match_criteria(struct setting **settings, + struct conf_service *service, + struct database_criterion *cl) { for (; cl; cl = cl->next) - if (!match_criterion(settings, cl)) + if (!match_criterion(settings, service, cl)) break; if (cl) // one of the criteria failed to match -- skip this db return 0; @@ -225,33 +249,38 @@ int database_match_criteria(struct setting **settings, struct database_criterion // Cycles through databases, calling a handler function on the ones for // which all criteria matched. -int session_grep_databases(struct session *se, struct database_criterion *cl, - void (*fun)(void *context, struct session_database *db)) +int session_grep_databases(struct session *se, const char *filter, + void (*fun)(struct session *se, struct session_database *db)) { struct session_database *p; + NMEM nmem = nmem_create(); int i = 0; + struct database_criterion *cl = create_database_criterion(nmem, filter); for (p = se->databases; p; p = p->next) { if (p->settings && p->settings[PZ_ALLOW] && *p->settings[PZ_ALLOW]->value == '0') continue; - if (database_match_criteria(p->settings, cl)) + if (!p->settings[PZ_NAME]) + continue; + if (database_match_criteria(p->settings, se->service, cl)) { (*fun)(se, p); i++; } } + nmem_destroy(nmem); return i; } -int grep_databases(void *context, struct database_criterion *cl, - void (*fun)(void *context, struct database *db)) +int predef_grep_databases(void *context, struct conf_service *service, + void (*fun)(void *context, struct database *db)) { struct database *p; int i = 0; - for (p = databases; p; p = p->next) - if (database_match_criteria(p->settings, cl)) + for (p = service->databases; p; p = p->next) + if (database_match_criteria(p->settings, service, 0)) { (*fun)(context, p); i++; @@ -259,45 +288,12 @@ int grep_databases(void *context, struct database_criterion *cl, return i; } -// This function will most likely vanish when a proper target profile mechanism is -// introduced. -void load_simpletargets(const char *fn) -{ - FILE *f = fopen(fn, "r"); - char line[256]; - - if (!f) - { - yaz_log(YLOG_WARN|YLOG_ERRNO, "open %s", fn); - exit(1); - } - - while (fgets(line, 255, f)) - { - char *url; - char *name; - struct database *db; - - if (strncmp(line, "target ", 7)) - continue; - line[strlen(line) - 1] = '\0'; - - if ((name = strchr(line, ';'))) - *(name++) = '\0'; - - url = line + 7; - - if (!(db = find_database(url, 0))) - yaz_log(YLOG_WARN, "Unable to load database %s", url); - } - fclose(f); -} - - /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab */ +