X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fdatabase.c;h=4f957801de7162472e330359758fbdb4932e728c;hb=817e3ec506c4095bc4fcc1923cee36153ef4ee43;hp=95703e0d97a908befc5996b3742b0df86b6b955e;hpb=cee23067d339c169320af0e4ed7cb348ac95b247;p=pazpar2-moved-to-github.git

diff --git a/src/database.c b/src/database.c
index 95703e0..4f95780 100644
--- a/src/database.c
+++ b/src/database.c
@@ -1,199 +1,123 @@
-/* $Id: database.c,v 1.6 2007-03-30 02:45:07 quinn Exp $ */
+/* This file is part of Pazpar2.
+   Copyright (C) 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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Pazpar2 is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+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 <yaz/nmem.h>
 
-#include "pazpar2.h"
-#include "config.h"
+#include "ppmutex.h"
+#include "session.h"
+#include "host.h"
+#include "pazpar2_config.h"
+#include "settings.h"
 #include "http.h"
-#include "zeerex.h"
+#include "database.h"
 
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <netinet/in.h>
 
-static struct host *hosts = 0;  // The hosts we know about 
-static struct database *databases = 0; // The databases we know about
-static NMEM nmem = 0;
+enum pazpar2_database_criterion_type {
+    PAZPAR2_STRING_MATCH,
+    PAZPAR2_SUBSTRING_MATCH
+};
 
-// This needs to be extended with selection criteria
-static struct conf_retrievalprofile *database_retrievalprofile(const char *id)
-{
-    if (!config)
-    {
-        yaz_log(YLOG_FATAL, "Must load configuration (-f)");
-        exit(1);
-    }
-    if (!config->retrievalprofiles)
-    {
-        yaz_log(YLOG_FATAL, "No retrieval profiles defined");
-    }
-    return config->retrievalprofiles;
-}
+struct database_criterion_value {
+    char *value;
+    struct database_criterion_value *next;
+};
 
-static struct conf_queryprofile *database_queryprofile(const char *id)
-{
-    return (struct conf_queryprofile*) 1;
-}
+struct database_criterion {
+    char *name;
+    enum pazpar2_database_criterion_type type;
+    struct database_criterion_value *values;
+    struct database_criterion *next;
+};
 
-static xmlDoc *get_explain_xml(const char *id)
+struct database *new_database(const char *id, NMEM nmem)
 {
-    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)
-    {
-        yaz_log(YLOG_FATAL, "Only supports local type");
-        return 0;
-    }
-    dir = config->targetprofiles->src;
-    urlencode(id, ide);
-    sprintf(path, "%s/%s", dir, ide);
-    if (!stat(path, &st))
-        return xmlParseFile(path);
-    else
-        return 0;
+    return new_database_inherit_settings(id, nmem, 0);
 }
-
-// Create a new host structure for hostport
-static struct host *create_host(const char *hostport)
+struct database *new_database_inherit_settings(const char *id, NMEM nmem, struct settings_array *service_settings)
 {
-    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;
-
-    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)))
-    {
-        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 host *find_host(const char *hostport)
-{
-    struct host *p;
-    for (p = hosts; p; p = p->next)
-        if (!strcmp(p->hostport, hostport))
-            return p;
-    return create_host(hostport);
-}
-
-static struct database *load_database(const char *id)
-{
-    xmlDoc *doc = get_explain_xml(id);
-    struct zr_explain *explain = 0;
-    struct conf_retrievalprofile *retrieval;
     struct database *db;
-    struct host *host;
-    char hostport[256];
-    char *dbname;
+    struct setting *idset;
 
-    if (!nmem)
-        nmem = nmem_create();
-    if (doc)
-    {
-        explain = zr_read_xml(nmem, xmlDocGetRootElement(doc));
-        if (!explain)
-            return 0;
+    db = nmem_malloc(nmem, sizeof(*db));
+    db->id = nmem_strdup(nmem, id);
+    db->next = 0;
+
+    if (service_settings && service_settings->num_settings > 0) {
+        yaz_log(YLOG_DEBUG, "copying settings from service to database %s settings", db->id);
+        db->num_settings = service_settings->num_settings;
+        db->settings = nmem_malloc(nmem, sizeof(*db->settings) * db->num_settings);
+        // Initialize database settings with service settings
+        memcpy(db->settings, service_settings->settings,  sizeof(*db->settings) * db->num_settings);
     }
-    if (!(retrieval = database_retrievalprofile(id)))
-    {
-        xmlFree(doc);
-        return 0;
+    else {
+        yaz_log(YLOG_DEBUG, "No service settings to database %s ", db->id);
+        db->num_settings = PZ_MAX_EOF;
+        db->settings = nmem_malloc(nmem, sizeof(*db->settings) * db->num_settings);
+        memset(db->settings, 0, sizeof(*db->settings) * db->num_settings);
     }
-    if (strlen(id) > 255)
-        return 0;
-    strcpy(hostport, id);
-    if ((dbname = strchr(hostport, '/')))
-        *(dbname++) = '\0';
-    else
-        dbname = "Default";
-    if (!(host = find_host(hostport)))
-        return 0;
-    db = nmem_malloc(nmem, sizeof(*db));
-    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->rprofile = retrieval;
-    db->settings = 0;
-    db->next = databases;
-    db->ccl_map = 0;
-    databases = db;
+    idset = nmem_malloc(nmem, sizeof(*idset));
+    idset->precedence = 0;
+    idset->name = "pz:id";
+    idset->target = idset->value = db->id;
+    idset->next = db->settings[PZ_ID];
+    db->settings[PZ_ID] = idset;
 
     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 *create_database_for_service(const char *id,
+                                             struct conf_service *service)
 {
     struct database *p;
-    if (!new)
-    {
-        for (p = databases; p; p = p->next)
-            if (!strcmp(p->url, id))
-                return p;
-    }
-    return load_database(id);
+    for (p = service->databases; p; p = p->next)
+        if (!strcmp(p->id, id))
+            return p;
+
+    yaz_log(YLOG_DEBUG, "new database %s under service %s", id,
+       service->id ? service->id : "null");
+    p = new_database_inherit_settings(id, service->nmem, service->settings);
+    p->next = service->databases;
+    service->databases = p;
+
+    return p;
 }
 
-static int match_zurl(const char *zurl, const char *pattern)
+// 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)
@@ -203,6 +127,13 @@ static int match_zurl(const char *zurl, const char *pattern)
         else
             return 0;
     }
+    else if (*(pattern + (len = strlen(pattern) - 1)) == '*')  // db wildcard
+    {
+        if (!strncmp(pattern, zurl, len))
+            return 1;
+        else
+            return 0;
+    }
     else if (!strcmp(pattern, zurl))
         return 1;
     else
@@ -210,24 +141,99 @@ static int match_zurl(const char *zurl, const char *pattern)
 }
 
 // This will be generalized at some point
-static int match_criterion(struct database *db, struct database_criterion *c)
+static int match_criterion(struct setting **settings,
+                           struct conf_service *service,
+                           struct database_criterion *c)
 {
-    if (!strcmp(c->name, "id"))
+    int offset = settings_lookup_offset(service, c->name);
+    struct database_criterion_value *v;
+
+    if (offset < 0)
     {
-        struct database_criterion_value *v;
-        for (v = c->values; v; v = v->next)
-            if (match_zurl(db->url, v->value))
-                return 1;
+        yaz_log(YLOG_WARN, "Criterion not found: %s", c->name);
         return 0;
     }
+    if (!settings[offset])
+        return 0;
+    for (v = c->values; v; v = v->next)
+    {
+        if (c->type == PAZPAR2_STRING_MATCH)
+        {
+            if (offset == PZ_ID)
+            {
+                if (match_zurl(settings[offset]->value, v->value))
+                    break;
+            }
+            else
+            {
+                if (!strcmp(settings[offset]->value, v->value))
+                    break;
+            }
+        }
+        else if (c->type == PAZPAR2_SUBSTRING_MATCH)
+        {
+            if (strstr(settings[offset]->value, v->value))
+                break;
+        }
+    }
+    if (v)
+        return 1;
     else
         return 0;
 }
 
-int database_match_criteria(struct database *db, struct database_criterion *cl)
+// parses crit1=val1,crit2=val2|val3,...
+static struct database_criterion *create_database_criterion(NMEM m,
+                                                            const char *buf)
+{
+    struct database_criterion *res = 0;
+    char **values;
+    int num;
+    int i;
+
+    if (!buf || !*buf)
+        return 0;
+    nmem_strsplit(m, ",", buf,  &values, &num);
+    for (i = 0; i < num; i++)
+    {
+        char **subvalues;
+        int subnum;
+        int subi;
+        struct database_criterion *new = nmem_malloc(m, sizeof(*new));
+        char *eq;
+        if ((eq = strchr(values[i], '=')))
+            new->type = PAZPAR2_STRING_MATCH;
+        else if ((eq = strchr(values[i], '~')))
+            new->type = PAZPAR2_SUBSTRING_MATCH;
+        else
+        {
+            yaz_log(YLOG_WARN, "Missing equal-sign/tilde in filter");
+            return 0;
+        }
+        *(eq++) = '\0';
+        new->name = values[i];
+        nmem_strsplit(m, "|", eq, &subvalues, &subnum);
+        new->values = 0;
+        for (subi = 0; subi < subnum; subi++)
+        {
+            struct database_criterion_value *newv
+                = nmem_malloc(m, sizeof(*newv));
+            newv->value = subvalues[subi];
+            newv->next = new->values;
+            new->values = newv;
+        }
+        new->next = res;
+        res = new;
+    }
+    return res;
+}
+
+static int database_match_criteria(struct setting **settings,
+                                   struct conf_service *service,
+                                   struct database_criterion *cl)
 {
     for (; cl; cl = cl->next)
-        if (!match_criterion(db, cl))
+        if (!match_criterion(settings, service, cl))
             break;
     if (cl) // one of the criteria failed to match -- skip this db
         return 0;
@@ -237,64 +243,51 @@ int database_match_criteria(struct database *db, struct database_criterion *cl)
 
 // Cycles through databases, calling a handler function on the ones for
 // which all criteria matched.
-int grep_databases(void *context, struct database_criterion *cl,
-        void (*fun)(void *context, struct database *db))
+int session_grep_databases(struct session *se, const char *filter,
+                           void (*fun)(struct session *se, struct session_database *db))
 {
-    struct database *p;
-    int i;
+    struct session_database *p;
+    NMEM nmem = nmem_create();
+    int i = 0;
+    struct database_criterion *cl = create_database_criterion(nmem, filter);
 
-    for (p = databases; p; p = p->next)
+    for (p = se->databases; p; p = p->next)
     {
-        if (database_match_criteria(p, 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, se->service, cl))
         {
-            (*fun)(context, p);
+            (*fun)(se, p);
             i++;
         }
     }
+    nmem_destroy(nmem);
     return i;
 }
 
-// This function will most likely vanish when a proper target profile mechanism is
-// introduced.
-void load_simpletargets(const char *fn)
+int predef_grep_databases(void *context, struct conf_service *service,
+                          void (*fun)(void *context, struct database *db))
 {
-    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;
+    struct database *p;
+    int i = 0;
 
-        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);
+    for (p = service->databases; p; p = p->next)
+        if (database_match_criteria(p->settings, service, 0))
+        {
+            (*fun)(context, p);
+            i++;
+        }
+    return i;
 }
 
-
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+