X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fzoom-p.h;h=5fd0b8654c9000c667168e9eb03906c8c6c670eb;hp=d852feb6a8de0848725e9fe1e823730f578d334e;hb=3f36e04a60f21ed11fbb7bdb32923cffcb519f2f;hpb=06eb0818f902a5d6805b656e0ba2e39ac2ed7817

diff --git a/src/zoom-p.h b/src/zoom-p.h
index d852feb..5fd0b86 100644
--- a/src/zoom-p.h
+++ b/src/zoom-p.h
@@ -1,13 +1,21 @@
 /*
- * Private C header for ZOOM C.
- * $Id: zoom-p.h,v 1.2 2003-12-20 00:51:19 adam Exp $
+ * Copyright (C) 1995-2005, Index Data ApS
+ * See the file LICENSE for details.
+ *
+ * $Id: zoom-p.h,v 1.22 2007-08-23 14:23:23 adam Exp $
+ */
+/**
+ * \file zoom-p.h
+ * \brief Internal header for ZOOM implementation
  */
-
 #include <yaz/proto.h>
+#include <yaz/oid_db.h>
 #include <yaz/comstack.h>
 #include <yaz/wrbuf.h>
 #include <yaz/zoom.h>
 #include <yaz/sortspec.h>
+#include <yaz/srw.h>
+
 typedef struct ZOOM_Event_p *ZOOM_Event;
 
 struct ZOOM_query_p {
@@ -18,14 +26,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;
@@ -33,7 +47,7 @@ struct ZOOM_connection_p {
     char *path;
     int error;
     char *addinfo;
-    const char *diagset;
+    char *diagset;
     int state;
     int mask;
     int reconnect_ok;
@@ -49,19 +63,31 @@ struct ZOOM_connection_p {
     char *cookie_out;
     char *cookie_in;
     char *client_IP;
+    char *sru_version;
+
+    char *user;
+    char *group;
+    char *password;
+
     int async;
     int support_named_resultsets;
     int last_event;
+
+    int maximum_record_size;
+    int preferred_message_size;
+
     ZOOM_task tasks;
     ZOOM_options options;
     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;
 };
 
@@ -74,24 +100,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 {
@@ -116,9 +145,12 @@ struct ZOOM_scanset_p {
     ODR odr;
     ZOOM_options options;
     ZOOM_connection connection;
-    Z_AttributesPlusTerm *termListAndStartPoint;
-    Z_AttributeSetId *attributeSet;
+    ZOOM_query query;
     Z_ScanResponse *scan_response;
+    Z_SRW_scanResponse *srw_scan_response;
+
+    char **databaseNames;
+    int num_databaseNames;
 };
 
 struct ZOOM_package_p {
@@ -136,13 +168,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
@@ -151,6 +189,11 @@ struct ZOOM_task_p {
         } scan;
 #define ZOOM_TASK_PACKAGE 5
         ZOOM_package package;
+#define ZOOM_TASK_SORT 6
+        struct {
+            ZOOM_resultset resultset;
+            ZOOM_query q;
+        } sort;
     } u;
     ZOOM_task next;
 };
@@ -162,3 +205,12 @@ struct ZOOM_Event_p {
 };
 
 void ZOOM_options_addref (ZOOM_options opt);
+
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+