projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
[yaz-moved-to-github.git]
/
include
/
yaz
/
srw.h
diff --git
a/include/yaz/srw.h
b/include/yaz/srw.h
index
7662818
..
0741cb3
100644
(file)
--- a/
include/yaz/srw.h
+++ b/
include/yaz/srw.h
@@
-1,5
+1,5
@@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2009 Index Data.
* All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@@
-24,7
+24,6
@@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* $Id: srw.h,v 1.36 2007-09-09 05:54:45 adam Exp $ */
/**
* \file srw.h
/**
* \file srw.h
@@
-55,7
+54,7
@@
typedef struct {
#define Z_SRW_recordPacking_URL 2
char *recordData_buf;
int recordData_len;
#define Z_SRW_recordPacking_URL 2
char *recordData_buf;
int recordData_len;
- int *recordPosition;
+ Odr_int *recordPosition;
} Z_SRW_record;
typedef struct {
} Z_SRW_record;
typedef struct {
@@
-85,27
+84,27
@@
typedef struct {
char *sortKeys;
char *xSortKeys;
} sort;
char *sortKeys;
char *xSortKeys;
} sort;
- int *startRecord;
- int *maximumRecords;
+ Odr_int *startRecord;
+ Odr_int *maximumRecords;
char *recordSchema;
char *recordPacking;
char *recordXPath;
char *database;
char *stylesheet;
char *recordSchema;
char *recordPacking;
char *recordXPath;
char *database;
char *stylesheet;
- int *resultSetTTL;
+ Odr_int *resultSetTTL;
} Z_SRW_searchRetrieveRequest;
typedef struct {
} Z_SRW_searchRetrieveRequest;
typedef struct {
- int * numberOfRecords;
+ Odr_int *numberOfRecords;
char * resultSetId;
char * resultSetId;
- int * resultSetIdleTime;
+ Odr_int *resultSetIdleTime;
Z_SRW_record *records;
int num_records;
Z_SRW_diagnostic *diagnostics;
int num_diagnostics;
Z_SRW_record *records;
int num_records;
Z_SRW_diagnostic *diagnostics;
int num_diagnostics;
- int *nextRecordPosition;
+ Odr_int *nextRecordPosition;
Z_SRW_extra_record **extra_records; /* of size num_records */
} Z_SRW_searchRetrieveResponse;
Z_SRW_extra_record **extra_records; /* of size num_records */
} Z_SRW_searchRetrieveResponse;
@@
-130,15
+129,15
@@
typedef struct {
char *xcql;
char *pqf;
} scanClause;
char *xcql;
char *pqf;
} scanClause;
- int *responsePosition;
- int *maximumTerms;
+ Odr_int *responsePosition;
+ Odr_int *maximumTerms;
char *stylesheet;
char *database;
} Z_SRW_scanRequest;
typedef struct {
char *value;
char *stylesheet;
char *database;
} Z_SRW_scanRequest;
typedef struct {
char *value;
- int *numberOfRecords;
+ Odr_int *numberOfRecords;
char *displayTerm;
char *whereInList;
} Z_SRW_scanTerm;
char *displayTerm;
char *whereInList;
} Z_SRW_scanTerm;
@@
-169,6
+168,13
@@
typedef struct {
char *stylesheet;
} Z_SRW_updateRequest;
char *stylesheet;
} Z_SRW_updateRequest;
+typedef struct Z_SRW_extra_arg Z_SRW_extra_arg;
+struct Z_SRW_extra_arg {
+ char *name;
+ char *value;
+ Z_SRW_extra_arg *next;
+};
+
typedef struct {
char *operationStatus;
char *recordId;
typedef struct {
char *operationStatus;
char *recordId;
@@
-206,7
+212,9
@@
typedef struct {
char *srw_version;
char *username; /* From HTTP header or request */
char *password; /* From HTTP header or request */
char *srw_version;
char *username; /* From HTTP header or request */
char *password; /* From HTTP header or request */
- char *extra_args; /* For SRU GET/POST only */
+ Z_SRW_extra_arg *extra_args; /* extraRequestData SRU GET/POST */
+ char *extraResponseData_buf;
+ int extraResponseData_len;
} Z_SRW_PDU;
YAZ_EXPORT int yaz_srw_codec(ODR o, void * pptr,
} Z_SRW_PDU;
YAZ_EXPORT int yaz_srw_codec(ODR o, void * pptr,
@@
-230,9
+238,18
@@
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);
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);
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,
YAZ_EXPORT void yaz_uri_val_int(const char *path, const char *name,
- ODR o, int **intp);
+ 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,
+ char **name, char **value);
+
YAZ_EXPORT int yaz_srw_decode(Z_HTTP_Request *hreq, Z_SRW_PDU **srw_pdu,
Z_SOAP **soap_package, ODR decode, char **charset);
YAZ_EXPORT int yaz_sru_decode(Z_HTTP_Request *hreq, Z_SRW_PDU **srw_pdu,
YAZ_EXPORT int yaz_srw_decode(Z_HTTP_Request *hreq, Z_SRW_PDU **srw_pdu,
Z_SOAP **soap_package, ODR decode, char **charset);
YAZ_EXPORT int yaz_sru_decode(Z_HTTP_Request *hreq, Z_SRW_PDU **srw_pdu,
@@
-269,6
+286,10
@@
YAZ_EXPORT int yaz_sru_soap_encode(Z_HTTP_Request *hreq, Z_SRW_PDU *srw_pdu,
YAZ_EXPORT char *yaz_negotiate_sru_version(char *input_ver);
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);
+
+
#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_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/"
@@
-282,6
+303,9
@@
int sru_decode_surrogate_diagnostics(const char *buf, size_t len,
Z_SRW_diagnostic **diag,
int *num, ODR odr);
Z_SRW_diagnostic **diag,
int *num, ODR odr);
+YAZ_EXPORT
+void yaz_mk_sru_surrogate(ODR o, Z_SRW_record *record, int pos,
+ int code, const char *details);
YAZ_END_CDECL
YAZ_END_CDECL
@@
-290,6
+314,7
@@
YAZ_END_CDECL
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab