X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fzoom-p.h;h=35352215518a6be2e934b6ae8cafbe55c1c60af5;hp=bde6b551c85146efa3cfaf89a9ba0a799a769e8c;hb=5ba7734cc97eef6688596180b7faf535ee249976;hpb=88d3bedf772316f87e1996f655ccf8d1e2589755 diff --git a/src/zoom-p.h b/src/zoom-p.h index bde6b55..3535221 100644 --- a/src/zoom-p.h +++ b/src/zoom-p.h @@ -35,6 +35,7 @@ #include #include #include +#include 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 +typedef struct ZOOM_resultsets_p *ZOOM_resultsets; + 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_resultset resultsets; + ZOOM_resultsets resultsets; 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; @@ -139,9 +149,9 @@ struct ZOOM_resultset_p { ZOOM_record_cache record_hash[RECORD_HASH_SIZE]; ZOOM_options options; ZOOM_connection connection; - ZOOM_resultset next; char **databaseNames; int num_databaseNames; + YAZ_MUTEX mutex; }; struct ZOOM_record_p { @@ -150,6 +160,11 @@ struct ZOOM_record_p { 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;