X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=zoom%2Fzoom-p.h;h=be5f4efe9ba88cc2d486e923f81f377e8670553f;hb=3dcdf20f2ccc20554dc247f60281eb06111f0bf6;hp=28446c8c166e01af4a04cfa94845a790705579c2;hpb=c5634aa19153b7b36e6de5a8e5b4536d69b2b7a1;p=yaz-moved-to-github.git

diff --git a/zoom/zoom-p.h b/zoom/zoom-p.h
index 28446c8..be5f4ef 100644
--- a/zoom/zoom-p.h
+++ b/zoom/zoom-p.h
@@ -1,11 +1,12 @@
 /*
  * Private C header for ZOOM C.
- * $Id: zoom-p.h,v 1.6 2001-11-22 09:45:31 adam Exp $
+ * $Id: zoom-p.h,v 1.11 2002-06-02 21:27:17 adam Exp $
  */
 #include <yaz/proto.h>
 #include <yaz/comstack.h>
 #include <yaz/wrbuf.h>
 #include <yaz/zoom.h>
+#include <yaz/sortspec.h>
 
 typedef struct ZOOM_Event_p *ZOOM_Event;
 
@@ -31,6 +32,7 @@ struct ZOOM_connection_p {
     char *addinfo;
     int state;
     int mask;
+    int reconnect_ok;
     ODR odr_in;
     ODR odr_out;
     char *buf_in;
@@ -38,10 +40,14 @@ struct ZOOM_connection_p {
     char *buf_out;
     int len_out;
     char *proxy;
+    char *charset;
+    char *lang;
     char *cookie_out;
     char *cookie_in;
+    char *client_IP;
     int async;
     int support_named_resultsets;
+    int last_event;
     ZOOM_task tasks;
     ZOOM_options options;
     ZOOM_resultset resultsets;
@@ -61,7 +67,8 @@ struct ZOOM_options_p {
     void *callback_handle;
     ZOOM_options_callback callback_func;
     struct ZOOM_options_entry *entries;
-    ZOOM_options parent;
+    ZOOM_options parent1;
+    ZOOM_options parent2;
 };
 
 typedef struct ZOOM_record_cache_p *ZOOM_record_cache;
@@ -96,15 +103,46 @@ struct ZOOM_record_cache_p {
     ZOOM_record_cache next;
 };
 
+struct ZOOM_scanset_p {
+    int refcount;
+    ODR odr;
+    ZOOM_options options;
+    ZOOM_connection connection;
+    Z_AttributesPlusTerm *termListAndStartPoint;
+    Z_AttributeSetId *attributeSet;
+    Z_ScanResponse *scan_response;
+};
+
+struct ZOOM_package_p {
+    int refcount;
+    ODR odr_out;
+    ZOOM_options options;
+    ZOOM_connection connection;
+    char *buf_out;
+    int len_out;
+};
+
 struct ZOOM_task_p {
     int running;
     int which;
     union {
 #define ZOOM_TASK_SEARCH 1
-	ZOOM_resultset resultset;
+        struct {
+            ZOOM_resultset resultset;
+        } search;
 #define ZOOM_TASK_RETRIEVE 2
-	/** also resultset here */
+        struct {
+            int start;
+            ZOOM_resultset resultset;
+            int count;
+        } retrieve;
 #define ZOOM_TASK_CONNECT 3
+#define ZOOM_TASK_SCAN 4
+        struct {
+            ZOOM_scanset scan;
+        } scan;
+#define ZOOM_TASK_PACKAGE 5
+        ZOOM_package package;
     } u;
     ZOOM_task next;
 };
@@ -115,11 +153,4 @@ struct ZOOM_Event_p {
     ZOOM_Event prev;
 };
 
-
-#ifndef YAZ_DATE
-COMSTACK cs_create_host(const char *type_and_host, int blocking, void **vp);
-Odr_oid *yaz_str_to_z3950oid (ODR o, int oid_class, const char *str);
-Z_SortKeySpecList *yaz_sort_spec (ODR out, const char *arg);
-#else
-#include <yaz/sortspec.h>
-#endif
+void ZOOM_options_addref (ZOOM_options opt);