X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fzoom-p.h;h=7371cd0862769d5b49d774150c4928c41535f6d4;hb=20f83e699d4868d263393996bd4b98fee045e360;hp=4718a0e4e429f9c88eb5c06c7abe2abaf3ed247b;hpb=d3deed18d17648b5561f11b926be6d6eb1d9110c;p=yaz-moved-to-github.git

diff --git a/src/zoom-p.h b/src/zoom-p.h
index 4718a0e..7371cd0 100644
--- a/src/zoom-p.h
+++ b/src/zoom-p.h
@@ -2,14 +2,14 @@
  * Copyright (C) 1995-2005, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: zoom-p.h,v 1.12 2006-08-08 20:58:52 adam Exp $
+ * $Id: zoom-p.h,v 1.19 2007-04-30 08:29:07 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>
@@ -28,7 +28,7 @@ typedef enum {
     zoom_sru_error,
     zoom_sru_soap,
     zoom_sru_get,
-    zoom_sru_post,
+    zoom_sru_post
 } zoom_sru_mode;
     
 
@@ -38,10 +38,6 @@ typedef struct ZOOM_task_p *ZOOM_task;
 #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;
@@ -111,6 +107,9 @@ struct ZOOM_resultset_p {
     ZOOM_options options;
     ZOOM_connection connection;
     ZOOM_resultset next;
+    char **databaseNames;
+    int num_databaseNames;
+    yaz_iconv_t rpn_iconv;
 };
 
 struct ZOOM_record_p {
@@ -138,6 +137,8 @@ struct ZOOM_scanset_p {
     Z_AttributesPlusTerm *termListAndStartPoint;
     Z_AttributeSetId *attributeSet;
     Z_ScanResponse *scan_response;
+    char **databaseNames;
+    int num_databaseNames;
 };
 
 struct ZOOM_package_p {
@@ -158,12 +159,16 @@ struct ZOOM_task_p {
             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
@@ -188,6 +193,7 @@ struct ZOOM_Event_p {
 };
 
 void ZOOM_options_addref (ZOOM_options opt);
+
 /*
  * Local variables:
  * c-basic-offset: 4