ZOOM: initial experiments with memcached

[yaz-moved-to-github.git] / src / zoom-p.h

diff --git a/src/zoom-p.h b/src/zoom-p.h
index 0f53b04..a2cab30 100644 (file)
--- 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-2013 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,13 @@
 #include <yaz/wrbuf.h>
 #include <yaz/zoom.h>
 #include <yaz/srw.h>
+#include <yaz/cookie.h>
 #include <yaz/mutex.h>
+#if HAVE_LIBMEMCACHED_MEMCACHED_H
+#include <libmemcached/memcached.h>
+#endif
 
 #define SHPTR 1
-#define ZOOM_RESULT_LISTS 0
 
 typedef struct ZOOM_Event_p *ZOOM_Event;
 
@@ -56,10 +59,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 +90,7 @@ struct ZOOM_connection_p {
     char *user;
     char *group;
     char *password;
+    int url_authentication;
 
     int async;
     int support_named_resultsets;
@@ -101,27 +101,20 @@ 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;
 
     int log_details;
     int log_api;
     WRBUF saveAPDU_wrbuf;
-};
-
-#if ZOOM_RESULT_LISTS
-struct ZOOM_resultsets_p {
-    ZOOM_resultset resultset;
-    ZOOM_resultsets next;
-};
+#if HAVE_LIBMEMCACHED_MEMCACHED_H
+    memcached_st *mc_st;
 #endif
+};
 
 typedef struct ZOOM_record_cache_p *ZOOM_record_cache;
 
@@ -145,13 +138,11 @@ 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;
+    WRBUF mc_key;
 };
 
 struct facet_term_p {