Changed yaz_record_conv_record to be reentrant.

[yaz-moved-to-github.git] / src / record_conv.c

diff --git a/src/record_conv.c b/src/record_conv.c
index ab5f173..fd250e5 100644 (file)
--- a/src/record_conv.c
+++ b/src/record_conv.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2005-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: record_conv.c,v 1.17 2007-12-16 11:08:51 adam Exp $
  */
 /**
  * \file record_conv.c
@@ -71,7 +69,8 @@ struct yaz_record_conv_rule {
         } xslt;
 #endif
         struct {
-            yaz_iconv_t iconv_t;
+            const char *input_charset;
+            const char *output_charset;
             int input_format;
             int output_format;
         } marc;
@@ -88,8 +87,7 @@ static void yaz_record_conv_reset(yaz_record_conv_t p)
     {
         if (r->which == YAZ_RECORD_CONV_RULE_MARC)
         {
-            if (r->u.marc.iconv_t)
-                yaz_iconv_close(r->u.marc.iconv_t);
+            ;
         }
 #if YAZ_HAVE_XSLT
         else if (r->which == YAZ_RECORD_CONV_RULE_XSLT)
@@ -178,21 +176,28 @@ static int conv_xslt(yaz_record_conv_t p, const xmlNode *ptr)
         if (!yaz_filepath_resolve(stylesheet, p->path, 0, fullpath))
         {
             wrbuf_printf(p->wr_error, "Element <xslt stylesheet=\"%s\"/>:"
-                         " could not locate stylesheet '%s' with path '%s'",
-                         stylesheet, fullpath, p->path);
+                         " could not locate stylesheet '%s'",
+                         stylesheet, fullpath);
+            if (p->path)
+                wrbuf_printf(p->wr_error, " with path '%s'", p->path);
+                
             return -1;
         }
         xsp = xsltParseStylesheetFile((xmlChar*) fullpath);
         if (!xsp)
         {
-            wrbuf_printf(p->wr_error, "Element <xslt stylesheet=\"%s\"/>:"
-                         " parsing stylesheet '%s' with path '%s' failed,"
+            wrbuf_printf(p->wr_error, "Element: <xslt stylesheet=\"%s\"/>:"
+                         " xslt parse failed: %s", stylesheet, fullpath);
+            if (p->path)
+                wrbuf_printf(p->wr_error, " with path '%s'", p->path);
+            wrbuf_printf(p->wr_error, " ("
 #if YAZ_HAVE_EXSLT
-                         " EXSLT enabled",
+                         
+                         "EXSLT enabled"
 #else
-                         " EXSLT not supported",
+                         "EXSLT not supported"
 #endif
-                         stylesheet, fullpath, p->path);
+                         ")");
             return -1;
         }
         else
@@ -221,7 +226,6 @@ static int conv_marc(yaz_record_conv_t p, const xmlNode *ptr)
     int input_format_mode = 0;
     int output_format_mode = 0;
     struct yaz_record_conv_rule *r;
-    yaz_iconv_t cd = 0;
 
     for (attr = ptr->properties; attr; attr = attr->next)
     {
@@ -310,7 +314,7 @@ static int conv_marc(yaz_record_conv_t p, const xmlNode *ptr)
     }
     if (input_charset && output_charset)
     {
-        cd = yaz_iconv_open(output_charset, input_charset);
+        yaz_iconv_t cd = yaz_iconv_open(output_charset, input_charset);
         if (!cd)
         {
             wrbuf_printf(p->wr_error, 
@@ -320,6 +324,7 @@ static int conv_marc(yaz_record_conv_t p, const xmlNode *ptr)
                          input_charset, output_charset);
             return -1;
         }
+        yaz_iconv_close(cd);
     }
     else if (input_charset)
     {
@@ -334,8 +339,9 @@ static int conv_marc(yaz_record_conv_t p, const xmlNode *ptr)
         return -1;
     }
     r = add_rule(p, YAZ_RECORD_CONV_RULE_MARC);
-    r->u.marc.iconv_t = cd;
 
+    r->u.marc.input_charset = nmem_strdup(p->nmem, input_charset);
+    r->u.marc.output_charset = nmem_strdup(p->nmem, output_charset);
     r->u.marc.input_format = input_format_mode;
     r->u.marc.output_format = output_format_mode;
     return 0;
@@ -383,23 +389,33 @@ int yaz_record_conv_opac_record(yaz_record_conv_t p,
 {
     int ret = 0;
     struct yaz_record_conv_rule *r = p->rules;
-    WRBUF res = wrbuf_alloc();
-    yaz_marc_t mt = yaz_marc_create();
-    
-    wrbuf_rewind(p->wr_error);
-    yaz_marc_xml(mt, r->u.marc.output_format);
-    if (r->u.marc.iconv_t)
-        yaz_marc_iconv(mt, r->u.marc.iconv_t);
-    yaz_opac_decode_wrbuf(mt, input_record, res);
-    if (ret != -1)
+    if (!r || r->which != YAZ_RECORD_CONV_RULE_MARC)
+        ret = -1; /* no marc rule so we can't do OPAC */
+    else
     {
-        ret = yaz_record_conv_record_rule(p, 
-                                          r->next,
-                                          wrbuf_buf(res), wrbuf_len(res),
-                                          output_record);
+        WRBUF res = wrbuf_alloc();
+        yaz_marc_t mt = yaz_marc_create();
+        yaz_iconv_t cd = yaz_iconv_open(r->u.marc.output_charset,
+                                        r->u.marc.input_charset);
+        
+        wrbuf_rewind(p->wr_error);
+        yaz_marc_xml(mt, r->u.marc.output_format);
+        
+        yaz_marc_iconv(mt, cd);
+        
+        yaz_opac_decode_wrbuf(mt, input_record, res);
+        if (ret != -1)
+        {
+            ret = yaz_record_conv_record_rule(p, 
+                                              r->next,
+                                              wrbuf_buf(res), wrbuf_len(res),
+                                              output_record);
+        }
+        yaz_marc_destroy(mt);
+        if (cd)
+            yaz_iconv_close(cd);
+        wrbuf_destroy(res);
     }
-    yaz_marc_destroy(mt);
-    wrbuf_destroy(res);
     return ret;
 }
 
@@ -428,12 +444,15 @@ static int yaz_record_conv_record_rule(yaz_record_conv_t p,
     {
         if (r->which == YAZ_RECORD_CONV_RULE_MARC)
         {
+            yaz_iconv_t cd = 
+                yaz_iconv_open(r->u.marc.output_charset,
+                               r->u.marc.input_charset);
             yaz_marc_t mt = yaz_marc_create();
 
             yaz_marc_xml(mt, r->u.marc.output_format);
 
-            if (r->u.marc.iconv_t)
-                yaz_marc_iconv(mt, r->u.marc.iconv_t);
+            if (cd)
+                yaz_marc_iconv(mt, cd);
             if (r->u.marc.input_format == YAZ_MARC_ISO2709)
             {
                 int sz = yaz_marc_read_iso2709(mt, wrbuf_buf(record),
@@ -472,6 +491,8 @@ static int yaz_record_conv_record_rule(yaz_record_conv_t p,
                 if (ret)
                     wrbuf_printf(p->wr_error, "yaz_marc_write_mode failed");
             }
+            if (cd)
+                yaz_iconv_close(cd);
             yaz_marc_destroy(mt);
         }
 #if YAZ_HAVE_XSLT