X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=include%2Fyaz%2Fsrw.h;h=ae419ca4343743f8651a71260044ab5b6566b2cb;hp=743c1d0513e201770ab240a64aea38d8c7d6a815;hb=8375be590a8640cd5673106bc828dd6d4711be28;hpb=799ea46466fc7433ce75d7c66d796b5a0997f59c

diff --git a/include/yaz/srw.h b/include/yaz/srw.h
index 743c1d0..ae419ca 100644
--- a/include/yaz/srw.h
+++ b/include/yaz/srw.h
@@ -37,7 +37,7 @@
 #include <yaz/zgdu.h>
 #include <yaz/diagsrw.h>
 #include <yaz/diagsru_update.h>
-#include "facet.h"
+#include <yaz/facet.h>
 
 YAZ_BEGIN_CDECL
 
@@ -55,12 +55,6 @@ typedef struct {
 #define Z_SRW_recordPacking_XML 1
 #define Z_SRW_recordPacking_URL 2
 
-#if 0
-    int packing;   /* recordPacking in SRU 2.0 */
-#define Z_SRW_packed   0
-#define Z_SRW_unpacked     1
-#endif
-
     char *recordData_buf;
     int recordData_len;
     Odr_int *recordPosition;
@@ -102,6 +96,7 @@ typedef struct {
 
 typedef struct {
     Odr_int *numberOfRecords;
+    char *resultCountPrecision;
     char * resultSetId;
     Odr_int *resultSetIdleTime;
 
@@ -243,13 +238,6 @@ YAZ_EXPORT int yaz_diag_srw_to_bib1(int srw_code);
 YAZ_EXPORT const char *yaz_srw_pack_to_str(int pack);
 YAZ_EXPORT int yaz_srw_str_to_pack(const char *str);
 
-/** \brief deprecated */
-YAZ_EXPORT char *yaz_uri_val(const char *path, const char *name, ODR o);
-
-/** \brief deprecated */
-YAZ_EXPORT void yaz_uri_val_int(const char *path, const char *name,
-                                ODR o, Odr_int **intp);
-
 YAZ_EXPORT int yaz_uri_to_array(const char *path, ODR o,
                                 char ***name, char ***val);
 YAZ_EXPORT void yaz_array_to_uri(char **path, ODR o,
@@ -326,8 +314,6 @@ YAZ_EXPORT int yaz_sru_soap_encode(Z_HTTP_Request *hreq, Z_SRW_PDU *srw_pdu,
 YAZ_EXPORT int yaz_solr_encode_request(Z_HTTP_Request *hreq, Z_SRW_PDU *srw_pdu,
                                        ODR encode, const char *charset);
 
-YAZ_EXPORT char *yaz_negotiate_sru_version(char *input_ver);
-
 YAZ_EXPORT
 void yaz_encode_sru_extra(Z_SRW_PDU *sr, ODR odr, const char *extra_args);
 
@@ -335,6 +321,7 @@ void yaz_encode_sru_extra(Z_SRW_PDU *sr, ODR odr, const char *extra_args);
 #define YAZ_XMLNS_SRU_v1_0 "http://www.loc.gov/zing/srw/v1.0/"
 #define YAZ_XMLNS_SRU_v1_1 "http://www.loc.gov/zing/srw/"
 #define YAZ_XMLNS_DIAG_v1_1 "http://www.loc.gov/zing/srw/diagnostic/"
+#define YAZ_XMLNS_DIAG_v2 "http://docs.oasis-open.org/ns/search-ws/diagnostic"
 #define YAZ_XMLNS_UPDATE_v0_9 "http://www.loc.gov/zing/srw/update/"
 #define YAZ_XMLNS_SRU_v2_mask "http://docs.oasis-open.org/ns/search-ws/*"
 #define YAZ_XMLNS_SRU_v1_response "http://www.loc.gov/*"