X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=zutil%2Fsrw.c;h=20785630684ae14757756d5f58b3f9a49dc78e00;hb=6a9f385c94281b3dbddd612f388837c01661c5c5;hp=813908d4b2845cf310033c0b87a4ff30c9b6a71e;hpb=ba8d526ec24077c455979314147aaff20746a8ca;p=yaz-moved-to-github.git diff --git a/zutil/srw.c b/zutil/srw.c index 813908d..2078563 100644 --- a/zutil/srw.c +++ b/zutil/srw.c @@ -2,7 +2,7 @@ * Copyright (c) 2002-2003, Index Data. * See the file LICENSE for details. * - * $Id: srw.c,v 1.8 2003-03-03 19:57:37 adam Exp $ + * $Id: srw.c,v 1.9 2003-03-18 13:34:37 adam Exp $ */ #include @@ -333,7 +333,6 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data, &res->nextRecordPosition)) ; } - } else return -1; @@ -345,9 +344,12 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data, if ((*p)->which == Z_SRW_searchRetrieve_request) { Z_SRW_searchRetrieveRequest *req = (*p)->u.request; - xmlNsPtr ns_srw = xmlNewNs(pptr, ns, "zs"); - xmlNodePtr ptr = xmlNewChild(pptr, ns_srw, + xmlNodePtr ptr = xmlNewChild(pptr, 0, "searchRetrieveRequest", 0); + xmlNsPtr ns_srw = xmlNewNs(ptr, ns, "zs"); + + xmlSetNs(ptr, ns_srw); + switch(req->query_type) { case Z_SRW_query_type_cql: @@ -380,10 +382,11 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data, else if ((*p)->which == Z_SRW_searchRetrieve_response) { Z_SRW_searchRetrieveResponse *res = (*p)->u.response; - xmlNsPtr ns_srw = xmlNewNs(pptr, ns, "zs"); - xmlNodePtr ptr = xmlNewChild(pptr, ns_srw, + xmlNodePtr ptr = xmlNewChild(pptr, 0, "searchRetrieveResponse", 0); + xmlNsPtr ns_srw = xmlNewNs(ptr, ns, "zs"); + xmlSetNs(ptr, ns_srw); add_xsd_integer(ptr, "numberOfRecords", res->numberOfRecords); add_xsd_string(ptr, "resultSetId", res->resultSetId); add_xsd_integer(ptr, "resultSetIdleTime", res->resultSetIdleTime);