Functional settings system. At this point, they control the CCL map only

[pazpar2-moved-to-github.git] / src / database.c

diff --git a/src/database.c b/src/database.c
index 9cb2406..95703e0 100644 (file)
--- a/src/database.c
+++ b/src/database.c
@@ -1,4 +1,4 @@
-/* $Id: database.c,v 1.3 2007-03-20 05:32:58 quinn Exp $ */
+/* $Id: database.c,v 1.6 2007-03-30 02:45:07 quinn Exp $ */
 
 #include <libxml/parser.h>
 #include <libxml/tree.h>
@@ -6,6 +6,8 @@
 #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"
@@ -43,6 +45,7 @@ static struct conf_queryprofile *database_queryprofile(const char *id)
 
 static xmlDoc *get_explain_xml(const char *id)
 {
+    struct stat st;
     char *dir;
     char path[256];
     char ide[256];
@@ -59,8 +62,10 @@ static xmlDoc *get_explain_xml(const char *id)
     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
@@ -122,9 +127,8 @@ static struct host *find_host(const char *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];
@@ -138,8 +142,7 @@ static struct database *load_database(const char *id)
         if (!explain)
             return 0;
     }
-    if (!(retrieval = database_retrievalprofile(id)) ||
-            !(query = database_queryprofile(id)))
+    if (!(retrieval = database_retrievalprofile(id)))
     {
         xmlFree(doc);
         return 0;
@@ -163,9 +166,10 @@ static struct database *load_database(const char *id)
     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;
@@ -185,10 +189,37 @@ struct database *find_database(const char *id, int new)
     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)
 {
     if (!strcmp(c->name, "id"))
-        return (!strcmp(c->value, db->url));
+    {
+        struct database_criterion_value *v;
+        for (v = c->values; v; v = v->next)
+            if (match_zurl(db->url, v->value))
+                return 1;
+        return 0;
+    }
     else
         return 0;
 }