Fixed bug 2021: non-merged , brief meta data not included.

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

diff --git a/src/charsets.c b/src/charsets.c
index 7d41283..b2470bd 100644 (file)
--- a/src/charsets.c
+++ b/src/charsets.c
@@ -1,7 +1,5 @@
-/* $Id: charsets.c,v 1.6 2007-09-10 16:25:50 adam Exp $
-   Copyright (c) 2006-2007, Index Data.
-
-This file is part of Pazpar2.
+/* This file is part of Pazpar2.
+   Copyright (C) 2006-2008 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -14,17 +12,17 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Pazpar2; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
 
 /** \file charsets.c
     \brief Pazpar2 Character set facilities
 */
 
 #if HAVE_CONFIG_H
-#include "cconfig.h"
+#include <config.h>
 #endif
 
 #include <yaz/xmalloc.h>
@@ -72,9 +70,10 @@ pp2_charset_t pp2_charset_create_xml(xmlNode *xml_node)
 {
 #ifdef HAVE_ICU
     UErrorCode status = U_ZERO_ERROR;
+    struct icu_chain *chain = 0;
     while (xml_node && xml_node->type != XML_ELEMENT_NODE)
         xml_node = xml_node->next;
-    struct icu_chain *chain = icu_chain_xml_config(xml_node, &status);
+    chain = icu_chain_xml_config(xml_node, &status);
     if (!chain || U_FAILURE(status)){
         //xmlDocPtr icu_doc = 0;
         //xmlChar *xmlstr = 0;
@@ -90,7 +89,7 @@ pp2_charset_t pp2_charset_create_xml(xmlNode *xml_node)
 #else // HAVE_ICU
     yaz_log(YLOG_FATAL, "Error: ICU support requested with element:\n"
             "<%s>\n ... \n</%s>",
-            n->name, n->name);
+            xml_node->name, xml_node->name);
     yaz_log(YLOG_FATAL, 
             "But no ICU support compiled into pazpar2 server.");
     yaz_log(YLOG_FATAL, 
@@ -141,8 +140,8 @@ pp2_relevance_token_t pp2_relevance_tokenize(pp2_charset_t pct,
 #ifdef HAVE_ICU
     if (pct->icu_chn)
     {
-        pct->icu_sts = U_ZERO_ERROR;
         int ok = 0;
+        pct->icu_sts = U_ZERO_ERROR;
         ok = icu_chain_assign_cstr(pct->icu_chn, buf, &pct->icu_sts);
         //printf("\nfield ok: %d '%s'\n", ok, buf);
         prt->pct = pct;