X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fzoom-p.h;h=70bb2e46ab6086a597162e08511d00535328b50b;hb=0123a5450b4a7eb7e0a52869dd5c099e415f5feb;hp=0f53b04ffb7c23bb357f38352294362f1a156057;hpb=047d6669724619dd486a9bfa62cde1b909951491;p=yaz-moved-to-github.git diff --git a/src/zoom-p.h b/src/zoom-p.h index 0f53b04..70bb2e4 100644 --- a/src/zoom-p.h +++ b/src/zoom-p.h @@ -37,7 +37,6 @@ #include #define SHPTR 1 -#define ZOOM_RESULT_LISTS 0 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 -#if ZOOM_RESULT_LISTS -typedef struct ZOOM_resultsets_p *ZOOM_resultsets; -#endif - struct ZOOM_connection_p { enum oid_proto proto; COMSTACK cs; @@ -91,6 +86,7 @@ struct ZOOM_connection_p { char *user; char *group; char *password; + int url_authentication; int async; int support_named_resultsets; @@ -101,11 +97,7 @@ struct ZOOM_connection_p { ZOOM_task tasks; ZOOM_options options; -#if ZOOM_RESULT_LISTS - ZOOM_resultsets resultsets; -#else ZOOM_resultset resultsets; -#endif 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; }; -#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 @@ -145,10 +130,7 @@ struct ZOOM_resultset_p { #if SHPTR struct WRBUF_shptr *record_wrbuf; #endif -#if ZOOM_RESULT_LISTS -#else ZOOM_resultset next; -#endif ZOOM_facet_field *facets; int num_facets; char **facets_names;