X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fdatabase.c;h=2ca3af504d130748e1b07ecfcbd126f2a2ba4829;hb=082c4ffea584f55622bb16406d04dbed3b6e6519;hp=39514d49881ae6b75f790716089763b955de489d;hpb=7268905fa4eb3b905b9e1f3a26b84301f4ffccab;p=pazpar2-moved-to-github.git diff --git a/src/database.c b/src/database.c index 39514d4..2ca3af5 100644 --- a/src/database.c +++ b/src/database.c @@ -1,4 +1,4 @@ -/* $Id: database.c,v 1.13 2007-04-11 16:48:09 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. @@ -126,21 +126,25 @@ static struct host *find_host(const char *hostport) static struct database *load_database(const char *id) { - xmlDoc *doc = get_explain_xml(id); + 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 (strlen(id) > 255) return 0; strcpy(hostport, id); @@ -154,7 +158,6 @@ 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; @@ -162,7 +165,6 @@ static struct database *load_database(const char *id) db->explain = explain; db->settings = 0; db->next = databases; - db->ccl_map = 0; db->yaz_marc = 0; db->map = 0; databases = db; @@ -224,19 +226,18 @@ static int match_criterion(struct setting **settings, struct database_criterion if (offset == PZ_ID) { if (match_zurl(settings[offset]->value, v->value)) - return 1; - else - return 0; + break; } else { if (!strcmp(settings[offset]->value, v->value)) - return 1; - else - return 0; + break; } } - return 0; + if (v) + return 1; + else + return 0; } int database_match_criteria(struct setting **settings, struct database_criterion *cl) @@ -286,30 +287,6 @@ int grep_databases(void *context, struct database_criterion *cl, return i; } -// Initialize CCL map for a target -// Note: This approach ignores user-specific CCL maps, for which I -// don't presently see any application. -static void prepare_cclmap(void *ignore, struct database *db) -{ - struct setting *s; - - if (!db->settings) - return; - db->ccl_map = ccl_qual_mk(); - for (s = db->settings[PZ_CCLMAP]; s; s = s->next) - if (!*s->user) - { - char *p = strchr(s->name + 3, ':'); - if (!p) - { - yaz_log(YLOG_FATAL, "Malformed cclmap name: %s", s->name); - exit(1); - } - p++; - ccl_qual_fitem(db->ccl_map, s->value, p); - } -} - // Initialize YAZ Map structures for MARC-based targets static void prepare_yazmarc(void *ignore, struct database *db) { @@ -318,27 +295,27 @@ static void prepare_yazmarc(void *ignore, struct database *db) if (!db->settings) return; for (s = db->settings[PZ_NATIVESYNTAX]; s; s = s->next) - if (!*s->user && !strcmp(s->value, "iso2709")) + 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 - for (s = db->settings[PZ_ENCODING]; s; s = s->next) - if (!*s->user) - { - encoding = s->value; - break; - } - if (!(cm = yaz_iconv_open("utf-8", encoding))) + 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", encoding); + 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); - break; } } @@ -350,35 +327,32 @@ static void prepare_map(void *ignore, struct database *db) if (!db->settings) return; for (s = db->settings[PZ_XSLT]; s; s = s->next) - if (!*s->user) - { - char **stylesheets; - struct database_retrievalmap **m = &db->map; - int num, i; + { + char **stylesheets; + struct database_retrievalmap **m = &db->map; + int num, i; - nmem_strsplit(nmem, ",", s->value, &stylesheets, &num); - for (i = 0; i < 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]))) { - (*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; + yaz_log(YLOG_FATAL, "Unable to load stylesheet: %s", + stylesheets[i]); + exit(1); } - break; + m = &(*m)->next; } - if (!s) + } + 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_cclmap); grep_databases(0, 0, prepare_yazmarc); grep_databases(0, 0, prepare_map); } @@ -413,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); }