X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fdatabase.c;h=4f957801de7162472e330359758fbdb4932e728c;hb=817e3ec506c4095bc4fcc1923cee36153ef4ee43;hp=3dfe74e0ef2405a319a557169ce96aad16351b34;hpb=4bace2a54c44fa467f26cbfa2cc27159cb8fc268;p=pazpar2-moved-to-github.git diff --git a/src/database.c b/src/database.c index 3dfe74e..4f95780 100644 --- a/src/database.c +++ b/src/database.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2009 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,176 +21,92 @@ 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 "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 - -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) -{ - struct host *host; - host = xmalloc(sizeof(struct host)); - host->hostport = xstrdup(hostport); - host->connections = 0; - host->ipport = 0; +enum pazpar2_database_criterion_type { + PAZPAR2_STRING_MATCH, + PAZPAR2_SUBSTRING_MATCH +}; - if (host_getaddrinfo(host)) - { - xfree(host->hostport); - xfree(host); - return 0; - } - host->next = hosts; - hosts = host; - return host; -} - -static struct host *find_host(const char *hostport) -{ - struct host *p; - for (p = hosts; p; p = p->next) - if (!strcmp(p->hostport, hostport)) - return p; - return create_host(hostport); -} +struct database_criterion_value { + char *value; + struct database_criterion_value *next; +}; -int resolve_database(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))) - return -1; - db->host = host; - } - return 0; -} +struct database_criterion { + char *name; + enum pazpar2_database_criterion_type type; + struct database_criterion_value *values; + struct database_criterion *next; +}; -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(db); + return new_database_inherit_settings(id, nmem, 0); } - -static struct database *load_database(const char *id, - struct conf_service *service) +struct database *new_database_inherit_settings(const char *id, NMEM nmem, struct settings_array *service_settings) { - xmlDoc *doc = 0; - struct zr_explain *explain = 0; struct database *db; - char hostport[256]; - char *dbname; struct setting *idset; - yaz_log(YLOG_LOG, "New database: %s", id); + db = nmem_malloc(nmem, sizeof(*db)); + db->id = nmem_strdup(nmem, id); + db->next = 0; - if (service->targetprofiles - && (doc = get_explain_xml(service->targetprofiles, id))) - { - explain = zr_read_xml(service->nmem, xmlDocGetRootElement(doc)); - if (!explain) - return 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); } - - if (strlen(id) > 255) - return 0; - strcpy(hostport, id); - if ((dbname = strchr(hostport, '/'))) - *(dbname++) = '\0'; - else - dbname = ""; - db = nmem_malloc(service->nmem, sizeof(*db)); - memset(db, 0, sizeof(*db)); - db->host = 0; - db->url = nmem_strdup(service->nmem, id); - db->databases = nmem_malloc(service->nmem, 2 * sizeof(char *)); - db->databases[0] = nmem_strdup(service->nmem, dbname); - db->databases[1] = 0; - db->errors = 0; - db->explain = explain; - - db->settings = 0; - - db->settings = nmem_malloc(service->nmem, sizeof(struct settings*) * - settings_num(service)); - memset(db->settings, 0, sizeof(struct settings*) * settings_num(service)); - idset = nmem_malloc(service->nmem, sizeof(*idset)); + 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 = 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, int new, - struct conf_service *service) +struct database *create_database_for_service(const char *id, + struct conf_service *service) { struct database *p; - if (!new) - { - for (p = service->databases; p; p = p->next) - if (!strcmp(p->url, id)) - return p; - } - return load_database(id, service); + for (p = service->databases; p; p = p->next) + if (!strcmp(p->id, id)) + return p; + + 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 @@ -216,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; @@ -226,10 +142,10 @@ 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_offset(service, c->name); + int offset = settings_lookup_offset(service, c->name); struct database_criterion_value *v; if (offset < 0) @@ -241,14 +157,22 @@ static int match_criterion(struct setting **settings, return 0; for (v = c->values; v; v = v->next) { - if (offset == PZ_ID) + if (c->type == PAZPAR2_STRING_MATCH) { - if (match_zurl(settings[offset]->value, v->value)) - break; + if (offset == PZ_ID) + { + if (match_zurl(settings[offset]->value, v->value)) + break; + } + else + { + if (!strcmp(settings[offset]->value, v->value)) + break; + } } - else + else if (c->type == PAZPAR2_SUBSTRING_MATCH) { - if (!strcmp(settings[offset]->value, v->value)) + if (strstr(settings[offset]->value, v->value)) break; } } @@ -258,9 +182,55 @@ static int match_criterion(struct setting **settings, return 0; } -int database_match_criteria(struct setting **settings, - struct conf_service *service, - struct database_criterion *cl) +// parses crit1=val1,crit2=val2|val3,... +static struct database_criterion *create_database_criterion(NMEM m, + const char *buf) +{ + struct database_criterion *res = 0; + char **values; + int num; + int i; + + if (!buf || !*buf) + return 0; + nmem_strsplit(m, ",", buf, &values, &num); + for (i = 0; i < num; i++) + { + char **subvalues; + int subnum; + 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 + { + yaz_log(YLOG_WARN, "Missing equal-sign/tilde in filter"); + return 0; + } + *(eq++) = '\0'; + new->name = values[i]; + nmem_strsplit(m, "|", eq, &subvalues, &subnum); + new->values = 0; + for (subi = 0; subi < subnum; subi++) + { + struct database_criterion_value *newv + = nmem_malloc(m, sizeof(*newv)); + newv->value = subvalues[subi]; + newv->next = new->values; + new->values = newv; + } + new->next = res; + res = new; + } + return res; +} + +static int database_match_criteria(struct setting **settings, + struct conf_service *service, + struct database_criterion *cl) { for (; cl; cl = cl->next) if (!match_criterion(settings, service, cl)) @@ -273,11 +243,13 @@ 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, struct database_criterion *cl, - void (*fun)(void *context, struct session_database *db)) +int session_grep_databases(struct session *se, const char *filter, + void (*fun)(struct session *se, struct session_database *db)) { struct session_database *p; + NMEM nmem = nmem_create(); int i = 0; + struct database_criterion *cl = create_database_criterion(nmem, filter); for (p = se->databases; p; p = p->next) { @@ -291,18 +263,18 @@ int session_grep_databases(struct session *se, struct database_criterion *cl, i++; } } + nmem_destroy(nmem); return i; } int predef_grep_databases(void *context, struct conf_service *service, - struct database_criterion *cl, void (*fun)(void *context, struct database *db)) { struct database *p; int i = 0; for (p = service->databases; p; p = p->next) - if (database_match_criteria(p->settings, service, cl)) + if (database_match_criteria(p->settings, service, 0)) { (*fun)(context, p); i++;