X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fdatabase.c;h=2ca3af504d130748e1b07ecfcbd126f2a2ba4829;hb=de79ce99355484d350009d4704c16ade68a76e98;hp=9cb24065ee4093f5f3e9abff25d2434f769eb6d1;hpb=975482621691b3dbd8d08cb5fbd81eeb6d9b05dd;p=pazpar2-moved-to-github.git diff --git a/src/database.c b/src/database.c index 9cb2406..2ca3af5 100644 --- a/src/database.c +++ b/src/database.c @@ -1,4 +1,23 @@ -/* $Id: database.c,v 1.3 2007-03-20 05:32:58 quinn Exp $ */ +/* $Id: database.c,v 1.20 2007-04-20 04:32:33 quinn Exp $ + Copyright (c) 2006-2007, Index Data. + +This file is part of Pazpar2. + +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 +Software Foundation; either version 2, or (at your option) any later +version. + +Pazpar2 is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with Pazpar2; see the file LICENSE. If not, write to the +Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. + */ #include #include @@ -6,9 +25,12 @@ #include #include #include +#include +#include #include "pazpar2.h" #include "config.h" +#include "settings.h" #include "http.h" #include "zeerex.h" @@ -21,28 +43,9 @@ static struct host *hosts = 0; // The hosts we know about static struct database *databases = 0; // The databases we know about static NMEM nmem = 0; -// This needs to be extended with selection criteria -static struct conf_retrievalprofile *database_retrievalprofile(const char *id) -{ - if (!config) - { - yaz_log(YLOG_FATAL, "Must load configuration (-f)"); - exit(1); - } - if (!config->retrievalprofiles) - { - yaz_log(YLOG_FATAL, "No retrieval profiles defined"); - } - return config->retrievalprofiles; -} - -static struct conf_queryprofile *database_queryprofile(const char *id) -{ - return (struct conf_queryprofile*) 1; -} - static xmlDoc *get_explain_xml(const char *id) { + struct stat st; char *dir; char path[256]; char ide[256]; @@ -59,8 +62,10 @@ static xmlDoc *get_explain_xml(const char *id) dir = config->targetprofiles->src; urlencode(id, ide); sprintf(path, "%s/%s", dir, ide); - yaz_log(YLOG_LOG, "Path: %s", path); - return xmlParseFile(path); + if (!stat(path, &st)) + return xmlParseFile(path); + else + return 0; } // Create a new host structure for hostport @@ -121,29 +126,25 @@ static struct host *find_host(const char *hostport) static struct database *load_database(const char *id) { - xmlDoc *doc = get_explain_xml(id); - struct zr_explain *explain; - struct conf_retrievalprofile *retrieval; - struct conf_queryprofile *query; + xmlDoc *doc = 0; + struct zr_explain *explain = 0; struct database *db; struct host *host; char hostport[256]; char *dbname; + yaz_log(YLOG_LOG, "New database: %s", id); if (!nmem) nmem = nmem_create(); - if (doc) + + if (config && config->targetprofiles + && (doc = get_explain_xml(id))) { explain = zr_read_xml(nmem, xmlDocGetRootElement(doc)); if (!explain) return 0; } - if (!(retrieval = database_retrievalprofile(id)) || - !(query = database_queryprofile(id))) - { - xmlFree(doc); - return 0; - } + if (strlen(id) > 255) return 0; strcpy(hostport, id); @@ -157,15 +158,15 @@ static struct database *load_database(const char *id) memset(db, 0, sizeof(*db)); db->host = host; db->url = nmem_strdup(nmem, id); - db->name = 0; db->databases = xmalloc(2 * sizeof(char *)); db->databases[0] = nmem_strdup(nmem, dbname); db->databases[1] = 0; db->errors = 0; db->explain = explain; - db->qprofile = query; - db->rprofile = retrieval; + db->settings = 0; db->next = databases; + db->yaz_marc = 0; + db->map = 0; databases = db; return db; @@ -185,18 +186,64 @@ struct database *find_database(const char *id, int new) return load_database(id); } -static int match_criterion(struct database *db, struct database_criterion *c) +// This whole session_grep database thing should be moved to pazpar2.c + +int match_zurl(const char *zurl, const char *pattern) { - if (!strcmp(c->name, "id")) - return (!strcmp(c->value, db->url)); + if (!strcmp(pattern, "*")) + return 1; + else if (!strncmp(pattern, "*/", 2)) + { + char *db = strchr(zurl, '/'); + if (!db) + return 0; + if (!strcmp(pattern + 2, db)) + return 1; + else + return 0; + } + else if (!strcmp(pattern, zurl)) + return 1; else return 0; } -int database_match_criteria(struct database *db, struct database_criterion *cl) +// This will be generalized at some point +static int match_criterion(struct setting **settings, struct database_criterion *c) +{ + int offset = settings_offset(c->name); + struct database_criterion_value *v; + + if (offset < 0) + { + yaz_log(YLOG_WARN, "Criterion not found: %s", c->name); + return 0; + } + if (!settings[offset]) + return 0; + for (v = c->values; v; v = v->next) + { + if (offset == PZ_ID) + { + if (match_zurl(settings[offset]->value, v->value)) + break; + } + else + { + if (!strcmp(settings[offset]->value, v->value)) + break; + } + } + if (v) + return 1; + else + return 0; +} + +int database_match_criteria(struct setting **settings, struct database_criterion *cl) { for (; cl; cl = cl->next) - if (!match_criterion(db, cl)) + if (!match_criterion(settings, cl)) break; if (cl) // one of the criteria failed to match -- skip this db return 0; @@ -206,23 +253,110 @@ int database_match_criteria(struct database *db, struct database_criterion *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)) +{ + struct session_database *p; + int i = 0; + + for (p = se->databases; p; p = p->next) + { + if (p->settings && p->settings[PZ_ALLOW] && *p->settings[PZ_ALLOW]->value == '0') + continue; + if (database_match_criteria(p->settings, cl)) + { + (*fun)(se, p); + i++; + } + } + return i; +} + int grep_databases(void *context, struct database_criterion *cl, void (*fun)(void *context, struct database *db)) { struct database *p; - int i; + int i = 0; for (p = databases; p; p = p->next) - { - if (database_match_criteria(p, cl)) + if (database_match_criteria(p->settings, cl)) { (*fun)(context, p); i++; } - } return i; } +// Initialize YAZ Map structures for MARC-based targets +static void prepare_yazmarc(void *ignore, struct database *db) +{ + struct setting *s; + + if (!db->settings) + return; + for (s = db->settings[PZ_NATIVESYNTAX]; s; s = s->next) + if (!strcmp(s->value, "iso2709")) + { + char *encoding = "marc-8s"; + yaz_iconv_t cm; + + db->yaz_marc = yaz_marc_create(); + yaz_marc_subfield_str(db->yaz_marc, "\t"); + + // See if a native encoding is specified + if (db->settings[PZ_ENCODING]) + encoding = db->settings[PZ_ENCODING]->value; + + cm = yaz_iconv_open("utf-8", encoding); + if (!cm) + { + yaz_log(YLOG_FATAL, + "Unable to map from %s to UTF-8 for target %s", + encoding, db->url); + exit(1); + } + yaz_marc_iconv(db->yaz_marc, cm); + } +} + +// Prepare XSLT stylesheets for record normalization +static void prepare_map(void *ignore, struct database *db) +{ + struct setting *s; + + if (!db->settings) + return; + for (s = db->settings[PZ_XSLT]; s; s = s->next) + { + char **stylesheets; + struct database_retrievalmap **m = &db->map; + int num, i; + + nmem_strsplit(nmem, ",", s->value, &stylesheets, &num); + for (i = 0; i < num; i++) + { + (*m) = nmem_malloc(nmem, sizeof(**m)); + (*m)->next = 0; + if (!((*m)->stylesheet = conf_load_stylesheet(stylesheets[i]))) + { + yaz_log(YLOG_FATAL, "Unable to load stylesheet: %s", + stylesheets[i]); + exit(1); + } + m = &(*m)->next; + } + } + if (!db->map) + yaz_log(YLOG_WARN, "No Normalization stylesheet for target %s", db->url); +} + +// Read settings for each database, and prepare support data structures +void prepare_databases(void) +{ + grep_databases(0, 0, prepare_yazmarc); + grep_databases(0, 0, prepare_map); +} + // This function will most likely vanish when a proper target profile mechanism is // introduced. void load_simpletargets(const char *fn) @@ -253,8 +387,6 @@ void load_simpletargets(const char *fn) if (!(db = find_database(url, 0))) yaz_log(YLOG_WARN, "Unable to load database %s", url); - if (name && db) - db->name = nmem_strdup(nmem, name); } fclose(f); }