Attempted to fix bug #626.

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

diff --git a/src/zoom-p.h b/src/zoom-p.h
index d445957..4718a0e 100644 (file)
--- a/src/zoom-p.h
+++ b/src/zoom-p.h
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2005, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: zoom-p.h,v 1.9 2005-10-17 12:25:39 mike Exp $
+ * $Id: zoom-p.h,v 1.12 2006-08-08 20:58:52 adam Exp $
  */
 /**
  * \file zoom-p.h
@@ -24,6 +24,14 @@ struct ZOOM_query_p {
     char *query_string;
 };
 
+typedef enum {
+    zoom_sru_error,
+    zoom_sru_soap,
+    zoom_sru_get,
+    zoom_sru_post,
+} zoom_sru_mode;
+    
+
 typedef struct ZOOM_task_p *ZOOM_task;
 
 #define STATE_IDLE 0
@@ -65,6 +73,7 @@ struct ZOOM_connection_p {
     ZOOM_resultset resultsets;
     ZOOM_Event m_queue_front;
     ZOOM_Event m_queue_back;
+    zoom_sru_mode sru_mode;
 };
 
 struct ZOOM_options_entry {
@@ -83,21 +92,22 @@ struct ZOOM_options_p {
     ZOOM_options parent2;
 };
 
+
 typedef struct ZOOM_record_cache_p *ZOOM_record_cache;
 
+#define RECORD_HASH_SIZE  131
+
 struct ZOOM_resultset_p {
     Z_SortKeySpecList *r_sort_spec;
     ZOOM_query query;
     int refcount;
     int size;
-    int start;
-    int count;
     int step;
     int piggyback;
     char *setname;
     char *schema;
     ODR odr;
-    ZOOM_record_cache record_cache;
+    ZOOM_record_cache record_hash[RECORD_HASH_SIZE];
     ZOOM_options options;
     ZOOM_connection connection;
     ZOOM_resultset next;
@@ -145,6 +155,8 @@ struct ZOOM_task_p {
     union {
 #define ZOOM_TASK_SEARCH 1
         struct {
+            int count;
+            int start;
             ZOOM_resultset resultset;
         } search;
 #define ZOOM_TASK_RETRIEVE 2