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]
/
src
/
zoom-p.h
diff --git
a/src/zoom-p.h
b/src/zoom-p.h
index
f227f13
..
5c3ae57
100644
(file)
--- a/
src/zoom-p.h
+++ b/
src/zoom-p.h
@@
-35,6
+35,10
@@
#include <yaz/zoom.h>
#include <yaz/sortspec.h>
#include <yaz/srw.h>
#include <yaz/zoom.h>
#include <yaz/sortspec.h>
#include <yaz/srw.h>
+#include <yaz/mutex.h>
+
+#define SHPTR 1
+#define ZOOM_RESULT_LISTS 0
typedef struct ZOOM_Event_p *ZOOM_Event;
typedef struct ZOOM_Event_p *ZOOM_Event;
@@
-60,6
+64,10
@@
typedef struct ZOOM_task_p *ZOOM_task;
#define STATE_CONNECTING 1
#define STATE_ESTABLISHED 2
#define STATE_CONNECTING 1
#define STATE_ESTABLISHED 2
+#if ZOOM_RESULT_LISTS
+typedef struct ZOOM_resultsets_p *ZOOM_resultsets;
+#endif
+
struct ZOOM_connection_p {
enum oid_proto proto;
COMSTACK cs;
struct ZOOM_connection_p {
enum oid_proto proto;
COMSTACK cs;
@@
-99,13
+107,24
@@
struct ZOOM_connection_p {
ZOOM_task tasks;
ZOOM_options options;
ZOOM_task tasks;
ZOOM_options options;
+#if ZOOM_RESULT_LISTS
+ ZOOM_resultsets resultsets;
+#else
ZOOM_resultset resultsets;
ZOOM_resultset resultsets;
+#endif
ZOOM_Event m_queue_front;
ZOOM_Event m_queue_back;
zoom_sru_mode sru_mode;
int no_redirects; /* 0 for no redirects. >0 for number of redirects */
};
ZOOM_Event m_queue_front;
ZOOM_Event m_queue_back;
zoom_sru_mode sru_mode;
int no_redirects; /* 0 for no redirects. >0 for number of redirects */
};
+#if ZOOM_RESULT_LISTS
+struct ZOOM_resultsets_p {
+ ZOOM_resultset resultset;
+ ZOOM_resultsets next;
+};
+#endif
+
struct ZOOM_options_entry {
char *name;
char *value;
struct ZOOM_options_entry {
char *name;
char *value;
@@
-140,22
+159,29
@@
struct ZOOM_resultset_p {
ZOOM_record_cache record_hash[RECORD_HASH_SIZE];
ZOOM_options options;
ZOOM_connection connection;
ZOOM_record_cache record_hash[RECORD_HASH_SIZE];
ZOOM_options options;
ZOOM_connection connection;
- ZOOM_resultset next;
char **databaseNames;
int num_databaseNames;
char **databaseNames;
int num_databaseNames;
+ YAZ_MUTEX mutex;
+#if SHPTR
+ struct WRBUF_shptr *record_wrbuf;
+#endif
+#if ZOOM_RESULT_LISTS
+#else
+ ZOOM_resultset next;
+#endif
};
struct ZOOM_record_p {
ODR odr;
};
struct ZOOM_record_p {
ODR odr;
+#if SHPTR
+ struct WRBUF_shptr *record_wrbuf;
+#else
WRBUF wrbuf;
WRBUF wrbuf;
+#endif
+
Z_NamePlusRecord *npr;
const char *schema;
Z_NamePlusRecord *npr;
const char *schema;
-#if YAZ_HAVE_XML2
- xmlChar *xml_mem;
- int xml_size;
-#endif
-
const char *diag_uri;
const char *diag_message;
const char *diag_details;
const char *diag_uri;
const char *diag_message;
const char *diag_details;