X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fsrwtst.c;h=9208cd68c8fb8b9f44796cd7ea9e40916aee6de6;hb=394286df42e6e2c01e5b1b446ae1cf8d0b117f35;hp=1524abc4417ddd455f1e120504a54c35ac5deff5;hpb=fb6d99a0c7e07d9cc4a315c447deaf6564a85505;p=yaz-moved-to-github.git

diff --git a/util/srwtst.c b/util/srwtst.c
index 1524abc..9208cd6 100644
--- a/util/srwtst.c
+++ b/util/srwtst.c
@@ -1,14 +1,12 @@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: srwtst.c,v 1.4 2005-06-25 15:46:07 adam Exp $
  */
 
 #include <stdlib.h>
 #include <yaz/srw.h>
 
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
 Z_SOAP_Handler h[2] = {
     {"http://www.loc.gov/zing/srw/v1.0/", 0, (Z_SOAP_fun) yaz_srw_codec},
     {0, 0, 0}
@@ -25,7 +23,6 @@ int main(int argc, char **argv)
     ODR decode, encode;
     int debug = 0;
 
-    nmem_init();
     if (argc == 2 && !strcmp(argv[1], "debug"))
         debug = 1;
     no = fread(buf, 1, sizeof(buf), stdin);
@@ -50,7 +47,7 @@ int main(int argc, char **argv)
         if (soap_package->which == Z_SOAP_generic &&
             soap_package->u.generic->no == 0)
         {
-            Z_SRW_PDU *sr = soap_package->u.generic->p;
+            Z_SRW_PDU *sr = (Z_SRW_PDU *) soap_package->u.generic->p;
             if (sr->which == Z_SRW_searchRetrieve_request)
             { 
                 Z_SRW_searchRetrieveRequest *req = sr->u.request;
@@ -77,8 +74,11 @@ int main(int argc, char **argv)
                     {
                         fprintf (stderr, "%d\n", i);
                         if (res->records[i].recordData_buf)
-                            fwrite(res->records[i].recordData_buf, 1,
-                                   res->records[i].recordData_len, stderr);
+                        {
+                            fprintf(stderr, "%.*s",
+                                    res->records[i].recordData_len,
+                                    res->records[i].recordData_buf);
+                        }
                     }
                 }
             }
@@ -88,7 +88,9 @@ int main(int argc, char **argv)
     ret = z_soap_codec(encode, &soap_package,
                        &content_buf, &content_len, h);
     if (content_buf && content_len)
-        fwrite (content_buf, content_len, 1, stdout);
+    {
+        printf("%.*s", content_len, content_buf);
+    }
     else
     {
         fprintf(stderr, "No output!\n");
@@ -96,7 +98,6 @@ int main(int argc, char **argv)
     }
     odr_destroy(decode);
     odr_destroy(encode);
-    nmem_exit();
     exit(0);
 }
 #else