Substring for all setting types.

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

diff --git a/src/database.c b/src/database.c
index d580c65..0a87d0c 100644 (file)
--- 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,27 +46,21 @@ 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 
-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))
@@ -104,25 +99,46 @@ 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 (!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;
     }
@@ -134,32 +150,30 @@ static struct database *load_database(const char *id,
         *(dbname++) = '\0';
     else
         dbname = "";
-    if (!(host = find_host(hostport)))
-        return 0;
-    db = nmem_malloc(nmem, sizeof(*db));
+    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*) * 
+    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(nmem, sizeof(*idset));
+    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;
 }
@@ -172,7 +186,7 @@ struct database *find_database(const char *id, int new,
     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;
     }
@@ -227,14 +241,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;
         }
     }
@@ -287,7 +309,7 @@ int predef_grep_databases(void *context, struct conf_service *service,
     struct database *p;
     int i = 0;
 
-    for (p = databases; p; p = p->next)
+    for (p = service->databases; p; p = p->next)
         if (database_match_criteria(p->settings, service, cl))
         {
             (*fun)(context, p);