X-Git-Url: http://git.indexdata.com/?p=pazpar2-moved-to-github.git;a=blobdiff_plain;f=src%2Fdatabase.c;h=2064feebf2064c09228cb3bb9cc657f4c8511682;hp=58cbd7e3e97f2e3a94e436c59509873eaa8e77b7;hb=HEAD;hpb=d24d65a3a42bbb6e8c8d0f919bf33510dd356a45 diff --git a/src/database.c b/src/database.c index 58cbd7e..2064fee 100644 --- a/src/database.c +++ b/src/database.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + 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 @@ -21,30 +21,20 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #endif -#include -#include #include #include #include #include +#include -#include "pazpar2.h" -#include "host.h" +#include "ppmutex.h" +#include "session.h" +#include "pazpar2_config.h" #include "settings.h" #include "http.h" -#include "zeerex.h" #include "database.h" #include -#if HAVE_SYS_SOCKET_H -#include -#endif -#if HAVE_NETDB_H -#include -#endif -#if HAVE_NETINET_IN_H -#include -#endif enum pazpar2_database_criterion_type { PAZPAR2_STRING_MATCH, @@ -63,153 +53,59 @@ struct database_criterion { struct database_criterion *next; }; -static struct host *hosts = 0; /* thread pr */ - -static xmlDoc *get_explain_xml(struct conf_targetprofiles *targetprofiles, - const char *id) -{ - struct stat st; - char *dir; - char path[256]; - char ide[256]; - if (targetprofiles->type != Targetprofiles_local) - { - yaz_log(YLOG_FATAL, "Only supports local type"); - return 0; - } - dir = targetprofiles->src; - urlencode(id, ide); - sprintf(path, "%s/%s", dir, ide); - 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, iochan_man_t iochan_man) -{ - struct host *host; - - host = xmalloc(sizeof(struct host)); - host->hostport = xstrdup(hostport); - host->connections = 0; - host->ipport = 0; - - if (host_getaddrinfo(host, iochan_man)) - { - xfree(host->hostport); - xfree(host); - return 0; - } - host->next = hosts; - hosts = host; - return host; -} - -static struct host *find_host(const char *hostport, iochan_man_t iochan_man) -{ - struct host *p; - for (p = hosts; p; p = p->next) - if (!strcmp(p->hostport, hostport)) - return p; - return create_host(hostport, iochan_man); -} - -int resolve_database(struct conf_service *service, 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, service->server->iochan_man))) - return -1; - db->host = host; - } - return 0; -} - -void resolve_databases(struct conf_service *service) +struct database *new_database(const char *id, NMEM nmem) { - struct database *db = service->databases; - for (; db; db = db->next) - resolve_database(service, db); + return new_database_inherit_settings(id, nmem, 0); } - -struct database *new_database(const char *id, NMEM nmem) +struct database *new_database_inherit_settings(const char *id, NMEM nmem, struct settings_array *service_settings) { struct database *db; - char hostport[256]; - char *dbname; struct setting *idset; - if (strlen(id) > 255) - return 0; - strcpy(hostport, id); - if ((dbname = strchr(hostport, '/'))) - *(dbname++) = '\0'; - else - dbname = ""; db = nmem_malloc(nmem, sizeof(*db)); - memset(db, 0, sizeof(*db)); - db->host = 0; - db->url = nmem_strdup(nmem, id); - db->databases = nmem_malloc(nmem, 2 * sizeof(char *)); - db->databases[0] = nmem_strdup(nmem, dbname); - db->databases[1] = 0; - db->errors = 0; - db->explain = 0; - - db->num_settings = PZ_NEGOTIATION_CHARSET+1; - db->settings = nmem_malloc(nmem, sizeof(struct settings*) * - db->num_settings); - memset(db->settings, 0, sizeof(struct settings*) * db->num_settings); + 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->url; - idset->next = 0; + idset->target = idset->value = db->id; + idset->next = db->settings[PZ_ID]; db->settings[PZ_ID] = idset; - db->next = 0; - - return db; -} - -static struct database *load_database(const char *id, - struct conf_service *service) -{ - struct database *db; - struct zr_explain *explain = 0; - xmlDoc *doc = 0; - - if (service->targetprofiles - && (doc = get_explain_xml(service->targetprofiles, id))) - { - explain = zr_read_xml(service->nmem, xmlDocGetRootElement(doc)); - if (!explain) - return 0; - } - db = new_database(id, service->nmem); - db->explain = explain; - 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, struct conf_service *service) +struct database *create_database_for_service(const char *id, + struct conf_service *service) { struct database *p; for (p = service->databases; p; p = p->next) - if (!strcmp(p->url, id)) + if (!strcmp(p->id, id)) return p; - return load_database(id, service); + + 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 elsewhere @@ -235,7 +131,7 @@ int match_zurl(const char *zurl, const char *pattern) if (!strncmp(pattern, zurl, len)) return 1; else - return 2; + return 0; } else if (!strcmp(pattern, zurl)) return 1; @@ -245,7 +141,7 @@ int match_zurl(const char *zurl, const char *pattern) // This will be generalized at some point static int match_criterion(struct setting **settings, - struct conf_service *service, + struct conf_service *service, struct database_criterion *c) { int offset = settings_lookup_offset(service, c->name); @@ -267,12 +163,12 @@ static int match_criterion(struct setting **settings, if (match_zurl(settings[offset]->value, v->value)) break; } - else + else { if (!strcmp(settings[offset]->value, v->value)) break; } - } + } else if (c->type == PAZPAR2_SUBSTRING_MATCH) { if (strstr(settings[offset]->value, v->value)) @@ -304,11 +200,18 @@ static struct database_criterion *create_database_criterion(NMEM m, int subi; struct database_criterion *new = nmem_malloc(m, sizeof(*new)); char *eq; - if ((eq = strchr(values[i], '='))) - new->type = PAZPAR2_STRING_MATCH; - else if ((eq = strchr(values[i], '~'))) - new->type = PAZPAR2_SUBSTRING_MATCH; - else + 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; @@ -347,7 +250,7 @@ static int database_match_criteria(struct setting **settings, // 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)(void *context, struct session_database *db)) + void (*fun)(struct session *se, struct session_database *db)) { struct session_database *p; NMEM nmem = nmem_create();