From: Sebastian Hammer <quinn@indexdata.com>
Date: Fri, 13 Apr 2007 00:29:14 +0000 (+0000)
Subject: Bad pointer assignment in prepare_yazmarc
X-Git-Tag: PAZPAR2.1.0.0~312
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=8386ad4d5d4f7cfd44fba1bc34b54a5e1e917fdd;p=pazpar2-moved-to-github.git

Bad pointer assignment in prepare_yazmarc
---

diff --git a/src/database.c b/src/database.c
index 0f18865..67e7ea2 100644
--- a/src/database.c
+++ b/src/database.c
@@ -1,4 +1,4 @@
-/* $Id: database.c,v 1.17 2007-04-12 10:17:53 marc Exp $
+/* $Id: database.c,v 1.18 2007-04-13 00:29:14 quinn Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -329,8 +329,8 @@ static void prepare_yazmarc(void *ignore, struct database *db)
             yaz_marc_subfield_str(db->yaz_marc, "\t");
 
             // See if a native encoding is specified
-            if ((s = db->settings[PZ_ENCODING]))
-                encoding = s->value;
+            if (db->settings[PZ_ENCODING])
+                encoding = db->settings[PZ_ENCODING]->value;
             
             cm = yaz_iconv_open("utf-8", encoding);
             if (!cm)