X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fdatabase.c;h=ab6fa8b81345e74683d08b79f1b508ac54d1867b;hb=8f0d6c3aed956aa0c9c6af420a9025f1caa6e899;hp=61131a5872795b6bb11aede0bb2da66d3c445bd0;hpb=45a9eeea727b174e1c6e1c7d7875f8c746d3178a;p=pazpar2-moved-to-github.git

diff --git a/src/database.c b/src/database.c
index 61131a5..ab6fa8b 100644
--- a/src/database.c
+++ b/src/database.c
@@ -1,4 +1,4 @@
-/* $Id: database.c,v 1.11 2007-04-11 11:13:46 marc Exp $
+/* $Id: database.c,v 1.15 2007-04-11 19:55:57 quinn Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -133,6 +133,7 @@ static struct database *load_database(const char *id)
     char hostport[256];
     char *dbname;
 
+    yaz_log(YLOG_LOG, "New database: %s", id);
     if (!nmem)
         nmem = nmem_create();
     if (doc)
@@ -154,7 +155,6 @@ static struct database *load_database(const char *id)
     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;
@@ -241,9 +241,6 @@ static int match_criterion(struct setting **settings, struct database_criterion
 
 int database_match_criteria(struct setting **settings, struct database_criterion *cl)
 {
-    assert(settings);
-    if (settings[PZ_ALLOW] && *settings[PZ_ALLOW]->value == '0')
-        return 0;
     for (; cl; cl = cl->next)
         if (!match_criterion(settings, cl))
             break;
@@ -262,11 +259,15 @@ int session_grep_databases(struct session *se, struct database_criterion *cl,
     int i = 0;
 
     for (p = se->databases; p; p = p->next)
+    {
+        if (p->settings && p->settings[PZ_ALLOW] && *p->settings[PZ_ALLOW]->value == '0')
+            continue;
         if (database_match_criteria(p->settings, cl))
         {
             (*fun)(se, p);
             i++;
         }
+    }
     return i;
 }
 
@@ -296,17 +297,16 @@ static void prepare_cclmap(void *ignore, struct database *db)
         return;
     db->ccl_map = ccl_qual_mk();
     for (s = db->settings[PZ_CCLMAP]; s; s = s->next)
-        if (!*s->user)
+    {
+        char *p = strchr(s->name + 3, ':');
+        if (!p)
         {
-            char *p = strchr(s->name + 3, ':');
-            if (!p)
-            {
-                yaz_log(YLOG_FATAL, "Malformed cclmap name: %s", s->name);
-                exit(1);
-            }
-            p++;
-            ccl_qual_fitem(db->ccl_map, s->value, p);
+            yaz_log(YLOG_FATAL, "Malformed cclmap name: %s", s->name);
+            exit(1);
         }
+        p++;
+        ccl_qual_fitem(db->ccl_map, s->value, p);
+    }
 }
 
 // Initialize YAZ Map structures for MARC-based targets
@@ -317,7 +317,7 @@ static void prepare_yazmarc(void *ignore, struct database *db)
     if (!db->settings)
         return;
     for (s = db->settings[PZ_NATIVESYNTAX]; s; s = s->next)
-        if (!*s->user && !strcmp(s->value, "iso2709"))
+        if (!strcmp(s->value, "iso2709"))
         {
             char *encoding = "marc-8s";
             yaz_iconv_t cm;
@@ -325,12 +325,11 @@ static void prepare_yazmarc(void *ignore, struct database *db)
             db->yaz_marc = yaz_marc_create();
             yaz_marc_subfield_str(db->yaz_marc, "\t");
             // See if a native encoding is specified
-            for (s = db->settings[PZ_ENCODING]; s; s = s->next)
-                if (!*s->user)
-                {
-                    encoding = s->value;
-                    break;
-                }
+            if ((s = db->settings[PZ_ENCODING]))
+            {
+                encoding = s->value;
+                break;
+            }
             if (!(cm = yaz_iconv_open("utf-8", encoding)))
             {
                 yaz_log(YLOG_FATAL, "Unable to map from %s to UTF-8", encoding);
@@ -349,28 +348,26 @@ static void prepare_map(void *ignore, struct database *db)
     if (!db->settings)
         return;
     for (s = db->settings[PZ_XSLT]; s; s = s->next)
-        if (!*s->user)
-        {
-            char **stylesheets;
-            struct database_retrievalmap **m = &db->map;
-            int num, i;
+    {
+        char **stylesheets;
+        struct database_retrievalmap **m = &db->map;
+        int num, i;
 
-            nmem_strsplit(nmem, ",", s->value, &stylesheets, &num);
-            for (i = 0; i < num; i++)
+        nmem_strsplit(nmem, ",", s->value, &stylesheets, &num);
+        for (i = 0; i < num; i++)
+        {
+            (*m) = nmem_malloc(nmem, sizeof(**m));
+            (*m)->next = 0;
+            if (!((*m)->stylesheet = conf_load_stylesheet(stylesheets[i])))
             {
-                (*m) = nmem_malloc(nmem, sizeof(**m));
-                (*m)->next = 0;
-                if (!((*m)->stylesheet = conf_load_stylesheet(stylesheets[i])))
-                {
-                    yaz_log(YLOG_FATAL, "Unable to load stylesheet: %s",
-                            stylesheets[i]);
-                    exit(1);
-                }
-                m = &(*m)->next;
+                yaz_log(YLOG_FATAL, "Unable to load stylesheet: %s",
+                        stylesheets[i]);
+                exit(1);
             }
-            break;
+            m = &(*m)->next;
         }
-    if (!s)
+    }
+    if (!db->map)
         yaz_log(YLOG_WARN, "No Normalization stylesheet for target %s", db->url);
 }
 
@@ -412,8 +409,6 @@ void load_simpletargets(const char *fn)
 
         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);
 }