X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fdatabase.c;h=41e0f06a03cd6c7c0224045345c09e4010325f33;hb=31babd0a7a0d4ee7091cfb740205ab6fe1c89ae5;hp=8ab626e6835b5d70d65a3a176ad4312864c64ad7;hpb=b73890ede1ee6eeb8a07937733871077df6f15b9;p=pazpar2-moved-to-github.git diff --git a/src/database.c b/src/database.c index 8ab626e..41e0f06 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 @@ -21,32 +21,21 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #endif -#include -#include #include #include #include #include #include +#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 -#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,58 +54,33 @@ struct database_criterion { struct database_criterion *next; }; - struct database_hosts { struct host *hosts; YAZ_MUTEX mutex; }; -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) +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->ipport = 0; host->mutex = 0; - if (host_getaddrinfo(host, iochan_man)) - { - xfree(host->hostport); - xfree(host); - return 0; - } - yaz_mutex_create(&host->mutex); - yaz_mutex_set_name(host->mutex, "host"); + 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, iochan_man_t iochan_man) +struct host *find_host(database_hosts_t hosts, const char *hostport) { struct host *p; yaz_mutex_enter(hosts->mutex); @@ -125,7 +89,7 @@ static struct host *find_host(database_hosts_t hosts, break; if (!p) { - p = create_host(hostport, iochan_man); + p = create_host(hostport); if (p) { p->next = hosts->hosts; @@ -136,101 +100,44 @@ static struct host *find_host(database_hosts_t hosts, return p; } -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(service->server->database_hosts, - hostport, service->server->iochan_man))) - return -1; - db->host = host; - } - return 0; -} - -void resolve_databases(struct conf_service *service) -{ - struct database *db = service->databases; - for (; db; db = db->next) - resolve_database(service, db); -} - struct database *new_database(const char *id, NMEM nmem) { 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->id = nmem_strdup(nmem, id); + db->num_settings = PZ_MAX_EOF; db->settings = nmem_malloc(nmem, sizeof(struct settings*) * db->num_settings); + db->next = 0; memset(db->settings, 0, sizeof(struct settings*) * db->num_settings); idset = nmem_malloc(nmem, sizeof(*idset)); idset->precedence = 0; idset->name = "pz:id"; - idset->target = idset->value = db->url; + idset->target = idset->value = db->id; idset->next = 0; 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); + + p = new_database(id, service->nmem); + + p->next = service->databases; + service->databases = p; + + return p; } // This whole session_grep database thing should be moved elsewhere @@ -368,7 +275,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(); @@ -411,8 +318,7 @@ database_hosts_t database_hosts_create(void) database_hosts_t p = xmalloc(sizeof(*p)); p->hosts = 0; p->mutex = 0; - yaz_mutex_create(&p->mutex); - yaz_mutex_set_name(p->mutex, "database"); + pazpar2_mutex_create(&p->mutex, "database"); return p; } @@ -425,7 +331,7 @@ void database_hosts_destroy(database_hosts_t *pp) { struct host *p_next = p->next; yaz_mutex_destroy(&p->mutex); - xfree(p->ipport); + yaz_cond_destroy(&p->cond_ready); xfree(p->hostport); xfree(p); p = p_next;