X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcharsets.c;h=5fa6c39d16064daedb686e1fc4a45880fc581d27;hb=91332b13d81ec4e70f547c8b90eabfb7898ea39c;hp=01995140b9c8703d05e472b670147fc3ac82025e;hpb=9e586c9793e3f4846f7307ac3a76537dec1aa43d;p=pazpar2-moved-to-github.git

diff --git a/src/charsets.c b/src/charsets.c
index 0199514..5fa6c39 100644
--- a/src/charsets.c
+++ b/src/charsets.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2011 Index Data
+   Copyright (C) 2006-2012 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
@@ -160,23 +160,26 @@ int pp2_charset_fact_define(pp2_charset_fact_t pft,
 {
     int r;
     pp2_charset_t pct;
-    xmlChar *id;
+    xmlChar *id = 0;
 
     assert(xml_node);
     pct = pp2_charset_create_xml(xml_node);
     if (!pct)
         return -1;
-    id = xmlGetProp(xml_node, (xmlChar*) "id");
-    if (id)
-        default_id = (const char *) id;
     if (!default_id)
     {
-        yaz_log(YLOG_WARN, "Missing id for icu_chain");
-        pp2_charset_destroy(pct);
-        return -1;
+        id = xmlGetProp(xml_node, (xmlChar*) "id");
+        if (!id)
+        {
+            yaz_log(YLOG_WARN, "Missing id for icu_chain");
+            pp2_charset_destroy(pct);
+            return -1;
+        }
+        default_id = (const char *) id;
     }
     r = pp2_charset_fact_add(pft, pct, default_id);
-    xmlFree(id);
+    if (id)
+        xmlFree(id);
     return r;
 }
 
@@ -198,7 +201,7 @@ pp2_charset_t pp2_charset_create_xml(xmlNode *xml_node)
         //xmlChar *xmlstr = 0;
                 //int size = 0;
                 //xmlDocDumpMemory(icu_doc, size);
-        
+
         yaz_log(YLOG_FATAL, "Could not parse ICU chain config:\n"
                 "<%s>\n ... \n</%s>",
                 xml_node->name, xml_node->name);
@@ -209,7 +212,7 @@ pp2_charset_t pp2_charset_create_xml(xmlNode *xml_node)
     yaz_log(YLOG_FATAL, "Error: ICU support requested with element:\n"
             "<%s>\n ... \n</%s>",
             xml_node->name, xml_node->name);
-    yaz_log(YLOG_FATAL, 
+    yaz_log(YLOG_FATAL,
             "But no ICU support is compiled into the YAZ library.");
     return 0;
 #endif // YAZ_HAVE_ICU
@@ -283,14 +286,14 @@ pp2_charset_token_t pp2_charset_tokenize(pp2_charset_t pct)
 
 void pp2_charset_token_first(pp2_charset_token_t prt,
                              const char *buf, int skip_article)
-{ 
+{
     if (skip_article)
     {
         const char *p = buf;
         char firstword[64];
         char *pout = firstword;
         char articles[] = "the den der die des an a "; // must end in space
-        
+
         for (; *p && *p != ' ' && pout - firstword < (sizeof(firstword)-2); p++)
             *pout++ = tolower(*(unsigned char *)p);
         *pout++ = ' ';
@@ -319,9 +322,9 @@ void pp2_charset_token_destroy(pp2_charset_token_t prt)
     if (prt->iter)
         icu_iter_destroy(prt->iter);
 #endif
-    if(prt->norm_str) 
+    if(prt->norm_str)
         wrbuf_destroy(prt->norm_str);
-    if(prt->sort_str) 
+    if(prt->sort_str)
         wrbuf_destroy(prt->sort_str);
     xfree(prt);
 }
@@ -382,7 +385,7 @@ static const char *pp2_get_sort_ascii(pp2_charset_token_t prt)
         char *tmp = xstrdup(prt->last_cp);
         char *result = 0;
         result = normalize7bit_mergekey(tmp);
-        
+
         wrbuf_rewind(prt->sort_str);
         wrbuf_puts(prt->sort_str, result);
         xfree(tmp);