-/* $Id: database.c,v 1.13 2007-04-11 16:48:09 quinn Exp $
+/* $Id: database.c,v 1.27 2007-05-18 19:52:52 quinn Exp $
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
#include <sys/stat.h>
#include "pazpar2.h"
+#include "host.h"
#include "config.h"
#include "settings.h"
#include "http.h"
// Create a new host structure for hostport
static struct host *create_host(const char *hostport)
{
- struct addrinfo *addrinfo, hints;
struct host *host;
- char *port;
- char ipport[128];
- unsigned char addrbuf[4];
- int res;
host = xmalloc(sizeof(struct host));
host->hostport = xstrdup(hostport);
host->connections = 0;
+ host->ipport = 0;
- if ((port = strchr(hostport, ':')))
- *(port++) = '\0';
- else
- port = "210";
-
- hints.ai_flags = 0;
- hints.ai_family = PF_INET;
- hints.ai_socktype = SOCK_STREAM;
- hints.ai_protocol = IPPROTO_TCP;
- hints.ai_addrlen = 0;
- hints.ai_addr = 0;
- hints.ai_canonname = 0;
- hints.ai_next = 0;
- // This is not robust code. It assumes that getaddrinfo always
- // returns AF_INET address.
- if ((res = getaddrinfo(hostport, port, &hints, &addrinfo)))
+ if (host_getaddrinfo(host))
{
- yaz_log(YLOG_WARN, "Failed to resolve %s: %s", hostport, gai_strerror(res));
xfree(host->hostport);
xfree(host);
return 0;
}
- assert(addrinfo->ai_family == PF_INET);
- memcpy(addrbuf, &((struct sockaddr_in*)addrinfo->ai_addr)->sin_addr.s_addr, 4);
- sprintf(ipport, "%u.%u.%u.%u:%s",
- addrbuf[0], addrbuf[1], addrbuf[2], addrbuf[3], port);
- host->ipport = xstrdup(ipport);
- freeaddrinfo(addrinfo);
host->next = hosts;
hosts = host;
return host;
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;
+ struct setting *idset;
+ 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);
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->settings = 0;
+
+ db->settings = nmem_malloc(nmem, sizeof(struct settings*) * settings_num());
+ memset(db->settings, 0, sizeof(struct settings*) * settings_num());
+ idset = nmem_malloc(nmem, sizeof(*id));
+ idset->precedence = 0;
+ idset->name = "pz:id";
+ idset->target = idset->value = db->url;
+ idset->next = 0;
+ db->settings[PZ_ID] = idset;
+
db->next = databases;
- db->ccl_map = 0;
- db->yaz_marc = 0;
- db->map = 0;
databases = db;
return db;
return load_database(id);
}
-// This whole session_grep database thing should be moved to pazpar2.c
+// This whole session_grep database thing should be moved elsewhere
int match_zurl(const char *zurl, const char *pattern)
{
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)
{
if (p->settings && p->settings[PZ_ALLOW] && *p->settings[PZ_ALLOW]->value == '0')
continue;
+ if (!p->settings[PZ_NAME])
+ continue;
if (database_match_criteria(p->settings, cl))
{
(*fun)(se, p);
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)
-{
- struct setting *s;
-
- if (!db->settings)
- return;
- for (s = db->settings[PZ_NATIVESYNTAX]; s; s = s->next)
- if (!*s->user && !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)))
- {
- yaz_log(YLOG_FATAL, "Unable to map from %s to UTF-8", encoding);
- exit(1);
- }
- yaz_marc_iconv(db->yaz_marc, cm);
- break;
- }
-}
-
-// 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)
- if (!*s->user)
- {
- 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;
- }
- break;
- }
- if (!s)
- 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);
-}
-
-// This function will most likely vanish when a proper target profile mechanism is
-// introduced.
-void load_simpletargets(const char *fn)
-{
- FILE *f = fopen(fn, "r");
- char line[256];
-
- if (!f)
- {
- yaz_log(YLOG_WARN|YLOG_ERRNO, "open %s", fn);
- exit(1);
- }
-
- while (fgets(line, 255, f))
- {
- char *url;
- char *name;
- struct database *db;
-
- if (strncmp(line, "target ", 7))
- continue;
- line[strlen(line) - 1] = '\0';
-
- if ((name = strchr(line, ';')))
- *(name++) = '\0';
-
- url = line + 7;
-
- 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);
-}
-
-
/*
* Local variables:
* c-basic-offset: 4
projects / pazpar2-moved-to-github.git / blobdiff