Accept charset for "string" type in yaz_record

[phpyaz-moved-to-github.git] / php_yaz.c

diff --git a/php_yaz.c b/php_yaz.c
index d55930b..3dfdd5d 100644 (file)
--- a/php_yaz.c
+++ b/php_yaz.c
@@ -1337,18 +1337,23 @@ PHP_FUNCTION(yaz_record)
 
        if (p && p->zoom_set) {
                ZOOM_record r;
 
        if (p && p->zoom_set) {
                ZOOM_record r;

-               char type_args[4][60];  /*  0; 1=2,3  (1 is assumed charset) */
-               type_args[0][0] = 0;
-               type_args[1][0] = 0;
-               type_args[2][0] = 0;
-               type_args[3][0] = 0;
-               sscanf(type, "%59[^;];%59[^=]=%59[^,],%59[^,]", type_args[0],
-                          type_args[1], type_args[2], type_args[3]);

                r = ZOOM_resultset_record(p->zoom_set, pos-1);
                r = ZOOM_resultset_record(p->zoom_set, pos-1);

-               if (!strcmp(type_args[0], "string")) {
-                       type = "render";
-               }

                if (r) {
                if (r) {

+                       char *type_tmp = 0;
+                       char type_args[4][60];  /*  0; 1=2,3  (1 is assumed charset) */
+                       type_args[0][0] = 0;
+                       type_args[1][0] = 0;
+                       type_args[2][0] = 0;
+                       type_args[3][0] = 0;
+                       sscanf(type, "%59[^;];%59[^=]=%59[^,],%59[^,]", type_args[0],
+                          type_args[1], type_args[2], type_args[3]);
+
+                       if (!strcmp(type_args[0], "string")) {
+                               type_tmp = xstrdup(type);
+                               strcpy(type_tmp, "render");
+                               strcat(type_tmp, type + 6);
+                               type = type_tmp;
+                       }

                        if (!strcmp(type_args[0], "array") ||
                                !strcmp(type_args[0], "array1"))
                        {
                        if (!strcmp(type_args[0], "array") ||
                                !strcmp(type_args[0], "array1"))
                        {

@@ -1373,6 +1378,7 @@ PHP_FUNCTION(yaz_record)
                                                                         "to return record with type given", type);
                                }
                        }
                                                                         "to return record with type given", type);
                                }
                        }

+                       xfree(type_tmp);

                }
        }
        release_assoc(p);
                }
        }
        release_assoc(p);