Removed 'user' from settings structure and code..

diff --git a/src/database.c b/src/database.c
index 1e6c18d..ab6fa8b 100644 (file)
--- a/src/database.c
+++ b/src/database.c
@@ -1,4 +1,4 @@
-/* $Id: database.c,v 1.14 2007-04-11 18:42:25 quinn 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)
@@ -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);
 }
 

diff --git a/src/pazpar2.c b/src/pazpar2.c
index e1c992c..8d2d77c 100644 (file)
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@ -1,4 +1,4 @@
-/* $Id: pazpar2.c,v 1.73 2007-04-11 18:42:25 quinn Exp $
+/* $Id: pazpar2.c,v 1.74 2007-04-11 19:55:57 quinn Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -1342,7 +1342,6 @@ void session_apply_setting(struct session *se, char *dbname, char *setting, char
             new->target = dbname;
             new->name = setting;
             new->value = value;
-            new->user = "";
             new->next = sdb->settings[offset];
             sdb->settings[offset] = new;
             break;

diff --git a/src/settings.c b/src/settings.c
index e86b9d1..4e0624f 100644 (file)
--- a/src/settings.c
+++ b/src/settings.c
@@ -1,4 +1,4 @@
-/* $Id: settings.c,v 1.13 2007-04-11 18:42:25 quinn Exp $
+/* $Id: settings.c,v 1.14 2007-04-11 19:55:57 quinn Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -163,7 +163,6 @@ static void read_settings_file(const char *path,
                 struct setting set;
                 char nameb[1024];
                 char targetb[1024];
-                char userb[1024];
                 char valueb[1024];
 
                 // Copy everything into a temporary buffer -- we decide
@@ -174,13 +173,6 @@ static void read_settings_file(const char *path,
                     set.precedence = atoi((char *) precedencea);
                 else
                     set.precedence = 0;
-                set.user = userb;
-                if (user)
-                    strcpy(userb, user);
-                else if (usera)
-                    strcpy(userb, (const char *) usera);
-                else
-                    set.user = "";
                 if (target)
                     strcpy(targetb, target);
                 else
@@ -312,7 +304,6 @@ static void update_database(void *context, struct database *db)
         id->precedence = 0;
         id->name = "pz:id";
         id->target = id->value = db->url;
-        id->user = "";
         id->next = 0;
         db->settings[PZ_ID] = id;
     }
@@ -323,7 +314,7 @@ static void update_database(void *context, struct database *db)
     // with the same name.
     for (s = db->settings[offset], sp = &db->settings[offset]; s;
             sp = &s->next, s = s->next)
-        if (!strcmp(s->user, set->user) && !strcmp(s->name, set->name))
+        if (!strcmp(s->name, set->name))
         {
             if (s->precedence < set->precedence)
                 // We discard the value (nmem keeps track of the space)
@@ -347,7 +338,6 @@ static void update_database(void *context, struct database *db)
         new->target = nmem_strdup(nmem, set->target);
         new->name = nmem_strdup(nmem, set->name);
         new->value = nmem_strdup(nmem, set->value);
-        new->user = nmem_strdup(nmem, set->user);
         new->next = db->settings[offset];
         db->settings[offset] = new;
     }

diff --git a/src/settings.h b/src/settings.h
index aeae58c..c2699c8 100644 (file)
--- a/src/settings.h
+++ b/src/settings.h
@@ -1,4 +1,4 @@
-/* $Id: settings.h,v 1.12 2007-04-11 18:42:25 quinn Exp $
+/* $Id: settings.h,v 1.13 2007-04-11 19:55:57 quinn Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -41,7 +41,6 @@ struct setting
     char *target;
     char *name;
     char *value;
-    char *user;
     struct setting *next;
 };