X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fdatabase.c;h=08359d600808b9c4353d740763bd10b73cfdb512;hb=9ebc11737580bcae95386cb76539650807b8f166;hp=c2fb3b184bff2e33da2a1ca39462219672a80d22;hpb=7c65462a944e8f9fbcfa2d310e37dc1a408888e1;p=pazpar2-moved-to-github.git diff --git a/src/database.c b/src/database.c index c2fb3b1..08359d6 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) 2006-2011 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 @@ -27,12 +27,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include +#include -#include "pazpar2.h" +#include "ppmutex.h" +#include "session.h" #include "host.h" +#include "pazpar2_config.h" #include "settings.h" #include "http.h" -#include "zeerex.h" #include "database.h" #include @@ -63,31 +65,14 @@ 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; -} +struct database_hosts { + struct host *hosts; + YAZ_MUTEX mutex; +}; // Create a new host structure for hostport -static struct host *create_host(const char *hostport) +static struct host *create_host(const char *hostport, iochan_man_t iochan_man) { struct host *host; @@ -95,28 +80,43 @@ static struct host *create_host(const char *hostport) host->hostport = xstrdup(hostport); host->connections = 0; host->ipport = 0; + host->mutex = 0; - if (host_getaddrinfo(host)) + if (host_getaddrinfo(host, iochan_man)) { xfree(host->hostport); xfree(host); return 0; } - host->next = hosts; - hosts = host; + pazpar2_mutex_create(&host->mutex, "host"); + + yaz_cond_create(&host->cond_ready); + return host; } -static struct host *find_host(const char *hostport) +static struct host *find_host(database_hosts_t hosts, + const char *hostport, iochan_man_t iochan_man) { struct host *p; - for (p = hosts; p; p = p->next) + yaz_mutex_enter(hosts->mutex); + for (p = hosts->hosts; p; p = p->next) if (!strcmp(p->hostport, hostport)) - return p; - return create_host(hostport); + break; + if (!p) + { + p = create_host(hostport, iochan_man); + if (p) + { + p->next = hosts->hosts; + hosts->hosts = p; + } + } + yaz_mutex_leave(hosts->mutex); + return p; } -int resolve_database(struct database *db) +int resolve_database(struct conf_service *service, struct database *db) { if (db->host == 0) { @@ -126,7 +126,8 @@ int resolve_database(struct database *db) strcpy(hostport, db->url); if ((p = strchr(hostport, '/'))) *p = '\0'; - if (!(host = find_host(hostport))) + if (!(host = find_host(service->server->database_hosts, + hostport, service->server->iochan_man))) return -1; db->host = host; } @@ -137,7 +138,7 @@ void resolve_databases(struct conf_service *service) { struct database *db = service->databases; for (; db; db = db->next) - resolve_database(db); + resolve_database(service, db); } struct database *new_database(const char *id, NMEM nmem) @@ -145,6 +146,7 @@ struct database *new_database(const char *id, NMEM nmem) struct database *db; char hostport[256]; char *dbname; + char *db_comment; struct setting *idset; if (strlen(id) > 255) @@ -154,6 +156,9 @@ struct database *new_database(const char *id, NMEM nmem) *(dbname++) = '\0'; else dbname = ""; + db_comment = strchr(dbname, '#'); + if (db_comment) + *db_comment = '\0'; db = nmem_malloc(nmem, sizeof(*db)); memset(db, 0, sizeof(*db)); db->host = 0; @@ -164,7 +169,7 @@ struct database *new_database(const char *id, NMEM nmem) db->errors = 0; db->explain = 0; - db->num_settings = PZ_NEGOTIATION_CHARSET+1; + 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); @@ -184,15 +189,7 @@ static struct database *load_database(const char *id, { 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; @@ -385,6 +382,35 @@ 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->ipport); + xfree(p->hostport); + xfree(p); + p = p_next; + } + yaz_mutex_destroy(&(*pp)->mutex); + xfree(*pp); + } +} + /* * Local variables: * c-basic-offset: 4