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
Implemented ZOOM option: recordCharset
[yaz-moved-to-github.git]
/
zutil
/
zoom-p.h
diff --git
a/zutil/zoom-p.h
b/zutil/zoom-p.h
index
b6cf2ae
..
82f1371
100644
(file)
--- a/
zutil/zoom-p.h
+++ b/
zutil/zoom-p.h
@@
-1,20
+1,25
@@
/*
* Private C header for ZOOM C.
/*
* Private C header for ZOOM C.
- * $Id: zoom-p.h,v 1.1 2002-09-16 18:45:14 adam Exp $
+ * $Id: zoom-p.h,v 1.8 2003-05-30 10:24:58 adam Exp $
*/
*/
+
+#if HAVE_XSLT
+#include <yaz/srw.h>
+#endif
+
#include <yaz/proto.h>
#include <yaz/comstack.h>
#include <yaz/wrbuf.h>
#include <yaz/zoom.h>
#include <yaz/sortspec.h>
#include <yaz/proto.h>
#include <yaz/comstack.h>
#include <yaz/wrbuf.h>
#include <yaz/zoom.h>
#include <yaz/sortspec.h>
-
typedef struct ZOOM_Event_p *ZOOM_Event;
struct ZOOM_query_p {
typedef struct ZOOM_Event_p *ZOOM_Event;
struct ZOOM_query_p {
- Z_Query *query;
+ Z_Query *z_query;
Z_SortKeySpecList *sort_spec;
int refcount;
ODR odr;
Z_SortKeySpecList *sort_spec;
int refcount;
ODR odr;
+ char *query_string;
};
#define STATE_IDLE 0
};
#define STATE_IDLE 0
@@
-26,10
+31,13
@@
struct ZOOM_query_p {
#define ZOOM_SELECT_EXCEPT 4
struct ZOOM_connection_p {
#define ZOOM_SELECT_EXCEPT 4
struct ZOOM_connection_p {
+ enum oid_proto proto;
COMSTACK cs;
char *host_port;
COMSTACK cs;
char *host_port;
+ char *path;
int error;
char *addinfo;
int error;
char *addinfo;
+ const char *diagset;
int state;
int mask;
int reconnect_ok;
int state;
int mask;
int reconnect_ok;
@@
-74,15
+82,16
@@
struct ZOOM_options_p {
typedef struct ZOOM_record_cache_p *ZOOM_record_cache;
struct ZOOM_resultset_p {
typedef struct ZOOM_record_cache_p *ZOOM_record_cache;
struct ZOOM_resultset_p {
- Z_Query *r_query;
Z_SortKeySpecList *r_sort_spec;
Z_SortKeySpecList *r_sort_spec;
- ZOOM_query search;
+ ZOOM_query query;
int refcount;
int size;
int start;
int count;
int refcount;
int size;
int start;
int count;
+ int step;
int piggyback;
char *setname;
int piggyback;
char *setname;
+ char *schema;
ODR odr;
ZOOM_record_cache record_cache;
ZOOM_options options;
ODR odr;
ZOOM_record_cache record_cache;
ZOOM_options options;
@@
-93,13
+102,16
@@
struct ZOOM_resultset_p {
struct ZOOM_record_p {
ODR odr;
WRBUF wrbuf_marc;
struct ZOOM_record_p {
ODR odr;
WRBUF wrbuf_marc;
+ WRBUF wrbuf_iconv;
Z_NamePlusRecord *npr;
Z_NamePlusRecord *npr;
+ char *record_charset;
};
struct ZOOM_record_cache_p {
struct ZOOM_record_p rec;
char *elementSetName;
char *syntax;
};
struct ZOOM_record_cache_p {
struct ZOOM_record_p rec;
char *elementSetName;
char *syntax;
+ char *schema;
int pos;
ZOOM_record_cache next;
};
int pos;
ZOOM_record_cache next;
};