I think this addresses Bug 1070.

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

diff --git a/src/database.c b/src/database.c
index 39514d4..70e556a 100644 (file)
--- a/src/database.c
+++ b/src/database.c
@@ -1,4 +1,4 @@
-/* $Id: database.c,v 1.13 2007-04-11 16:48:09 quinn Exp $
+/* $Id: database.c,v 1.19 2007-04-18 12:41:38 quinn Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -126,21 +126,25 @@ static struct host *find_host(const char *hostport)
 
 static struct database *load_database(const char *id)
 {
-    xmlDoc *doc = get_explain_xml(id);
+    xmlDoc *doc = 0;
     struct zr_explain *explain = 0;
     struct database *db;
     struct host *host;
     char hostport[256];
     char *dbname;
 
+    yaz_log(YLOG_LOG, "New database: %s", id);
     if (!nmem)
         nmem = nmem_create();
-    if (doc)
+
+    if (config && config->targetprofiles 
+        && (doc = get_explain_xml(id)))
     {
         explain = zr_read_xml(nmem, xmlDocGetRootElement(doc));
         if (!explain)
             return 0;
     }
+
     if (strlen(id) > 255)
         return 0;
     strcpy(hostport, id);
@@ -154,7 +158,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;
@@ -224,19 +227,18 @@ static int match_criterion(struct setting **settings, struct database_criterion
         if (offset == PZ_ID)
         {
             if (match_zurl(settings[offset]->value, v->value))
-                return 1;
-            else
-                return 0;
+                break;
         }
         else 
         {
             if (!strcmp(settings[offset]->value, v->value))
-                return 1;
-            else
-                return 0;
+                break;
         }
     }
-    return 0;
+    if (v)
+        return 1;
+    else
+        return 0;
 }
 
 int database_match_criteria(struct setting **settings, struct database_criterion *cl)
@@ -297,17 +299,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
@@ -318,27 +319,27 @@ 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;
 
             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 (!(cm = yaz_iconv_open("utf-8", encoding)))
+            if (db->settings[PZ_ENCODING])
+                encoding = db->settings[PZ_ENCODING]->value;
+            
+            cm = yaz_iconv_open("utf-8", encoding);
+            if (!cm)
             {
-                yaz_log(YLOG_FATAL, "Unable to map from %s to UTF-8", encoding);
+                yaz_log(YLOG_FATAL, 
+                        "Unable to map from %s to UTF-8 for target %s", 
+                        encoding, db->url);
                 exit(1);
             }
             yaz_marc_iconv(db->yaz_marc, cm);
-            break;
         }
 }
 
@@ -350,28 +351,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);
 }
 
@@ -413,8 +412,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);
 }