X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fzoom-p.h;h=79f2f445882c40c394d017fd51d8f519300bb96c;hp=9de5509e2e3d46d804340af1f6528e0f6567b0aa;hb=4d1450cc691292cef5bcfdd41cefc030e4dabbf6;hpb=a91467db0bbbaefbaf64410b657a9439104997e0

diff --git a/src/zoom-p.h b/src/zoom-p.h
index 9de5509..79f2f44 100644
--- a/src/zoom-p.h
+++ b/src/zoom-p.h
@@ -36,9 +36,12 @@
 #include <yaz/srw.h>
 #include <yaz/cookie.h>
 #include <yaz/mutex.h>
-#if HAVE_LIBMEMCACHED_MEMCACHED_H
+#if HAVE_LIBMEMCACHED
 #include <libmemcached/memcached.h>
 #endif
+#if HAVE_HIREDIS
+#include <hiredis/hiredis.h>
+#endif
 
 #define SHPTR 1
 
@@ -80,6 +83,7 @@ struct ZOOM_connection_p {
     int len_out;
     char *proxy;
     char *tproxy;
+    int proxy_mode;
     char *charset;
     char *lang;
     char *cookie_out;
@@ -107,13 +111,19 @@ struct ZOOM_connection_p {
     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;
     WRBUF saveAPDU_wrbuf;
-#if HAVE_LIBMEMCACHED_MEMCACHED_H
+#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;
@@ -237,6 +247,7 @@ 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,
@@ -277,7 +288,8 @@ 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);
+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,
@@ -287,6 +299,14 @@ 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: