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
Add header for shared pointer: shptr.h
[yaz-moved-to-github.git]
/
src
/
zoom-p.h
diff --git
a/src/zoom-p.h
b/src/zoom-p.h
index
a464f29
..
3535221
100644
(file)
--- a/
src/zoom-p.h
+++ b/
src/zoom-p.h
@@
-35,6
+35,7
@@
#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>
typedef struct ZOOM_Event_p *ZOOM_Event;
typedef struct ZOOM_Event_p *ZOOM_Event;
@@
-60,6
+61,8
@@
typedef struct ZOOM_task_p *ZOOM_task;
#define STATE_CONNECTING 1
#define STATE_ESTABLISHED 2
#define STATE_CONNECTING 1
#define STATE_ESTABLISHED 2
+typedef struct ZOOM_resultsets_p *ZOOM_resultsets;
+
struct ZOOM_connection_p {
enum oid_proto proto;
COMSTACK cs;
struct ZOOM_connection_p {
enum oid_proto proto;
COMSTACK cs;
@@
-99,12
+102,19
@@
struct ZOOM_connection_p {
ZOOM_task tasks;
ZOOM_options options;
ZOOM_task tasks;
ZOOM_options options;
- ZOOM_resultset resultsets;
+ ZOOM_resultsets resultsets;
ZOOM_Event m_queue_front;
ZOOM_Event m_queue_back;
zoom_sru_mode sru_mode;
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 */
+};
+
+struct ZOOM_resultsets_p {
+ ZOOM_resultset resultset;
+ ZOOM_resultsets next;
};
};
+
struct ZOOM_options_entry {
char *name;
char *value;
struct ZOOM_options_entry {
char *name;
char *value;
@@
-139,9
+149,9
@@
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;
};
struct ZOOM_record_p {
};
struct ZOOM_record_p {