record_render: simplify buffer return handling

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

diff --git a/src/record_render.c b/src/record_render.c
index 291462b..37fc9f5 100644 (file)
--- a/src/record_render.c
+++ b/src/record_render.c
@@ -22,8 +22,10 @@
 #include <yaz/nmem_xml.h>
 #include <yaz/base64.h>
 
+#if YAZ_HAVE_XML2
 #include <libxml/xpath.h>
 #include <libxml/xpathInternals.h>
+#endif
 
 static yaz_iconv_t iconv_create_charset(const char *record_charset,
                                         yaz_iconv_t *cd2)
@@ -32,7 +34,7 @@ static yaz_iconv_t iconv_create_charset(const char *record_charset,
     yaz_iconv_t cd = 0;
     char *from_set1 = 0;
     char *from_set2 = 0;
-    char *to_set = 0;
+    char *to_set = "utf-8";
     if (record_charset && *record_charset)
     {
         char *cp = charset_buf;
@@ -60,11 +62,11 @@ static yaz_iconv_t iconv_create_charset(const char *record_charset,
     }
     
     if (from_set1)
-        cd = yaz_iconv_open(to_set ? to_set : "UTF-8", from_set1);
+        cd = yaz_iconv_open(to_set, from_set1);
     if (cd2)
     {
         if (from_set2)
-            *cd2 = yaz_iconv_open(to_set ? to_set : "UTF-8", from_set2);
+            *cd2 = yaz_iconv_open(to_set, from_set2);
         else
             *cd2 = 0;
     }
@@ -86,8 +88,7 @@ static const char *return_marc_record(WRBUF wrbuf,
     yaz_marc_xml(mt, marc_type);
     if (yaz_marc_decode_wrbuf(mt, buf, sz, wrbuf) > 0)
     {
-        if (len)
-            *len = wrbuf_len(wrbuf);
+        *len = wrbuf_len(wrbuf);
         ret_string = wrbuf_cstr(wrbuf);
     }
     yaz_marc_destroy(mt);
@@ -121,8 +122,7 @@ static const char *return_opac_record(WRBUF wrbuf,
         yaz_iconv_close(cd);
     if (cd2)
         yaz_iconv_close(cd2);
-    if (len)
-        *len = wrbuf_len(wrbuf);
+    *len = wrbuf_len(wrbuf);
     return wrbuf_cstr(wrbuf);
 }
 
@@ -142,8 +142,7 @@ static const char *return_string_record(WRBUF wrbuf,
         sz = wrbuf_len(wrbuf);
         yaz_iconv_close(cd);
     }
-    if (len)
-        *len = sz;
+    *len = sz;
     return buf;
 }
 
@@ -204,7 +203,7 @@ static const char *get_record_format(WRBUF wrbuf, int *len,
 {
     const char *res = return_record_wrbuf(wrbuf, len, npr, marctype, charset);
 #if YAZ_HAVE_XML2
-    if (*format == '1' && len)
+    if (*format == '1')
     {
         /* try to XML format res */
         xmlDocPtr doc;
@@ -227,6 +226,7 @@ static const char *get_record_format(WRBUF wrbuf, int *len,
     return res;
 }
 
+#if YAZ_HAVE_XML2
 static int replace_node(NMEM nmem, xmlNode *ptr,
                         const char *type_spec, char *record_buf)
 {
@@ -249,16 +249,15 @@ static int replace_node(NMEM nmem, xmlNode *ptr,
     if (res)
     {
         xmlDoc *doc = xmlParseMemory(res, strlen(res));
-        xmlNode *nptr;
         if (doc)
         {
-            nptr = xmlCopyNode(xmlDocGetRootElement(doc), 1);
+            xmlNode *nptr = xmlCopyNode(xmlDocGetRootElement(doc), 1);
             xmlReplaceNode(ptr, nptr);
             xmlFreeDoc(doc);
         }
         else
         {
-            nptr = xmlNewText(BAD_CAST res);
+            xmlNode *nptr = xmlNewText(BAD_CAST res);
             xmlReplaceNode(ptr, nptr);
         }
         ret = 0;
@@ -267,11 +266,13 @@ static int replace_node(NMEM nmem, xmlNode *ptr,
     odr_destroy(odr);
     return ret;
 }
+#endif
 
 static const char *base64_render(NMEM nmem, WRBUF wrbuf,
                                  const char *buf, int *len,
                                  const char *expr, const char *type_spec)
 {
+#if YAZ_HAVE_XML2
     xmlDocPtr doc = xmlParseMemory(buf, *len);
     if (doc)
     {
@@ -326,6 +327,7 @@ static const char *base64_render(NMEM nmem, WRBUF wrbuf,
         xmlFreeDoc(doc);
         xmlFree(buf_out);
     }
+#endif
     return buf;
 }
 
@@ -336,12 +338,15 @@ const char *yaz_record_render(Z_NamePlusRecord *npr, const char *schema,
     const char *ret = 0;
     NMEM nmem = 0;
     char *base64_xpath = 0;
-    char *base64_type_spec = 0;
     size_t i;
     char type[40];
     char charset[40];
     char format[3];
     const char *cp = type_spec;
+    int len0;
+
+    if (!len)
+        len = &len0;
 
     for (i = 0; cp[i] && cp[i] != ';' && cp[i] != ' ' && i < sizeof(type)-1;
          i++)
@@ -362,6 +367,8 @@ const char *yaz_record_render(Z_NamePlusRecord *npr, const char *schema,
         {
             size_t j = 0;
             i = i + 8; /* skip charset= */
+            while (cp[i] == ' ')
+                i++;
             for (j = 0; cp[i] && cp[i] != ';' && cp[i] != ' '; i++)
             {
                 if (j < sizeof(charset)-1)
@@ -373,6 +380,8 @@ const char *yaz_record_render(Z_NamePlusRecord *npr, const char *schema,
         {
             size_t j = 0; 
             i = i + 7;
+            while (cp[i] == ' ')
+                i++;
             for (j = 0; cp[i] && cp[i] != ';' && cp[i] != ' '; i++)
             {
                 if (j < sizeof(format)-1)
@@ -380,46 +389,28 @@ const char *yaz_record_render(Z_NamePlusRecord *npr, const char *schema,
             }
             format[j] = '\0';
         } 
-        else if (!strncmp(cp + i, "base64", 6))
+        else if (!strncmp(cp + i, "base64=", 7))
         {
-            i = i + 6;
-
+            size_t i0;
+            i = i + 7;
             while (cp[i] == ' ')
                 i++;
-            if (cp[i] == '(')
-            {
-                size_t i0;
-                nmem = nmem_create();
+            i0 = i;
+            while (cp[i] && cp[i] != ';')
                 i++;
-                while (cp[i] == ' ')
-                    i++;
-                i0 = i;
-                while (cp[i] != ',' && cp[i])
-                    i++;
-                base64_xpath = nmem_strdupn(nmem, cp + i0, i - i0);
-                if (cp[i])
-                    i++;
-                while (cp[i] == ' ')
-                    i++;
-                i0 = i;
-                while (cp[i] != ')' && cp[i])
-                    i++;
-                base64_type_spec = nmem_strdupn(nmem, cp + i0, i - i0);
-                if (cp[i])
-                    i++;
-            }
+
+            nmem = nmem_create();
+            base64_xpath = nmem_strdupn(nmem, cp + i0, i - i0);
         } 
     }
     if (!strcmp(type, "database"))
     {
-        if (len)
-            *len = (npr->databaseName ? strlen(npr->databaseName) : 0);
+        *len = (npr->databaseName ? strlen(npr->databaseName) : 0);
         ret = npr->databaseName;
     }
     else if (!strcmp(type, "schema"))
     {
-        if (len)
-            *len = schema ? strlen(schema) : 0;
+        *len = schema ? strlen(schema) : 0;
         ret = schema;
     }
     else if (!strcmp(type, "syntax"))
@@ -432,8 +423,7 @@ const char *yaz_record_render(Z_NamePlusRecord *npr, const char *schema,
         }
         if (!desc)
             desc = "none";
-        if (len)
-            *len = strlen(desc);
+        *len = strlen(desc);
         ret = desc;
     }
     if (npr->which != Z_NamePlusRecord_databaseRecord)
@@ -459,7 +449,7 @@ const char *yaz_record_render(Z_NamePlusRecord *npr, const char *schema,
     }
     else if (!strcmp(type, "ext"))
     {
-        if (len) *len = -1;
+        *len = -1;
         ret = (const char *) npr->u.databaseRecord;
     }
     else if (!strcmp(type, "opac"))
@@ -469,9 +459,18 @@ const char *yaz_record_render(Z_NamePlusRecord *npr, const char *schema,
                                     format);
     }
 
-    if (base64_xpath)
-        ret = base64_render(nmem, wrbuf,
-                            ret, len, base64_xpath, base64_type_spec);
+    if (base64_xpath && *len != -1)
+    {
+        char *type_spec = nmem_malloc(nmem,
+                                      strlen(type) + strlen(charset) + 11);
+        strcpy(type_spec, type);
+        if (*charset)
+        {
+            strcat(type_spec, "; charset=");
+            strcat(type_spec, charset);
+        }
+        ret = base64_render(nmem, wrbuf, ret, len, base64_xpath, type_spec);
+    }
     nmem_destroy(nmem);
     return ret;
 }