X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fzoom-p.h;h=7990d3660dd88a6a05d32fc044c5938353c5b162;hp=bad6acf1b0c327985b96cff26e59e3dae317e1ce;hb=55b4bc7eb9295ce335fad273d08d82d62ce4b7ea;hpb=bd4ea696fa932a215d18268afd1850035f7ebd05

diff --git a/src/zoom-p.h b/src/zoom-p.h
index bad6acf..7990d36 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
 
@@ -107,13 +110,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;
@@ -139,8 +148,9 @@ struct ZOOM_resultset_p {
     struct WRBUF_shptr *record_wrbuf;
 #endif
     ZOOM_resultset next;
-    ZOOM_facet_field *facets;
-    int num_facets;
+    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 */
@@ -276,7 +286,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,
@@ -286,6 +297,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: