X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fzoom-p.h;h=79f2f445882c40c394d017fd51d8f519300bb96c;hp=b150422edb55e1ea5d1ebe5ef38630a7e7f316a0;hb=4d1450cc691292cef5bcfdd41cefc030e4dabbf6;hpb=0b0eb588d2989d5bc7d77600e4e9b375d1eade12 diff --git a/src/zoom-p.h b/src/zoom-p.h index b150422..79f2f44 100644 --- a/src/zoom-p.h +++ b/src/zoom-p.h @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2011 Index Data. + * Copyright (C) Index Data. * All rights reserved. * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -34,10 +34,16 @@ #include #include #include +#include #include +#if HAVE_LIBMEMCACHED +#include +#endif +#if HAVE_HIREDIS +#include +#endif #define SHPTR 1 -#define ZOOM_RESULT_LISTS 0 typedef struct ZOOM_Event_p *ZOOM_Event; @@ -48,7 +54,7 @@ typedef enum { zoom_sru_post, zoom_sru_solr } zoom_sru_mode; - + typedef struct ZOOM_task_p *ZOOM_task; @@ -56,10 +62,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; @@ -81,6 +83,7 @@ struct ZOOM_connection_p { int len_out; char *proxy; char *tproxy; + int proxy_mode; char *charset; char *lang; char *cookie_out; @@ -91,6 +94,7 @@ struct ZOOM_connection_p { char *user; char *group; char *password; + int url_authentication; int async; int support_named_resultsets; @@ -101,26 +105,26 @@ 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; int no_redirects; /* 0 for no redirects. >0 for number of redirects */ + yaz_cookies_t cookies; + char *location; int log_details; int log_api; -}; - -#if ZOOM_RESULT_LISTS -struct ZOOM_resultsets_p { - ZOOM_resultset resultset; - ZOOM_resultsets next; -}; + WRBUF saveAPDU_wrbuf; +#if HAVE_LIBMEMCACHED + memcached_st *mc_st; #endif +#if HAVE_HIREDIS + redisContext *redis_c; +#endif + int expire_search; + int expire_record; +}; typedef struct ZOOM_record_cache_p *ZOOM_record_cache; @@ -134,7 +138,6 @@ struct ZOOM_resultset_p { int step; int piggyback; char *setname; - char *schema; ODR odr; ZOOM_record_cache record_hash[RECORD_HASH_SIZE]; ZOOM_options options; @@ -145,13 +148,13 @@ 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; + char *req_facets; + ZOOM_facet_field *res_facets; + int num_res_facets; + char **facets_names; /* redundant. For ZOOM_resultset_facets_names only */ + WRBUF mc_key; + int live_set; /* 0=no hit count, 1=cached hit, 2=hits + real set */ }; struct facet_term_p { @@ -198,16 +201,8 @@ struct ZOOM_task_p { ZOOM_resultset resultset; char *syntax; char *elementSetName; - int recv_search_fired; + char *schema; } 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 struct { @@ -242,8 +237,7 @@ void ZOOM_set_error(ZOOM_connection c, int error, const char *addinfo); ZOOM_Event ZOOM_Event_create(int kind); void ZOOM_connection_put_event(ZOOM_connection c, ZOOM_Event event); -zoom_ret ZOOM_connection_Z3950_send_search(ZOOM_connection c); -zoom_ret send_Z3950_present(ZOOM_connection c); +zoom_ret ZOOM_connection_Z3950_search(ZOOM_connection c); zoom_ret ZOOM_connection_Z3950_send_scan(ZOOM_connection c); zoom_ret ZOOM_send_buf(ZOOM_connection c); zoom_ret send_Z3950_sort(ZOOM_connection c, ZOOM_resultset resultset); @@ -253,12 +247,14 @@ zoom_ret ZOOM_connection_Z3950_send_init(ZOOM_connection c); ZOOM_task ZOOM_connection_add_task(ZOOM_connection c, int which); void ZOOM_connection_remove_task(ZOOM_connection c); +void ZOOM_connection_remove_tasks(ZOOM_connection c); int ZOOM_test_reconnect(ZOOM_connection c); ZOOM_record ZOOM_record_cache_lookup(ZOOM_resultset r, int pos, const char *syntax, - const char *elementSetName); -void ZOOM_record_cache_add(ZOOM_resultset r, Z_NamePlusRecord *npr, + const char *elementSetName, + const char *schema); +void ZOOM_record_cache_add(ZOOM_resultset r, Z_NamePlusRecord *npr, int pos, const char *syntax, const char *elementSetName, const char *schema, @@ -268,6 +264,7 @@ Z_Query *ZOOM_query_get_Z_Query(ZOOM_query s); Z_SortKeySpecList *ZOOM_query_get_sortspec(ZOOM_query s); const char *ZOOM_query_get_query_string(ZOOM_query s); const char *ZOOM_query_get_sru11(ZOOM_query s); +void ZOOM_query_get_hash(ZOOM_query s, WRBUF w); int ZOOM_uri_to_code(const char *uri); @@ -283,6 +280,33 @@ void ZOOM_set_HTTP_error(ZOOM_connection c, int error, ZOOM_Event ZOOM_connection_get_event(ZOOM_connection c); void ZOOM_connection_remove_events(ZOOM_connection c); void ZOOM_Event_destroy(ZOOM_Event event); +zoom_ret ZOOM_send_GDU(ZOOM_connection c, Z_GDU *gdu); +void ZOOM_handle_facet_list(ZOOM_resultset r, Z_FacetList *fl); + +void ZOOM_memcached_init(ZOOM_connection c); +int ZOOM_memcached_configure(ZOOM_connection c); +void ZOOM_memcached_destroy(ZOOM_connection c); +void ZOOM_memcached_resultset(ZOOM_resultset r, ZOOM_query q); +void ZOOM_memcached_search(ZOOM_connection c, ZOOM_resultset r); +void ZOOM_memcached_hitcount(ZOOM_connection c, ZOOM_resultset result, + Z_OtherInformation *oi, const char *precision); +void ZOOM_memcached_add(ZOOM_resultset r, Z_NamePlusRecord *npr, + int pos, + const char *syntax, const char *elementSetName, + const char *schema, + Z_SRW_diagnostic *diag); +Z_NamePlusRecord *ZOOM_memcached_lookup(ZOOM_resultset r, int pos, + const char *syntax, + const char *elementSetName, + const char *schema); +ZOOM_record ZOOM_record_cache_lookup_i(ZOOM_resultset r, int pos, + const char *syntax, + const char *elementSetName, + const char *schema); +void ZOOM_handle_facet_result(ZOOM_connection c, ZOOM_resultset r, + Z_OtherInformation *o); +void ZOOM_handle_search_result(ZOOM_connection c, ZOOM_resultset resultset, + Z_OtherInformation *o); /* * Local variables: