X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fdatabase.c;h=a23c6fdb71728c9336a7741c2bf7d1e59ec43eb0;hb=5d292b54354dd975b1a9511c3222bdffdf18de38;hp=1a450afe51be346e08be01149e22dc9e992bf038;hpb=d65081fd86127344075a112002adbfa32ff88f11;p=pazpar2-moved-to-github.git diff --git a/src/database.c b/src/database.c index 1a450af..a23c6fd 100644 --- a/src/database.c +++ b/src/database.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2011 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,8 +21,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #endif -#include -#include #include #include #include @@ -38,15 +36,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #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, @@ -65,121 +54,59 @@ struct database_criterion { struct database_criterion *next; }; -struct database_hosts { - struct host *hosts; - YAZ_MUTEX mutex; -}; - -// Create a new host structure for hostport -static struct host *create_host(const char *hostport) -{ - struct host *host; - char *db_comment; - - host = xmalloc(sizeof(struct host)); - host->hostport = xstrdup(hostport); - db_comment = strchr(host->hostport, '#'); - if (db_comment) - *db_comment = '\0'; - host->connections = 0; - host->mutex = 0; - - pazpar2_mutex_create(&host->mutex, "host"); - - yaz_cond_create(&host->cond_ready); - - return host; -} - -static struct host *find_host(database_hosts_t hosts, - const char *hostport) -{ - struct host *p; - yaz_mutex_enter(hosts->mutex); - for (p = hosts->hosts; p; p = p->next) - if (!strcmp(p->hostport, hostport)) - break; - if (!p) - { - p = create_host(hostport); - if (p) - { - p->next = hosts->hosts; - hosts->hosts = p; - } - } - yaz_mutex_leave(hosts->mutex); - return p; -} - -int resolve_database(struct conf_service *service, struct database *db) -{ - if (db->host == 0) - { - struct host *host; - if (!(host = find_host(service->server->database_hosts, db->url))) - 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; struct setting *idset; db = nmem_malloc(nmem, sizeof(*db)); - memset(db, 0, sizeof(*db)); - - db->url = nmem_strdup(nmem, id); - db->errors = 0; - db->host = 0; + db->id = nmem_strdup(nmem, id); + db->next = 0; - db->num_settings = PZ_MAX_EOF; - db->settings = nmem_malloc(nmem, sizeof(struct settings*) * - db->num_settings); - memset(db->settings, 0, sizeof(struct settings*) * db->num_settings); + 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; - - db = new_database(id, service->nmem); - - 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 @@ -205,7 +132,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; @@ -215,7 +142,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); @@ -237,12 +164,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)) @@ -274,11 +201,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; @@ -355,34 +289,6 @@ int predef_grep_databases(void *context, struct conf_service *service, return i; } -database_hosts_t database_hosts_create(void) -{ - database_hosts_t p = xmalloc(sizeof(*p)); - p->hosts = 0; - p->mutex = 0; - pazpar2_mutex_create(&p->mutex, "database"); - return p; -} - -void database_hosts_destroy(database_hosts_t *pp) -{ - if (*pp) - { - struct host *p = (*pp)->hosts; - while (p) - { - struct host *p_next = p->next; - yaz_mutex_destroy(&p->mutex); - yaz_cond_destroy(&p->cond_ready); - xfree(p->hostport); - xfree(p); - p = p_next; - } - yaz_mutex_destroy(&(*pp)->mutex); - xfree(*pp); - } -} - /* * Local variables: * c-basic-offset: 4