X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fzoom-p.h;h=68f1880a0b03b632b81fac6905b35e2dee92bb49;hp=a1ef9538082aa41e08863a6e2038b933640caf25;hb=951fce6496397a6d8c11e15ab5b60b46abc43467;hpb=fb6d99a0c7e07d9cc4a315c447deaf6564a85505

diff --git a/src/zoom-p.h b/src/zoom-p.h
index a1ef953..68f1880 100644
--- 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.7 2005-06-25 15:46:07 adam Exp $
+ * $Id: zoom-p.h,v 1.17 2007-01-09 13:56:48 adam Exp $
  */
 /**
  * \file zoom-p.h
@@ -24,14 +24,20 @@ 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
 #define STATE_CONNECTING 1
 #define STATE_ESTABLISHED 2
 
-#define ZOOM_SELECT_READ 1
-#define ZOOM_SELECT_WRITE 2
-#define ZOOM_SELECT_EXCEPT 4
-
 struct ZOOM_connection_p {
     enum oid_proto proto;
     COMSTACK cs;
@@ -63,11 +69,13 @@ 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 {
     char *name;
     char *value;
+    int len;                  /* of `value', which may contain NULs */
     struct ZOOM_options_entry *next;
 };
 
@@ -80,24 +88,27 @@ 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;
+    char **databaseNames;
+    int num_databaseNames;
 };
 
 struct ZOOM_record_p {
@@ -125,6 +136,8 @@ struct ZOOM_scanset_p {
     Z_AttributesPlusTerm *termListAndStartPoint;
     Z_AttributeSetId *attributeSet;
     Z_ScanResponse *scan_response;
+    char **databaseNames;
+    int num_databaseNames;
 };
 
 struct ZOOM_package_p {
@@ -142,13 +155,19 @@ struct ZOOM_task_p {
     union {
 #define ZOOM_TASK_SEARCH 1
         struct {
+            int count;
+            int start;
             ZOOM_resultset resultset;
+            char *syntax;
+            char *elementSetName;
         } search;
 #define ZOOM_TASK_RETRIEVE 2
         struct {
             int start;
             ZOOM_resultset resultset;
             int count;
+            char *syntax;
+            char *elementSetName;
         } retrieve;
 #define ZOOM_TASK_CONNECT 3
 #define ZOOM_TASK_SCAN 4
@@ -173,6 +192,7 @@ struct ZOOM_Event_p {
 };
 
 void ZOOM_options_addref (ZOOM_options opt);
+
 /*
  * Local variables:
  * c-basic-offset: 4