-/* $Id: database.c,v 1.28 2007-05-25 03:58:04 quinn Exp $
- Copyright (c) 2006-2007, Index Data.
-
-This file is part of Pazpar2.
+/* This file is part of Pazpar2.
+ 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
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.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+*/
+
+#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 <yaz/log.h>
#include "pazpar2.h"
#include "host.h"
-#include "config.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;
+static struct host *hosts = 0; /* thread pr */
-static xmlDoc *get_explain_xml(const char *id)
+static xmlDoc *get_explain_xml(struct conf_targetprofiles *targetprofiles,
+ const char *id)
{
struct stat st;
char *dir;
char path[256];
char ide[256];
- if (!config || !config->targetprofiles)
- {
- yaz_log(YLOG_WARN, "Config must be loaded and specify targetprofiles");
- return 0;
- }
- if (config->targetprofiles->type != Targetprofiles_local)
+ if (targetprofiles->type != Targetprofiles_local)
{
yaz_log(YLOG_FATAL, "Only supports local type");
return 0;
}
- dir = config->targetprofiles->src;
+ dir = targetprofiles->src;
urlencode(id, ide);
sprintf(path, "%s/%s", dir, ide);
if (!stat(path, &st))
return create_host(hostport);
}
-static struct database *load_database(const char *id)
+int resolve_database(struct database *db)
+{
+ if (db->host == 0)
+ {
+ struct host *host;
+ char *p;
+ char hostport[256];
+ strcpy(hostport, db->url);
+ if ((p = strchr(hostport, '/')))
+ *p = '\0';
+ if (!(host = find_host(hostport)))
+ return -1;
+ db->host = host;
+ }
+ return 0;
+}
+
+void resolve_databases(struct conf_service *service)
+{
+ struct database *db = service->databases;
+ for (; db; db = db->next)
+ resolve_database(db);
+}
+
+static struct database *load_database(const char *id,
+ struct conf_service *service)
{
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 (config && config->targetprofiles
- && (doc = get_explain_xml(id)))
+ if (service->targetprofiles
+ && (doc = get_explain_xml(service->targetprofiles, id)))
{
- explain = zr_read_xml(nmem, xmlDocGetRootElement(doc));
+ explain = zr_read_xml(service->nmem, xmlDocGetRootElement(doc));
if (!explain)
return 0;
}
if ((dbname = strchr(hostport, '/')))
*(dbname++) = '\0';
else
- dbname = "Default";
- if (!(host = find_host(hostport)))
- return 0;
- db = nmem_malloc(nmem, sizeof(*db));
+ dbname = "";
+ db = nmem_malloc(service->nmem, sizeof(*db));
memset(db, 0, sizeof(*db));
- db->host = host;
- db->url = nmem_strdup(nmem, id);
- db->databases = xmalloc(2 * sizeof(char *));
- db->databases[0] = nmem_strdup(nmem, dbname);
+ db->host = 0;
+ db->url = nmem_strdup(service->nmem, id);
+ db->databases = nmem_malloc(service->nmem, 2 * sizeof(char *));
+ 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
int match_zurl(const char *zurl, const char *pattern)
{
+ int len;
+
if (!strcmp(pattern, "*"))
return 1;
- else if (!strncmp(pattern, "*/", 2))
+ else if (!strncmp(pattern, "*/", 2)) // host wildcard.. what the heck is that for?
{
char *db = strchr(zurl, '/');
if (!db)
else
return 0;
}
+ else if (*(pattern + (len = strlen(pattern) - 1)) == '*') // db wildcard
+ {
+ if (!strncmp(pattern, zurl, len))
+ return 1;
+ else
+ return 2;
+ }
else if (!strcmp(pattern, zurl))
return 1;
else
}
// 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)
}
if (!settings[offset])
return 0;
- for (v = c->values; v; v = v->next)
- {
- if (offset == PZ_ID)
+ if (c->type == PAZPAR2_STRING_MATCH)
+ for (v = c->values; v; v = v->next)
{
- if (match_zurl(settings[offset]->value, v->value))
- break;
+ if (offset == PZ_ID)
+ {
+ if (match_zurl(settings[offset]->value, v->value))
+ break;
+ }
+ else
+ {
+ if (!strcmp(settings[offset]->value, v->value))
+ break;
+ }
}
- else
+ else if (c->type == PAZPAR2_SUBSTRING_MATCH)
+ for (v = c->values; v; v = v->next)
{
- if (!strcmp(settings[offset]->value, v->value))
- break;
+ if (offset == PZ_ID)
+ {
+ if (match_zurl(settings[offset]->value, v->value))
+ break;
+ }
+ else
+ {
+ if (strstr(settings[offset]->value, v->value))
+ break;
+ }
}
- }
if (v)
return 1;
else
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 grep_databases(void *context, struct database_criterion *cl,
- void (*fun)(void *context, struct database *db))
+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
*/
+