/* This file is part of Pazpar2.
- Copyright (C) 2006-2008 Index Data
+ Copyright (C) 2006-2009 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
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <libxml/parser.h>
#include <libxml/tree.h>
-#include <libxslt/xslt.h>
-#include <libxslt/transform.h>
-#include <libxslt/xsltutils.h>
#include <assert.h>
#include <sys/types.h>
#include <sys/stat.h>
#include "settings.h"
#include "http.h"
#include "zeerex.h"
+#include "database.h"
#include <sys/types.h>
+#if HAVE_SYS_SOCKET_H
#include <sys/socket.h>
+#endif
+#if HAVE_NETDB_H
#include <netdb.h>
+#endif
+#if HAVE_NETINET_IN_H
#include <netinet/in.h>
+#endif
static struct host *hosts = 0; // The hosts we know about
-static struct database *databases = 0; // The databases we know about
-static NMEM nmem = 0;
+#if 0
static xmlDoc *get_explain_xml(const char *id)
{
struct stat st;
else
return 0;
}
+#endif
// Create a new host structure for hostport
static struct host *create_host(const char *hostport)
return create_host(hostport);
}
-static struct database *load_database(const char *id)
+static struct database *load_database(const char *id,
+ struct conf_service *service)
{
xmlDoc *doc = 0;
struct zr_explain *explain = 0;
struct setting *idset;
yaz_log(YLOG_LOG, "New database: %s", id);
- if (!nmem)
- nmem = nmem_create();
+#if 0
if (config && config->targetprofiles
&& (doc = get_explain_xml(id)))
{
- explain = zr_read_xml(nmem, xmlDocGetRootElement(doc));
+ explain = zr_read_xml(service->nmem, xmlDocGetRootElement(doc));
if (!explain)
return 0;
}
+#endif
if (strlen(id) > 255)
return 0;
if ((dbname = strchr(hostport, '/')))
*(dbname++) = '\0';
else
- dbname = "Default";
+ dbname = "";
if (!(host = find_host(hostport)))
return 0;
- db = nmem_malloc(nmem, sizeof(*db));
+ db = nmem_malloc(service->nmem, sizeof(*db));
memset(db, 0, sizeof(*db));
db->host = host;
- db->url = nmem_strdup(nmem, id);
+ db->url = nmem_strdup(service->nmem, id);
db->databases = xmalloc(2 * sizeof(char *));
- db->databases[0] = nmem_strdup(nmem, dbname);
+ db->databases[0] = nmem_strdup(service->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(*idset));
+ db->settings = nmem_malloc(service->nmem, sizeof(struct settings*) *
+ settings_num(service));
+ memset(db->settings, 0, sizeof(struct settings*) * settings_num(service));
+ idset = nmem_malloc(service->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 = databases;
- databases = db;
+ db->next = service->databases;
+ service->databases = db;
return 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 database *find_database(const char *id, int new,
+ struct conf_service *service)
{
struct database *p;
if (!new)
{
- for (p = databases; p; p = p->next)
+ for (p = service->databases; p; p = p->next)
if (!strcmp(p->url, id))
return p;
}
- return load_database(id);
+ return load_database(id, service);
}
// This whole session_grep database thing should be moved elsewhere
}
// This will be generalized at some point
-static int match_criterion(struct setting **settings, struct database_criterion *c)
+static int match_criterion(struct setting **settings,
+ struct conf_service *service,
+ struct database_criterion *c)
{
- int offset = settings_offset(c->name);
+ int offset = settings_offset(service, c->name);
struct database_criterion_value *v;
if (offset < 0)
return 0;
}
-int database_match_criteria(struct setting **settings, struct database_criterion *cl)
+int database_match_criteria(struct setting **settings,
+ struct conf_service *service,
+ struct database_criterion *cl)
{
for (; cl; cl = cl->next)
- if (!match_criterion(settings, cl))
+ if (!match_criterion(settings, service, cl))
break;
if (cl) // one of the criteria failed to match -- skip this db
return 0;
continue;
if (!p->settings[PZ_NAME])
continue;
- if (database_match_criteria(p->settings, cl))
+ if (database_match_criteria(p->settings, se->service, cl))
{
(*fun)(se, p);
i++;
return i;
}
-int predef_grep_databases(void *context, struct database_criterion *cl,
+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 = databases; p; p = p->next)
- if (database_match_criteria(p->settings, cl))
+ for (p = service->databases; p; p = p->next)
+ if (database_match_criteria(p->settings, service, cl))
{
(*fun)(context, p);
i++;
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
+
projects / pazpar2-moved-to-github.git / blobdiff