/* This file is part of Pazpar2.
- Copyright (C) 2006-2009 Index Data
+ Copyright (C) 2006-2010 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
#include <netinet/in.h>
#endif
+enum pazpar2_database_criterion_type {
+ PAZPAR2_STRING_MATCH,
+ PAZPAR2_SUBSTRING_MATCH
+};
+
+struct database_criterion_value {
+ char *value;
+ struct database_criterion_value *next;
+};
+
+struct database_criterion {
+ char *name;
+ enum pazpar2_database_criterion_type type;
+ struct database_criterion_value *values;
+ struct database_criterion *next;
+};
+
static struct host *hosts = 0; /* thread pr */
static xmlDoc *get_explain_xml(struct conf_targetprofiles *targetprofiles,
resolve_database(db);
}
-static struct database *load_database(const char *id,
- struct conf_service *service)
+struct database *new_database(const char *id, NMEM nmem)
{
- 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);
-
- if (service->targetprofiles
- && (doc = get_explain_xml(service->targetprofiles, id)))
- {
- explain = zr_read_xml(service->nmem, xmlDocGetRootElement(doc));
- if (!explain)
- return 0;
- }
-
if (strlen(id) > 255)
return 0;
strcpy(hostport, id);
*(dbname++) = '\0';
else
dbname = "";
- db = nmem_malloc(service->nmem, sizeof(*db));
+ db = nmem_malloc(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->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 = explain;
-
- db->settings = 0;
+ db->explain = 0;
- db->settings = nmem_malloc(service->nmem, sizeof(struct settings*) *
- settings_num(service));
- db->num_settings = settings_num(service);
- memset(db->settings, 0, sizeof(struct settings*) * settings_num(service));
- idset = nmem_malloc(service->nmem, sizeof(*idset));
+ 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);
+ idset = nmem_malloc(nmem, sizeof(*idset));
idset->precedence = 0;
idset->name = "pz:id";
idset->target = idset->value = db->url;
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 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 *find_database(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;
- }
+ for (p = service->databases; p; p = p->next)
+ if (!strcmp(p->url, id))
+ return p;
return load_database(id, 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)
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))
// 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)(void *context, 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)
{
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++;
projects / pazpar2-moved-to-github.git / blobdiff