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
Version 5.0.4
[yaz-moved-to-github.git]
/
src
/
zoom-p.h
diff --git
a/src/zoom-p.h
b/src/zoom-p.h
index
0f53b04
..
70bb2e4
100644
(file)
--- a/
src/zoom-p.h
+++ b/
src/zoom-p.h
@@
-37,7
+37,6
@@
#include <yaz/mutex.h>
#define SHPTR 1
#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;
@@
-56,10
+55,6
@@
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;
@@
-91,6
+86,7
@@
struct ZOOM_connection_p {
char *user;
char *group;
char *password;
char *user;
char *group;
char *password;
+ int url_authentication;
int async;
int support_named_resultsets;
int async;
int support_named_resultsets;
@@
-101,11
+97,7
@@
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;
ZOOM_Event m_queue_front;
ZOOM_Event m_queue_back;
zoom_sru_mode sru_mode;
@@
-116,13
+108,6
@@
struct ZOOM_connection_p {
WRBUF saveAPDU_wrbuf;
};
WRBUF saveAPDU_wrbuf;
};
-#if ZOOM_RESULT_LISTS
-struct ZOOM_resultsets_p {
- ZOOM_resultset resultset;
- ZOOM_resultsets next;
-};
-#endif
-
typedef struct ZOOM_record_cache_p *ZOOM_record_cache;
#define RECORD_HASH_SIZE 131
typedef struct ZOOM_record_cache_p *ZOOM_record_cache;
#define RECORD_HASH_SIZE 131
@@
-145,10
+130,7
@@
struct ZOOM_resultset_p {
#if SHPTR
struct WRBUF_shptr *record_wrbuf;
#endif
#if SHPTR
struct WRBUF_shptr *record_wrbuf;
#endif
-#if ZOOM_RESULT_LISTS
-#else
ZOOM_resultset next;
ZOOM_resultset next;
-#endif
ZOOM_facet_field *facets;
int num_facets;
char **facets_names;
ZOOM_facet_field *facets;
int num_facets;
char **facets_names;