X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fdatabase.c;h=342cbc9b0dd2a167e2ab06c701d24e6b3c20991e;hb=dbcf2c3410ed74d919efdc62ffbd00e716284d8e;hp=67e7ea255eaef3aab001fa89f8c9d9cf80d2a5bc;hpb=8386ad4d5d4f7cfd44fba1bc34b54a5e1e917fdd;p=pazpar2-moved-to-github.git diff --git a/src/database.c b/src/database.c index 67e7ea2..342cbc9 100644 --- a/src/database.c +++ b/src/database.c @@ -1,4 +1,4 @@ -/* $Id: database.c,v 1.18 2007-04-13 00:29:14 quinn Exp $ +/* $Id: database.c,v 1.25 2007-04-23 21:05:23 adam Exp $ Copyright (c) 2006-2007, Index Data. This file is part of Pazpar2. @@ -29,6 +29,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include "pazpar2.h" +#include "host.h" #include "config.h" #include "settings.h" #include "http.h" @@ -71,45 +72,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; @@ -165,9 +140,6 @@ static struct database *load_database(const char *id) db->explain = explain; db->settings = 0; db->next = databases; - db->ccl_map = 0; - db->yaz_marc = 0; - db->map = 0; databases = db; return db; @@ -187,7 +159,7 @@ struct database *find_database(const char *id, int new) return load_database(id); } -// 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) { @@ -227,19 +199,18 @@ static int match_criterion(struct setting **settings, struct database_criterion if (offset == PZ_ID) { if (match_zurl(settings[offset]->value, v->value)) - return 1; - else - return 0; + break; } else { if (!strcmp(settings[offset]->value, v->value)) - return 1; - else - return 0; + break; } } - return 0; + if (v) + return 1; + else + return 0; } int database_match_criteria(struct setting **settings, struct database_criterion *cl) @@ -289,135 +260,6 @@ int grep_databases(void *context, struct database_criterion *cl, return i; } -// Initialize CCL map for a target -// Note: This approach ignores user-specific CCL maps, for which I -// don't presently see any application. -static void prepare_cclmap(void *ignore, struct database *db) -{ - struct setting *s; - - if (!db->settings) - return; - db->ccl_map = ccl_qual_mk(); - for (s = db->settings[PZ_CCLMAP]; s; s = s->next) - { - char *p = strchr(s->name + 3, ':'); - if (!p) - { - yaz_log(YLOG_FATAL, "Malformed cclmap name: %s", s->name); - exit(1); - } - p++; - ccl_qual_fitem(db->ccl_map, s->value, p); - } -} - -// Initialize YAZ Map structures for MARC-based targets -static void prepare_yazmarc(void *ignore, struct database *db) -{ - struct setting *s; - - if (!db->settings) - return; - for (s = db->settings[PZ_NATIVESYNTAX]; s; s = s->next) - if (!strcmp(s->value, "iso2709")) - { - char *encoding = "marc-8s"; - yaz_iconv_t cm; - - db->yaz_marc = yaz_marc_create(); - yaz_marc_subfield_str(db->yaz_marc, "\t"); - - // See if a native encoding is specified - if (db->settings[PZ_ENCODING]) - encoding = db->settings[PZ_ENCODING]->value; - - cm = yaz_iconv_open("utf-8", encoding); - if (!cm) - { - yaz_log(YLOG_FATAL, - "Unable to map from %s to UTF-8 for target %s", - encoding, db->url); - exit(1); - } - yaz_marc_iconv(db->yaz_marc, cm); - } -} - -// Prepare XSLT stylesheets for record normalization -static void prepare_map(void *ignore, struct database *db) -{ - struct setting *s; - - if (!db->settings) - return; - for (s = db->settings[PZ_XSLT]; s; s = s->next) - { - char **stylesheets; - struct database_retrievalmap **m = &db->map; - int num, i; - - nmem_strsplit(nmem, ",", s->value, &stylesheets, &num); - for (i = 0; i < num; i++) - { - (*m) = nmem_malloc(nmem, sizeof(**m)); - (*m)->next = 0; - if (!((*m)->stylesheet = conf_load_stylesheet(stylesheets[i]))) - { - yaz_log(YLOG_FATAL, "Unable to load stylesheet: %s", - stylesheets[i]); - exit(1); - } - m = &(*m)->next; - } - } - if (!db->map) - yaz_log(YLOG_WARN, "No Normalization stylesheet for target %s", db->url); -} - -// Read settings for each database, and prepare support data structures -void prepare_databases(void) -{ - grep_databases(0, 0, prepare_cclmap); - grep_databases(0, 0, prepare_yazmarc); - grep_databases(0, 0, prepare_map); -} - -// 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