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
yaz_diag_srw_to_bib1 now looks up SRW diagnostic codes first in a new
[yaz-moved-to-github.git]
/
src
/
zoom-p.h
diff --git
a/src/zoom-p.h
b/src/zoom-p.h
index
22bc4d6
..
5fd0b86
100644
(file)
--- a/
src/zoom-p.h
+++ b/
src/zoom-p.h
@@
-2,18
+2,20
@@
* Copyright (C) 1995-2005, Index Data ApS
* See the file LICENSE for details.
*
* Copyright (C) 1995-2005, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: zoom-p.h,v 1.8 2005-10-11 18:24:33 adam Exp $
+ * $Id: zoom-p.h,v 1.22 2007-08-23 14:23:23 adam Exp $
*/
/**
* \file zoom-p.h
* \brief Internal header for ZOOM implementation
*/
*/
/**
* \file zoom-p.h
* \brief Internal header for ZOOM implementation
*/
-
#include <yaz/proto.h>
#include <yaz/proto.h>
+#include <yaz/oid_db.h>
#include <yaz/comstack.h>
#include <yaz/wrbuf.h>
#include <yaz/zoom.h>
#include <yaz/sortspec.h>
#include <yaz/comstack.h>
#include <yaz/wrbuf.h>
#include <yaz/zoom.h>
#include <yaz/sortspec.h>
+#include <yaz/srw.h>
+
typedef struct ZOOM_Event_p *ZOOM_Event;
struct ZOOM_query_p {
typedef struct ZOOM_Event_p *ZOOM_Event;
struct ZOOM_query_p {
@@
-24,16
+26,20
@@
struct ZOOM_query_p {
char *query_string;
};
char *query_string;
};
+typedef enum {
+ zoom_sru_error,
+ zoom_sru_soap,
+ zoom_sru_get,
+ zoom_sru_post
+} zoom_sru_mode;
+
+
typedef struct ZOOM_task_p *ZOOM_task;
#define STATE_IDLE 0
#define STATE_CONNECTING 1
#define STATE_ESTABLISHED 2
typedef struct ZOOM_task_p *ZOOM_task;
#define STATE_IDLE 0
#define STATE_CONNECTING 1
#define STATE_ESTABLISHED 2
-#define ZOOM_SELECT_READ 1
-#define ZOOM_SELECT_WRITE 2
-#define ZOOM_SELECT_EXCEPT 4
-
struct ZOOM_connection_p {
enum oid_proto proto;
COMSTACK cs;
struct ZOOM_connection_p {
enum oid_proto proto;
COMSTACK cs;
@@
-57,19
+63,31
@@
struct ZOOM_connection_p {
char *cookie_out;
char *cookie_in;
char *client_IP;
char *cookie_out;
char *cookie_in;
char *client_IP;
+ char *sru_version;
+
+ char *user;
+ char *group;
+ char *password;
+
int async;
int support_named_resultsets;
int last_event;
int async;
int support_named_resultsets;
int last_event;
+
+ int maximum_record_size;
+ int preferred_message_size;
+
ZOOM_task tasks;
ZOOM_options options;
ZOOM_resultset resultsets;
ZOOM_Event m_queue_front;
ZOOM_Event m_queue_back;
ZOOM_task tasks;
ZOOM_options options;
ZOOM_resultset resultsets;
ZOOM_Event m_queue_front;
ZOOM_Event m_queue_back;
+ zoom_sru_mode sru_mode;
};
struct ZOOM_options_entry {
char *name;
char *value;
};
struct ZOOM_options_entry {
char *name;
char *value;
+ int len; /* of `value', which may contain NULs */
struct ZOOM_options_entry *next;
};
struct ZOOM_options_entry *next;
};
@@
-82,24
+100,27
@@
struct ZOOM_options_p {
ZOOM_options parent2;
};
ZOOM_options parent2;
};
+
typedef struct ZOOM_record_cache_p *ZOOM_record_cache;
typedef struct ZOOM_record_cache_p *ZOOM_record_cache;
+#define RECORD_HASH_SIZE 131
+
struct ZOOM_resultset_p {
Z_SortKeySpecList *r_sort_spec;
ZOOM_query query;
int refcount;
int size;
struct ZOOM_resultset_p {
Z_SortKeySpecList *r_sort_spec;
ZOOM_query query;
int refcount;
int size;
- int start;
- int count;
int step;
int piggyback;
char *setname;
char *schema;
ODR odr;
int step;
int piggyback;
char *setname;
char *schema;
ODR odr;
- ZOOM_record_cache record_cache;
+ ZOOM_record_cache record_hash[RECORD_HASH_SIZE];
ZOOM_options options;
ZOOM_connection connection;
ZOOM_resultset next;
ZOOM_options options;
ZOOM_connection connection;
ZOOM_resultset next;
+ char **databaseNames;
+ int num_databaseNames;
};
struct ZOOM_record_p {
};
struct ZOOM_record_p {
@@
-124,9
+145,12
@@
struct ZOOM_scanset_p {
ODR odr;
ZOOM_options options;
ZOOM_connection connection;
ODR odr;
ZOOM_options options;
ZOOM_connection connection;
- Z_AttributesPlusTerm *termListAndStartPoint;
- Z_AttributeSetId *attributeSet;
+ ZOOM_query query;
Z_ScanResponse *scan_response;
Z_ScanResponse *scan_response;
+ Z_SRW_scanResponse *srw_scan_response;
+
+ char **databaseNames;
+ int num_databaseNames;
};
struct ZOOM_package_p {
};
struct ZOOM_package_p {
@@
-144,13
+168,19
@@
struct ZOOM_task_p {
union {
#define ZOOM_TASK_SEARCH 1
struct {
union {
#define ZOOM_TASK_SEARCH 1
struct {
+ int count;
+ int start;
ZOOM_resultset resultset;
ZOOM_resultset resultset;
+ char *syntax;
+ char *elementSetName;
} search;
#define ZOOM_TASK_RETRIEVE 2
struct {
int start;
ZOOM_resultset resultset;
int count;
} search;
#define ZOOM_TASK_RETRIEVE 2
struct {
int start;
ZOOM_resultset resultset;
int count;
+ char *syntax;
+ char *elementSetName;
} retrieve;
#define ZOOM_TASK_CONNECT 3
#define ZOOM_TASK_SCAN 4
} retrieve;
#define ZOOM_TASK_CONNECT 3
#define ZOOM_TASK_SCAN 4
@@
-175,6
+205,7
@@
struct ZOOM_Event_p {
};
void ZOOM_options_addref (ZOOM_options opt);
};
void ZOOM_options_addref (ZOOM_options opt);
+
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4