X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fsrw.c;h=4013458899a864e6d3a545fa540d7b7e87b47ebc;hb=b51665819b5685aeeac61d30aee5e66f1af7a4cc;hp=f7fb9275f77682707def6fefc65aadc2772f24d0;hpb=d48a2b1b196d0964a538ba6684886f86036dce14;p=yaz-moved-to-github.git

diff --git a/src/srw.c b/src/srw.c
index f7fb927..4013458 100644
--- a/src/srw.c
+++ b/src/srw.c
@@ -852,6 +852,7 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
                 odr_malloc(o, sizeof(*res));
 
             res->numberOfRecords = 0;
+            res->resultCountPrecision = 0;
             res->resultSetId = 0;
             res->resultSetIdleTime = 0;
             res->records = 0;
@@ -874,12 +875,18 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
                 else if (match_xsd_integer(ptr, "numberOfRecords", o,
                                            &res->numberOfRecords))
                     ;
+                else if (match_xsd_string(ptr, "resultCountPrecision", o,
+                                           &res->resultCountPrecision))
+                    ;
                 else if (match_xsd_string(ptr, "resultSetId", o,
                                           &res->resultSetId))
                     ;
                 else if (match_xsd_integer(ptr, "resultSetIdleTime", o,
                                            &res->resultSetIdleTime))
                     ;
+                else if (match_xsd_integer(ptr, "resultSetTTL", o,
+                                           &res->resultSetIdleTime))
+                    ;
                 else if (match_element(ptr, "records"))
                     yaz_srw_records(o, ptr, &res->records,
                                     &res->extra_records,
@@ -1063,9 +1070,7 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
             ns_srw = xmlNewNs(ptr, BAD_CAST ns, BAD_CAST "zs");
             xmlSetNs(ptr, ns_srw);
 
-            if (!version2)
-                add_xsd_string(ptr, "version", (*p)->srw_version);
-
+            add_xsd_string(ptr, "version", (*p)->srw_version);
             if (version2)
             {
                 if (queryType)
@@ -1116,11 +1121,12 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
             ns_srw = xmlNewNs(ptr, BAD_CAST ns, BAD_CAST "zs");
             xmlSetNs(ptr, ns_srw);
 
-            if (!version2)
-                add_xsd_string(ptr, "version", (*p)->srw_version);
+            add_xsd_string(ptr, "version", (*p)->srw_version);
             add_xsd_integer(ptr, "numberOfRecords", res->numberOfRecords);
             add_xsd_string(ptr, "resultSetId", res->resultSetId);
-            add_xsd_integer(ptr, "resultSetIdleTime", res->resultSetIdleTime);
+            add_xsd_integer(ptr,
+                            version2 ? "resultSetTTL" : "resultSetIdleTime" ,
+                            res->resultSetIdleTime);
             if (res->num_records)
             {
                 xmlNodePtr rptr = xmlNewChild(ptr, 0, BAD_CAST "records", 0);
@@ -1137,6 +1143,9 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
                 yaz_srw_diagnostics(o, rptr, &res->diagnostics,
                                     &res->num_diagnostics, client_data, ns);
             }
+            if (res->resultCountPrecision)
+                add_xsd_string(ptr, "resultCountPrecision",
+                               res->resultCountPrecision);
         }
         else if ((*p)->which == Z_SRW_explain_request)
         {
@@ -1145,8 +1154,7 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
             ns_srw = xmlNewNs(ptr, BAD_CAST ns, BAD_CAST "zs");
             xmlSetNs(ptr, ns_srw);
 
-            if (!version2)
-                add_xsd_string(ptr, "version", (*p)->srw_version);
+            add_xsd_string(ptr, "version", (*p)->srw_version);
             if (version2)
             {
                 add_xsd_string(ptr, "recordXMLEscaping", req->recordPacking);
@@ -1189,10 +1197,9 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
             ns_srw = xmlNewNs(ptr, BAD_CAST ns, BAD_CAST "zs");
             xmlSetNs(ptr, ns_srw);
 
-            if (!version2)
-                add_xsd_string(ptr, "version", (*p)->srw_version);
+            add_xsd_string(ptr, "version", (*p)->srw_version);
 
-            if (strcmp((*p)->srw_version, "2.") > 0)
+            if (version2)
             {
                 if (queryType && strcmp(queryType, "cql"))
                     add_xsd_string(ptr, "queryType", queryType);
@@ -1219,9 +1226,7 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
             ns_srw = xmlNewNs(ptr, BAD_CAST ns, BAD_CAST "zs");
             xmlSetNs(ptr, ns_srw);
 
-            if (!version2)
-                add_xsd_string(ptr, "version", (*p)->srw_version);
-
+            add_xsd_string(ptr, "version", (*p)->srw_version);
             if (res->num_terms)
             {
                 xmlNodePtr rptr = xmlNewChild(ptr, 0, BAD_CAST "terms", 0);