X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=zutil%2Fzoom-p.h;h=18718010eb43ad017d5525ce89301f3efa703bcd;hb=ee083e1994e399ceb209780ff4bce7168c8bc82b;hp=0f7a81ebe576cece3fefc75aac887a462e464612;hpb=4d531a1a9131d69c3b6c27fbac42837e22cff61c;p=yaz-moved-to-github.git

diff --git a/zutil/zoom-p.h b/zutil/zoom-p.h
index 0f7a81e..1871801 100644
--- a/zutil/zoom-p.h
+++ b/zutil/zoom-p.h
@@ -1,14 +1,10 @@
 /*
  * Private C header for ZOOM C.
- * $Id: zoom-p.h,v 1.3 2003-01-06 08:20:29 adam Exp $
+ * $Id: zoom-p.h,v 1.9 2003-06-02 12:53:28 adam Exp $
  */
 
-#if HAVE_GSOAP
-#include <yaz/srw-util.h>
-#else
-struct soap {
-    int dummy;
-};
+#if HAVE_XSLT
+#include <yaz/srw.h>
 #endif
 
 #include <yaz/proto.h>
@@ -23,6 +19,7 @@ struct ZOOM_query_p {
     Z_SortKeySpecList *sort_spec;
     int refcount;
     ODR odr;
+    char *query_string;
 };
 
 #define STATE_IDLE 0
@@ -34,9 +31,10 @@ struct ZOOM_query_p {
 #define ZOOM_SELECT_EXCEPT 4
 
 struct ZOOM_connection_p {
-    struct soap *soap;
+    enum oid_proto proto;
     COMSTACK cs;
     char *host_port;
+    char *path;
     int error;
     char *addinfo;
     const char *diagset;
@@ -65,7 +63,6 @@ struct ZOOM_connection_p {
     ZOOM_Event m_queue_back;
 };
 
-
 struct ZOOM_options_entry {
     char *name;
     char *value;
@@ -84,15 +81,16 @@ struct ZOOM_options_p {
 typedef struct ZOOM_record_cache_p *ZOOM_record_cache;
 
 struct ZOOM_resultset_p {
-    Z_Query *z_query;
     Z_SortKeySpecList *r_sort_spec;
-    ZOOM_query search;
+    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_options options;
@@ -103,6 +101,7 @@ struct ZOOM_resultset_p {
 struct ZOOM_record_p {
     ODR odr;
     WRBUF wrbuf_marc;
+    WRBUF wrbuf_iconv;
     Z_NamePlusRecord *npr;
 };
 
@@ -110,6 +109,7 @@ struct ZOOM_record_cache_p {
     struct ZOOM_record_p rec;
     char *elementSetName;
     char *syntax;
+    char *schema;
     int pos;
     ZOOM_record_cache next;
 };