X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fdatabase.c;h=a23c6fdb71728c9336a7741c2bf7d1e59ec43eb0;hb=f95af5f630afa6c21b945651d864b1c86030a796;hp=3a987ea89b64a6bcd70e33dad5b7cc685c63a3b9;hpb=9a660575bb51d190608e5cdec416bb8a9acf3389;p=pazpar2-moved-to-github.git diff --git a/src/database.c b/src/database.c index 3a987ea..a23c6fd 100644 --- a/src/database.c +++ b/src/database.c @@ -1,238 +1,300 @@ -/* $Id: database.c,v 1.1 2007-03-15 16:55:34 quinn Exp $ */ +/* 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 +Software Foundation; either version 2, or (at your option) any later +version. + +Pazpar2 is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +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 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 "host.h" +#include "pazpar2_config.h" +#include "settings.h" #include "http.h" -#include "zeerex.h" +#include "database.h" -static struct host *hosts = 0; // The hosts we know about -static struct database *databases = 0; // The databases we know about -static NMEM nmem = 0; +#include -// This needs to be extended with selection criteria -static struct conf_retrievalprofile *database_retrievalprofile(const char *id) -{ - if (!config) - { - yaz_log(YLOG_FATAL, "Must load configuration (-f)"); - exit(1); - } - if (!config->retrievalprofiles) - { - yaz_log(YLOG_FATAL, "No retrieval profiles defined"); - } - return config->retrievalprofiles; -} +enum pazpar2_database_criterion_type { + PAZPAR2_STRING_MATCH, + PAZPAR2_SUBSTRING_MATCH +}; + +struct database_criterion_value { + char *value; + struct database_criterion_value *next; +}; + +struct database_criterion { + char *name; + enum pazpar2_database_criterion_type type; + struct database_criterion_value *values; + struct database_criterion *next; +}; -static struct conf_queryprofile *database_queryprofile(const char *id) +struct database *new_database(const char *id, NMEM nmem) { - return (struct conf_queryprofile*) 1; + return new_database_inherit_settings(id, nmem, 0); } - -static xmlDoc *get_explain_xml(const char *id) +struct database *new_database_inherit_settings(const char *id, NMEM nmem, struct settings_array *service_settings) { - 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; + struct database *db; + struct setting *idset; + + db = nmem_malloc(nmem, sizeof(*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); } - if (config->targetprofiles->type != Targetprofiles_local) - { - yaz_log(YLOG_FATAL, "Only supports local type"); - return 0; + 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); } - dir = config->targetprofiles->src; - urlencode(id, ide); - sprintf(path, "%s/%s", dir, ide); - yaz_log(YLOG_LOG, "Path: %s", path); - return xmlParseFile(path); -} + 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; -// Create a new host structure for hostport -static struct host *create_host(const char *hostport) -{ - struct addrinfo *addrinfo, hints; - struct host *host; - char *port; - char ipport[128]; - unsigned char addrbuf[4]; - int res; - - host = xmalloc(sizeof(struct host)); - host->hostport = xstrdup(hostport); - host->connections = 0; - - if ((port = strchr(hostport, ':'))) - *(port++) = '\0'; - else - port = "210"; - - hints.ai_flags = 0; - hints.ai_family = PF_INET; - hints.ai_socktype = SOCK_STREAM; - hints.ai_protocol = IPPROTO_TCP; - hints.ai_addrlen = 0; - hints.ai_addr = 0; - hints.ai_canonname = 0; - hints.ai_next = 0; - // This is not robust code. It assumes that getaddrinfo always - // returns AF_INET address. - if ((res = getaddrinfo(hostport, port, &hints, &addrinfo))) - { - yaz_log(YLOG_WARN, "Failed to resolve %s: %s", hostport, gai_strerror(res)); - xfree(host->hostport); - xfree(host); - return 0; - } - assert(addrinfo->ai_family == PF_INET); - memcpy(addrbuf, &((struct sockaddr_in*)addrinfo->ai_addr)->sin_addr.s_addr, 4); - sprintf(ipport, "%u.%u.%u.%u:%s", - addrbuf[0], addrbuf[1], addrbuf[2], addrbuf[3], port); - host->ipport = xstrdup(ipport); - freeaddrinfo(addrinfo); - host->next = hosts; - hosts = host; - return host; + return db; } -static struct host *find_host(const char *hostport) +// 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 *create_database_for_service(const char *id, + struct conf_service *service) { - struct host *p; - for (p = hosts; p; p = p->next) - if (!strcmp(p->hostport, hostport)) + struct database *p; + for (p = service->databases; p; p = p->next) + if (!strcmp(p->id, id)) return p; - return create_host(hostport); + + 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; } -static struct database *load_database(const char *id) +// This whole session_grep database thing should be moved elsewhere + +int match_zurl(const char *zurl, const char *pattern) { - xmlDoc *doc = get_explain_xml(id); - struct zr_explain *explain; - struct conf_retrievalprofile *retrieval; - struct conf_queryprofile *query; - struct database *db; - struct host *host; - char hostport[256]; - char *dbname; + int len; - if (!nmem) - nmem = nmem_create(); - if (doc) + if (!strcmp(pattern, "*")) + return 1; + else if (!strncmp(pattern, "*/", 2)) // host wildcard.. what the heck is that for? { - explain = zr_read_xml(nmem, xmlDocGetRootElement(doc)); - if (!explain) + char *db = strchr(zurl, '/'); + if (!db) + return 0; + if (!strcmp(pattern + 2, db)) + return 1; + else return 0; } - if (!(retrieval = database_retrievalprofile(id)) || - !(query = database_queryprofile(id))) + else if (*(pattern + (len = strlen(pattern) - 1)) == '*') // db wildcard { - xmlFree(doc); - return 0; + if (!strncmp(pattern, zurl, len)) + return 1; + else + return 0; } - if (strlen(id) > 255) - return 0; - strcpy(hostport, id); - if ((dbname = strchr(hostport, '/'))) - *(dbname++) = '\0'; + else if (!strcmp(pattern, zurl)) + return 1; 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->name = dbname; - db->databases = xmalloc(2 * sizeof(char *)); - db->databases[0] = nmem_strdup(nmem, dbname); - db->databases[1] = 0; - db->errors = 0; - db->explain = explain; - db->qprofile = query; - db->rprofile = retrieval; - db->next = databases; - databases = db; - - 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) +// This will be generalized at some point +static int match_criterion(struct setting **settings, + struct conf_service *service, + struct database_criterion *c) { - struct database *p; - if (!new) + int offset = settings_lookup_offset(service, c->name); + struct database_criterion_value *v; + + if (offset < 0) { - for (p = databases; p; p = p->next) - if (!strcmp(p->url, id)) - return p; + yaz_log(YLOG_WARN, "Criterion not found: %s", c->name); + return 0; } - return load_database(id); + if (!settings[offset]) + return 0; + for (v = c->values; v; v = v->next) + { + if (c->type == PAZPAR2_STRING_MATCH) + { + if (offset == PZ_ID) + { + if (match_zurl(settings[offset]->value, v->value)) + break; + } + else + { + if (!strcmp(settings[offset]->value, v->value)) + break; + } + } + else if (c->type == PAZPAR2_SUBSTRING_MATCH) + { + if (strstr(settings[offset]->value, v->value)) + break; + } + } + if (v) + return 1; + else + return 0; } -// Needs to be extended with criteria -// Cycles through databases, calling a handler function on each. -int grep_databases(void *context, void (*fun)(void *context, struct database *db)) +// parses crit1=val1,crit2=val2|val3,... +static struct database_criterion *create_database_criterion(NMEM m, + const char *buf) { - struct database *p; + struct database_criterion *res = 0; + char **values; + int num; int i; - for (p = databases; p; p = p->next) + if (!buf || !*buf) + return 0; + nmem_strsplit(m, ",", buf, &values, &num); + for (i = 0; i < num; i++) { - (*fun)(context, p); - 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 i; + return res; } -// This function will most likely vanish when a proper target profile mechanism is -// introduced. -void load_simpletargets(const char *fn) +static int database_match_criteria(struct setting **settings, + struct conf_service *service, + struct database_criterion *cl) { - FILE *f = fopen(fn, "r"); - char line[256]; + for (; cl; cl = cl->next) + if (!match_criterion(settings, service, cl)) + break; + if (cl) // one of the criteria failed to match -- skip this db + return 0; + else + return 1; +} - if (!f) - { - yaz_log(YLOG_WARN|YLOG_ERRNO, "open %s", fn); - exit(1); - } +// Cycles through databases, calling a handler function on the ones for +// which all criteria matched. +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); - while (fgets(line, 255, f)) + for (p = se->databases; p; p = p->next) { - char *url; - char *name; - - if (strncmp(line, "target ", 7)) + if (p->settings && p->settings[PZ_ALLOW] && *p->settings[PZ_ALLOW]->value == '0') continue; - line[strlen(line) - 1] = '\0'; - - if ((name = strchr(line, ';'))) - *(name++) = '\0'; - - url = line + 7; - - if (!find_database(url, 0)) - yaz_log(YLOG_WARN, "Unable to load database %s", url); + if (!p->settings[PZ_NAME]) + continue; + if (database_match_criteria(p->settings, se->service, cl)) + { + (*fun)(se, p); + i++; + } } - fclose(f); + nmem_destroy(nmem); + return i; } +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 = service->databases; p; p = p->next) + if (database_match_criteria(p->settings, service, 0)) + { + (*fun)(context, p); + i++; + } + return i; +} /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab */ +