X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fdatabase.c;h=e030ecc0319aa2525dc12b9e2c3966f79a94f5b5;hb=3fe9b28933e296a503a713f92a30a5c75e267272;hp=3a987ea89b64a6bcd70e33dad5b7cc685c63a3b9;hpb=9a660575bb51d190608e5cdec416bb8a9acf3389;p=pazpar2-moved-to-github.git diff --git a/src/database.c b/src/database.c index 3a987ea..e030ecc 100644 --- a/src/database.c +++ b/src/database.c @@ -1,105 +1,89 @@ -/* $Id: database.c,v 1.1 2007-03-15 16:55:34 quinn Exp $ */ +/* This file is part of Pazpar2. + Copyright (C) 2006-2009 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 "pazpar2.h" -#include "config.h" +#include "host.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; - -// 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; -} +#include +#if HAVE_SYS_SOCKET_H +#include +#endif +#if HAVE_NETDB_H +#include +#endif +#if HAVE_NETINET_IN_H +#include +#endif -static struct conf_queryprofile *database_queryprofile(const char *id) -{ - return (struct conf_queryprofile*) 1; -} +static struct host *hosts = 0; /* thread pr */ -static xmlDoc *get_explain_xml(const char *id) +static xmlDoc *get_explain_xml(struct conf_targetprofiles *targetprofiles, + 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) + if (targetprofiles->type != Targetprofiles_local) { yaz_log(YLOG_FATAL, "Only supports local type"); return 0; } - dir = config->targetprofiles->src; + dir = 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 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; + host->ipport = 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))) + if (host_getaddrinfo(host)) { - 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; @@ -114,125 +98,223 @@ static struct host *find_host(const char *hostport) return create_host(hostport); } -static struct database *load_database(const char *id) +int resolve_database(struct database *db) +{ + if (db->host == 0) + { + struct host *host; + char *p; + char hostport[256]; + strcpy(hostport, db->url); + if ((p = strchr(hostport, '/'))) + *p = '\0'; + if (!(host = find_host(hostport))) + return -1; + db->host = host; + } + return 0; +} + +void resolve_databases(struct conf_service *service) +{ + struct database *db = service->databases; + for (; db; db = db->next) + resolve_database(db); +} + +static struct database *load_database(const char *id, + struct conf_service *service) { - xmlDoc *doc = get_explain_xml(id); - struct zr_explain *explain; - struct conf_retrievalprofile *retrieval; - struct conf_queryprofile *query; + xmlDoc *doc = 0; + struct zr_explain *explain = 0; struct database *db; - struct host *host; char hostport[256]; char *dbname; + struct setting *idset; + + yaz_log(YLOG_LOG, "New database: %s", id); - if (!nmem) - nmem = nmem_create(); - if (doc) + if (service->targetprofiles + && (doc = get_explain_xml(service->targetprofiles, id))) { - explain = zr_read_xml(nmem, xmlDocGetRootElement(doc)); + explain = zr_read_xml(service->nmem, xmlDocGetRootElement(doc)); if (!explain) return 0; } - if (!(retrieval = database_retrievalprofile(id)) || - !(query = database_queryprofile(id))) - { - xmlFree(doc); - 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)); + dbname = ""; + db = nmem_malloc(service->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->host = 0; + db->url = nmem_strdup(service->nmem, id); + db->databases = nmem_malloc(service->nmem, 2 * sizeof(char *)); + db->databases[0] = nmem_strdup(service->nmem, dbname); db->databases[1] = 0; db->errors = 0; db->explain = explain; - db->qprofile = query; - db->rprofile = retrieval; - db->next = databases; - databases = db; + + db->settings = 0; + + db->settings = nmem_malloc(service->nmem, sizeof(struct settings*) * + settings_num(service)); + memset(db->settings, 0, sizeof(struct settings*) * settings_num(service)); + idset = nmem_malloc(service->nmem, sizeof(*idset)); + idset->precedence = 0; + idset->name = "pz:id"; + idset->target = idset->value = db->url; + idset->next = 0; + db->settings[PZ_ID] = idset; + + db->next = service->databases; + service->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) +struct database *find_database(const char *id, int new, + struct conf_service *service) { struct database *p; if (!new) { - for (p = databases; p; p = p->next) + for (p = service->databases; p; p = p->next) if (!strcmp(p->url, id)) return p; } - return load_database(id); + return load_database(id, service); } -// 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)) +// This whole session_grep database thing should be moved elsewhere + +int match_zurl(const char *zurl, const char *pattern) { - struct database *p; - int i; + int len; - for (p = databases; p; p = p->next) + if (!strcmp(pattern, "*")) + return 1; + else if (!strncmp(pattern, "*/", 2)) // host wildcard.. what the heck is that for? { - (*fun)(context, p); - i++; + char *db = strchr(zurl, '/'); + if (!db) + return 0; + if (!strcmp(pattern + 2, db)) + return 1; + else + return 0; } - return i; + else if (*(pattern + (len = strlen(pattern) - 1)) == '*') // db wildcard + { + if (!strncmp(pattern, zurl, len)) + return 1; + else + return 2; + } + else if (!strcmp(pattern, zurl)) + return 1; + else + return 0; } -// This function will most likely vanish when a proper target profile mechanism is -// introduced. -void load_simpletargets(const char *fn) +// This will be generalized at some point +static int match_criterion(struct setting **settings, + struct conf_service *service, + struct database_criterion *c) { - FILE *f = fopen(fn, "r"); - char line[256]; + int offset = settings_offset(service, c->name); + struct database_criterion_value *v; - if (!f) + if (offset < 0) { - yaz_log(YLOG_WARN|YLOG_ERRNO, "open %s", fn); - exit(1); + yaz_log(YLOG_WARN, "Criterion not found: %s", c->name); + return 0; } - - while (fgets(line, 255, f)) + if (!settings[offset]) + return 0; + for (v = c->values; v; v = v->next) { - char *url; - char *name; - - if (strncmp(line, "target ", 7)) - continue; - line[strlen(line) - 1] = '\0'; + if (offset == PZ_ID) + { + if (match_zurl(settings[offset]->value, v->value)) + break; + } + else + { + if (!strcmp(settings[offset]->value, v->value)) + break; + } + } + if (v) + return 1; + else + return 0; +} - if ((name = strchr(line, ';'))) - *(name++) = '\0'; +int database_match_criteria(struct setting **settings, + struct conf_service *service, + struct database_criterion *cl) +{ + 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; +} - url = line + 7; +// 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)) +{ + struct session_database *p; + int i = 0; - if (!find_database(url, 0)) - yaz_log(YLOG_WARN, "Unable to load database %s", url); + for (p = se->databases; p; p = p->next) + { + if (p->settings && p->settings[PZ_ALLOW] && *p->settings[PZ_ALLOW]->value == '0') + continue; + if (!p->settings[PZ_NAME]) + continue; + if (database_match_criteria(p->settings, se->service, cl)) + { + (*fun)(se, p); + i++; + } } - fclose(f); + return i; } +int predef_grep_databases(void *context, struct conf_service *service, + struct database_criterion *cl, + 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, cl)) + { + (*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 */ +