Added odr_intdup. Ztest server returns TaskPackage for ItemUpdate.

[yaz-moved-to-github.git] / ztest / read-grs.c

diff --git a/ztest/read-grs.c b/ztest/read-grs.c
index cd4a5ae..97123e3 100644 (file)
--- a/ztest/read-grs.c
+++ b/ztest/read-grs.c
@@ -1,10 +1,18 @@
 /*
- * Copyright (c) 1995, Index Data.
+ * Copyright (c) 1995-2001, Index Data.
  * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: read-grs.c,v $
- * Revision 1.3  1999-03-31 11:18:25  adam
+ * Revision 1.6  2001-03-25 21:55:13  adam
+ * Added odr_intdup. Ztest server returns TaskPackage for ItemUpdate.
+ *
+ * Revision 1.5  1999/11/30 13:47:12  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.4  1999/08/27 09:40:32  adam
+ * Renamed logf function to yaz_log. Removed VC++ project files.
+ *
+ * Revision 1.3  1999/03/31 11:18:25  adam
  * Implemented odr_strdup. Added Reference ID to backend server API.
  *
  * Revision 1.2  1998/02/11 11:53:36  adam
@@ -30,8 +38,8 @@
 #include <ctype.h>
 #include <stdlib.h>
 
-#include <proto.h>
-#include <log.h>
+#include <yaz/proto.h>
+#include <yaz/log.h>
 
 #define GRS_MAX_FIELDS 50
 
@@ -59,7 +67,7 @@ Z_GenericRecord *read_grs1(FILE *f, ODR o)
            return r;
        if (sscanf(buf, "(%d,%[^)])", &type, value) != 2)
        {
-           logf(LOG_WARN, "Bad data in '%s'", buf);
+           yaz_log(LOG_WARN, "Bad data in '%s'", buf);
            return 0;
        }
        if (!type && *value == '0')
@@ -80,15 +88,13 @@ Z_GenericRecord *read_grs1(FILE *f, ODR o)
        }
        r->elements[r->num_elements] = t = (Z_TaggedElement *)
             odr_malloc(o, sizeof(Z_TaggedElement));
-       t->tagType = (int *)odr_malloc(o, sizeof(int));
-       *t->tagType = type;
+       t->tagType = odr_intdup(o, type);
        t->tagValue = (Z_StringOrNumeric *)
             odr_malloc(o, sizeof(Z_StringOrNumeric));
        if ((ivalue = atoi(value)))
        {
            t->tagValue->which = Z_StringOrNumeric_numeric;
-           t->tagValue->u.numeric = (int *)odr_malloc(o, sizeof(int));
-           *t->tagValue->u.numeric = ivalue;
+           t->tagValue->u.numeric = odr_intdup(o, ivalue);
        }
        else
        {