X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fzoom-p.h;h=844badf6e34a80383c39c72693a08c7becf3968b;hp=a18d63e45b0d960671500abef337a0a40282446a;hb=1b814737d1572a6fc4bec2a3d120d6954d12bdb1;hpb=8535dd99e47effa0d28f0a4b5f2357b0290bc7df

diff --git a/src/zoom-p.h b/src/zoom-p.h
index a18d63e..844badf 100644
--- a/src/zoom-p.h
+++ b/src/zoom-p.h
@@ -35,6 +35,10 @@
 #include <yaz/zoom.h>
 #include <yaz/sortspec.h>
 #include <yaz/srw.h>
+#include <yaz/mutex.h>
+
+#define SHPTR 1
+#define ZOOM_RESULT_LISTS 0
 
 typedef struct ZOOM_Event_p *ZOOM_Event;
 
@@ -60,7 +64,9 @@ 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;
@@ -101,18 +107,23 @@ 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 */
 };
 
+#if ZOOM_RESULT_LISTS
 struct ZOOM_resultsets_p {
     ZOOM_resultset resultset;
     ZOOM_resultsets next;
 };
-
+#endif
 
 struct ZOOM_options_entry {
     char *name;
@@ -150,11 +161,24 @@ struct ZOOM_resultset_p {
     ZOOM_connection connection;
     char **databaseNames;
     int num_databaseNames;
+    YAZ_MUTEX mutex;
+#if SHPTR
+    struct WRBUF_shptr *record_wrbuf;
+#endif
+#if ZOOM_RESULT_LISTS
+#else
+    ZOOM_resultset next;
+#endif
 };
 
 struct ZOOM_record_p {
     ODR odr;
+#if SHPTR
+    struct WRBUF_shptr *record_wrbuf;
+#else
     WRBUF wrbuf;
+#endif
+
     Z_NamePlusRecord *npr;
     const char *schema;