-/* $Id: database.c,v 1.4 2007-03-23 03:26:22 quinn Exp $ */
+/* $Id: database.c,v 1.6 2007-03-30 02:45:07 quinn Exp $ */
#include <libxml/parser.h>
#include <libxml/tree.h>
#include <libxslt/transform.h>
#include <libxslt/xsltutils.h>
#include <assert.h>
+#include <sys/types.h>
+#include <sys/stat.h>
#include "pazpar2.h"
#include "config.h"
static xmlDoc *get_explain_xml(const char *id)
{
+ struct stat st;
char *dir;
char path[256];
char ide[256];
dir = config->targetprofiles->src;
urlencode(id, ide);
sprintf(path, "%s/%s", dir, ide);
- yaz_log(YLOG_LOG, "Path: %s", path);
- return xmlParseFile(path);
+ if (!stat(path, &st))
+ return xmlParseFile(path);
+ else
+ return 0;
}
// Create a new host structure for hostport
static struct database *load_database(const char *id)
{
xmlDoc *doc = get_explain_xml(id);
- struct zr_explain *explain;
+ struct zr_explain *explain = 0;
struct conf_retrievalprofile *retrieval;
- struct conf_queryprofile *query;
struct database *db;
struct host *host;
char hostport[256];
if (!explain)
return 0;
}
- if (!(retrieval = database_retrievalprofile(id)) ||
- !(query = database_queryprofile(id)))
+ if (!(retrieval = database_retrievalprofile(id)))
{
xmlFree(doc);
return 0;
db->databases[1] = 0;
db->errors = 0;
db->explain = explain;
- db->qprofile = query;
db->rprofile = retrieval;
+ db->settings = 0;
db->next = databases;
+ db->ccl_map = 0;
databases = db;
return db;
return load_database(id);
}
+static int match_zurl(const char *zurl, const char *pattern)
+{
+ if (!strcmp(pattern, "*"))
+ return 1;
+ else if (!strncmp(pattern, "*/", 2))
+ {
+ char *db = strchr(zurl, '/');
+ if (!db)
+ return 0;
+ if (!strcmp(pattern + 2, db))
+ return 1;
+ else
+ return 0;
+ }
+ else if (!strcmp(pattern, zurl))
+ return 1;
+ else
+ return 0;
+}
+
// This will be generalized at some point
static int match_criterion(struct database *db, struct database_criterion *c)
{
{
struct database_criterion_value *v;
for (v = c->values; v; v = v->next)
- if (!strcmp(v->value, db->url))
+ if (match_zurl(db->url, v->value))
return 1;
return 0;
}