-/* $Id: database.c,v 1.17 2007-04-12 10:17:53 marc 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.
db->explain = explain;
db->settings = 0;
db->next = databases;
- db->ccl_map = 0;
db->yaz_marc = 0;
db->map = 0;
databases = db;
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)
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)
- {
- 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)
{
yaz_marc_subfield_str(db->yaz_marc, "\t");
// See if a native encoding is specified
- if ((s = db->settings[PZ_ENCODING]))
- encoding = s->value;
+ if (db->settings[PZ_ENCODING])
+ encoding = db->settings[PZ_ENCODING]->value;
cm = yaz_iconv_open("utf-8", encoding);
if (!cm)
// 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);
}