X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fzoom-p.h;h=a2cab3001b91ff3a86fd67e2a052a44b1d44cb70;hp=1692e5cbe51f5e41f227c873a24fe9a37118a3ec;hb=32790840d73b1f4a4bde1478e6b14699aac00e94;hpb=0ae46bd1e19dcc853c758af505c6f62f1f6be060

diff --git a/src/zoom-p.h b/src/zoom-p.h
index 1692e5c..a2cab30 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-2010 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;
 
@@ -45,9 +48,10 @@ typedef enum {
     zoom_sru_error,
     zoom_sru_soap,
     zoom_sru_get,
-    zoom_sru_post
+    zoom_sru_post,
+    zoom_sru_solr
 } zoom_sru_mode;
-    
+
 
 typedef struct ZOOM_task_p *ZOOM_task;
 
@@ -55,15 +59,10 @@ 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;
     char *host_port;
-    char *path;
     int error;
     char *addinfo;
     char *diagset;
@@ -73,11 +72,14 @@ struct ZOOM_connection_p {
     ODR odr_in;
     ODR odr_out;
     ODR odr_print;
+    ODR odr_save;
+
     char *buf_in;
     int len_in;
     char *buf_out;
     int len_out;
     char *proxy;
+    char *tproxy;
     char *charset;
     char *lang;
     char *cookie_out;
@@ -88,6 +90,7 @@ struct ZOOM_connection_p {
     char *user;
     char *group;
     char *password;
+    int url_authentication;
 
     int async;
     int support_named_resultsets;
@@ -98,26 +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;
-};
-
-#if ZOOM_RESULT_LISTS
-struct ZOOM_resultsets_p {
-    ZOOM_resultset resultset;
-    ZOOM_resultsets next;
-};
+    WRBUF saveAPDU_wrbuf;
+#if HAVE_LIBMEMCACHED_MEMCACHED_H
+    memcached_st *mc_st;
 #endif
+};
 
 typedef struct ZOOM_record_cache_p *ZOOM_record_cache;
 
@@ -131,7 +128,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;
@@ -142,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 {
@@ -195,6 +189,7 @@ struct ZOOM_task_p {
             ZOOM_resultset resultset;
             char *syntax;
             char *elementSetName;
+            char *schema;
             int recv_search_fired;
         } search;
 #define ZOOM_TASK_RETRIEVE 2
@@ -204,6 +199,7 @@ struct ZOOM_task_p {
             int count;
             char *syntax;
             char *elementSetName;
+            char *schema;
         } retrieve;
 #define ZOOM_TASK_CONNECT 3
 #define ZOOM_TASK_SCAN 4
@@ -254,8 +250,9 @@ 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,
@@ -263,7 +260,8 @@ void ZOOM_record_cache_add(ZOOM_resultset r, Z_NamePlusRecord *npr,
 
 Z_Query *ZOOM_query_get_Z_Query(ZOOM_query s);
 Z_SortKeySpecList *ZOOM_query_get_sortspec(ZOOM_query s);
-char *ZOOM_query_get_query_string(ZOOM_query s);
+const char *ZOOM_query_get_query_string(ZOOM_query s);
+const char *ZOOM_query_get_sru11(ZOOM_query s);
 
 int ZOOM_uri_to_code(const char *uri);
 
@@ -271,7 +269,7 @@ zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c);
 zoom_ret ZOOM_connection_srw_send_scan(ZOOM_connection c);
 
 int ZOOM_handle_sru(ZOOM_connection c, Z_HTTP_Response *hres,
-                    zoom_ret *cret);
+                    zoom_ret *cret, char **addinfo);
 
 void ZOOM_set_HTTP_error(ZOOM_connection c, int error,
                          const char *addinfo, const char *addinfo2);
@@ -279,6 +277,8 @@ 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);
 
 /*
  * Local variables: