Added one type cast from char to unsigned char

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

diff --git a/src/record_conv.c b/src/record_conv.c
index 9cb2e4c..94447f5 100644 (file)
--- a/src/record_conv.c
+++ b/src/record_conv.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2005-2006, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: record_conv.c,v 1.7 2006-05-08 10:16:47 adam Exp $
+ * $Id: record_conv.c,v 1.10 2006-05-26 15:07:08 adam Exp $
  */
 /**
  * \file record_conv.c
@@ -113,7 +113,7 @@ yaz_record_conv_t yaz_record_conv_create()
     p->path = 0;
 
 #if HAVE_EXSLT
-    exsltDynRegister();
+    exsltRegisterAll(); 
 #endif
     yaz_record_conv_reset(p);
     return p;
@@ -440,19 +440,33 @@ int yaz_record_conv_record(yaz_record_conv_t p,
                 xmlDocPtr res = xsltApplyStylesheet(r->u.xslt.xsp, doc, 0);
                 if (res)
                 {
-                    xmlChar *out_buf;
+                    xmlChar *out_buf = 0;
                     int out_len;
-                    xmlDocDumpFormatMemory (res, &out_buf, &out_len, 1);
-
-                    wrbuf_rewind(record);
-                    wrbuf_write(record, (const char *) out_buf, out_len);
 
-                    xmlFree(out_buf);
+#if HAVE_XSLTSAVERESULTTOSTRING
+                    xsltSaveResultToString(&out_buf, &out_len, res,
+                                           r->u.xslt.xsp); 
+#else
+                    xmlDocDumpFormatMemory (res, &out_buf, &out_len, 1);
+#endif
+                    if (!out_buf)
+                    {
+                        wrbuf_printf(p->wr_error,
+                                     "xsltSaveResultToString failed");
+                        ret = -1;
+                    }
+                    else
+                    {
+                        wrbuf_rewind(record);
+                        wrbuf_write(record, (const char *) out_buf, out_len);
+                        
+                        xmlFree(out_buf);
+                    }
                     xmlFreeDoc(res);
                 }
                 else
                 {
-                    wrbuf_printf(p->wr_error, "xsltApplyStylesheet faailed");
+                    wrbuf_printf(p->wr_error, "xsltApplyStylesheet failed");
                     ret = -1;
                 }
                 xmlFreeDoc(doc);