X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fdatabase.c;h=90697916baade13ba875e618b41fc7324a64a373;hb=18701a2fcad5171b03a76ceda18702831eb90850;hp=95703e0d97a908befc5996b3742b0df86b6b955e;hpb=cee23067d339c169320af0e4ed7cb348ac95b247;p=pazpar2-moved-to-github.git diff --git a/src/database.c b/src/database.c index 95703e0..9069791 100644 --- a/src/database.c +++ b/src/database.c @@ -1,4 +1,25 @@ -/* $Id: database.c,v 1.6 2007-03-30 02:45:07 quinn Exp $ */ +/* This file is part of Pazpar2. + Copyright (C) 2006-2008 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 @@ -10,39 +31,26 @@ #include #include "pazpar2.h" -#include "config.h" +#include "host.h" +#include "settings.h" #include "http.h" #include "zeerex.h" #include +#if HAVE_SYS_SOCKET_H #include +#endif +#if HAVE_NETDB_H #include +#endif +#if HAVE_NETINET_IN_H #include +#endif 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; -} - -static struct conf_queryprofile *database_queryprofile(const char *id) -{ - return (struct conf_queryprofile*) 1; -} - static xmlDoc *get_explain_xml(const char *id) { struct stat st; @@ -71,45 +79,19 @@ static xmlDoc *get_explain_xml(const char *id) // 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; @@ -126,27 +108,26 @@ static struct host *find_host(const char *hostport) static struct database *load_database(const char *id) { - xmlDoc *doc = get_explain_xml(id); + xmlDoc *doc = 0; struct zr_explain *explain = 0; - struct conf_retrievalprofile *retrieval; 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 (config && config->targetprofiles + && (doc = get_explain_xml(id))) { explain = zr_read_xml(nmem, xmlDocGetRootElement(doc)); if (!explain) return 0; } - if (!(retrieval = database_retrievalprofile(id))) - { - xmlFree(doc); - return 0; - } + if (strlen(id) > 255) return 0; strcpy(hostport, id); @@ -160,16 +141,24 @@ static struct database *load_database(const char *id) memset(db, 0, sizeof(*db)); db->host = host; db->url = nmem_strdup(nmem, id); - db->name = 0; db->databases = xmalloc(2 * sizeof(char *)); db->databases[0] = nmem_strdup(nmem, dbname); db->databases[1] = 0; db->errors = 0; db->explain = explain; - db->rprofile = retrieval; + db->settings = 0; + + db->settings = nmem_malloc(nmem, sizeof(struct settings*) * settings_num()); + memset(db->settings, 0, sizeof(struct settings*) * settings_num()); + idset = nmem_malloc(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 = databases; - db->ccl_map = 0; databases = db; return db; @@ -189,11 +178,15 @@ struct database *find_database(const char *id, int new) return load_database(id); } -static int match_zurl(const char *zurl, const char *pattern) +// 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) @@ -203,6 +196,13 @@ static 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 2; + } else if (!strcmp(pattern, zurl)) return 1; else @@ -210,24 +210,41 @@ static int match_zurl(const char *zurl, const char *pattern) } // This will be generalized at some point -static int match_criterion(struct database *db, struct database_criterion *c) +static int match_criterion(struct setting **settings, struct database_criterion *c) { - if (!strcmp(c->name, "id")) + int offset = settings_offset(c->name); + struct database_criterion_value *v; + + if (offset < 0) { - struct database_criterion_value *v; - for (v = c->values; v; v = v->next) - if (match_zurl(db->url, v->value)) - return 1; + yaz_log(YLOG_WARN, "Criterion not found: %s", c->name); return 0; } + if (!settings[offset]) + return 0; + for (v = c->values; v; v = v->next) + { + 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; } -int database_match_criteria(struct database *db, struct database_criterion *cl) +int database_match_criteria(struct setting **settings, struct database_criterion *cl) { for (; cl; cl = cl->next) - if (!match_criterion(db, cl)) + if (!match_criterion(settings, cl)) break; if (cl) // one of the criteria failed to match -- skip this db return 0; @@ -237,60 +254,42 @@ int database_match_criteria(struct database *db, struct database_criterion *cl) // Cycles through databases, calling a handler function on the ones for // which all criteria matched. -int grep_databases(void *context, struct database_criterion *cl, - void (*fun)(void *context, struct database *db)) +int session_grep_databases(struct session *se, struct database_criterion *cl, + void (*fun)(void *context, struct session_database *db)) { - struct database *p; - int i; + struct session_database *p; + int i = 0; - for (p = databases; p; p = p->next) + for (p = se->databases; p; p = p->next) { - if (database_match_criteria(p, cl)) + 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, cl)) { - (*fun)(context, p); + (*fun)(se, p); i++; } } return i; } -// This function will most likely vanish when a proper target profile mechanism is -// introduced. -void load_simpletargets(const char *fn) +int predef_grep_databases(void *context, struct database_criterion *cl, + void (*fun)(void *context, struct database *db)) { - 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; + struct database *p; + int i = 0; - if (!(db = find_database(url, 0))) - yaz_log(YLOG_WARN, "Unable to load database %s", url); - if (name && db) - db->name = nmem_strdup(nmem, name); - } - fclose(f); + for (p = databases; p; p = p->next) + if (database_match_criteria(p->settings, cl)) + { + (*fun)(context, p); + i++; + } + return i; } - /* * Local variables: * c-basic-offset: 4