X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fdatabase.c;h=838c0dc0a9e2dc4a81a0a87e4ebeb4185ea69b13;hb=949d94c509554cbb85163bbc206b5682104cb789;hp=204b3ae847543010f5ed7ce21aa44d1e54acb152;hpb=de634461a0500801cd71d6a42aff032fa083a127;p=pazpar2-moved-to-github.git

diff --git a/src/database.c b/src/database.c
index 204b3ae..838c0dc 100644
--- a/src/database.c
+++ b/src/database.c
@@ -26,6 +26,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <assert.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <yaz/log.h>
 
 #include "pazpar2.h"
 #include "host.h"
@@ -45,26 +46,38 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <netinet/in.h>
 #endif
 
-static struct host *hosts = 0;  // The hosts we know about 
+enum pazpar2_database_criterion_type {
+    PAZPAR2_STRING_MATCH,
+    PAZPAR2_SUBSTRING_MATCH
+};
 
-#if 0
-static xmlDoc *get_explain_xml(const char *id)
+struct database_criterion_value {
+    char *value;
+    struct database_criterion_value *next;
+};
+
+struct database_criterion {
+    char *name;
+    enum pazpar2_database_criterion_type type;
+    struct database_criterion_value *values;
+    struct database_criterion *next;
+};
+
+static struct host *hosts = 0;  /* thread pr */
+
+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))
@@ -72,7 +85,6 @@ static xmlDoc *get_explain_xml(const char *id)
     else
         return 0;
 }
-#endif
 
 // Create a new host structure for hostport
 static struct host *create_host(const char *hostport)
@@ -104,28 +116,47 @@ static struct host *find_host(const char *hostport)
     return create_host(hostport);
 }
 
+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 0
-    if (config && config->targetprofiles 
-        && (doc = get_explain_xml(id)))
+    if (service->targetprofiles 
+        && (doc = get_explain_xml(service->targetprofiles, id)))
     {
         explain = zr_read_xml(service->nmem, xmlDocGetRootElement(doc));
         if (!explain)
             return 0;
     }
-#endif
 
     if (strlen(id) > 255)
         return 0;
@@ -134,23 +165,20 @@ static struct database *load_database(const char *id,
         *(dbname++) = '\0';
     else
         dbname = "";
-    if (!(host = find_host(hostport)))
-        return 0;
     db = nmem_malloc(service->nmem, sizeof(*db));
     memset(db, 0, sizeof(*db));
-    db->host = host;
+    db->host = 0;
     db->url = nmem_strdup(service->nmem, id);
-    db->databases = xmalloc(2 * sizeof(char *));
+    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->num_settings = settings_num(service);
     db->settings = nmem_malloc(service->nmem, sizeof(struct settings*) * 
-                               settings_num(service));
-    memset(db->settings, 0, sizeof(struct settings*) * settings_num(service));
+                               db->num_settings);
+    memset(db->settings, 0, sizeof(struct settings*) * db->num_settings);
     idset = nmem_malloc(service->nmem, sizeof(*idset));
     idset->precedence = 0;
     idset->name = "pz:id";
@@ -166,16 +194,12 @@ static struct database *load_database(const char *id,
 
 // 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 conf_service *service)
+struct database *find_database(const char *id, struct conf_service *service)
 {
     struct database *p;
-    if (!new)
-    {
-        for (p = service->databases; p; p = p->next)
-            if (!strcmp(p->url, id))
-                return p;
-    }
+    for (p = service->databases; p; p = p->next)
+        if (!strcmp(p->url, id))
+            return p;
     return load_database(id, service);
 }
 
@@ -215,7 +239,7 @@ static int match_criterion(struct setting **settings,
                            struct conf_service *service, 
                            struct database_criterion *c)
 {
-    int offset = settings_offset(service, c->name);
+    int offset = settings_lookup_offset(service, c->name);
     struct database_criterion_value *v;
 
     if (offset < 0)
@@ -227,14 +251,22 @@ static int match_criterion(struct setting **settings,
         return 0;
     for (v = c->values; v; v = v->next)
     {
-        if (offset == PZ_ID)
+        if (c->type == PAZPAR2_STRING_MATCH)
         {
-            if (match_zurl(settings[offset]->value, v->value))
-                break;
-        }
-        else 
+            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 (!strcmp(settings[offset]->value, v->value))
+            if (strstr(settings[offset]->value, v->value))
                 break;
         }
     }
@@ -244,9 +276,55 @@ static int match_criterion(struct setting **settings,
         return 0;
 }
 
-int database_match_criteria(struct setting **settings,
-                            struct conf_service *service,
-                            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(settings, service, cl))
@@ -259,11 +337,13 @@ int database_match_criteria(struct setting **settings,
 
 // Cycles through databases, calling a handler function on the ones for
 // which all criteria matched.
-int session_grep_databases(struct session *se, struct database_criterion *cl,
-        void (*fun)(void *context, struct session_database *db))
+int session_grep_databases(struct session *se, const char *filter,
+                           void (*fun)(void *context, struct session_database *db))
 {
     struct session_database *p;
+    NMEM nmem = nmem_create();
     int i = 0;
+    struct database_criterion *cl = create_database_criterion(nmem, filter);
 
     for (p = se->databases; p; p = p->next)
     {
@@ -277,18 +357,18 @@ int session_grep_databases(struct session *se, struct database_criterion *cl,
             i++;
         }
     }
+    nmem_destroy(nmem);
     return i;
 }
 
 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 = service->databases; p; p = p->next)
-        if (database_match_criteria(p->settings, service, cl))
+        if (database_match_criteria(p->settings, service, 0))
         {
             (*fun)(context, p);
             i++;