X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=zutil%2Fzoom-p.h;h=0e136ee62632da0f45c2d5c933aea12a2b01073c;hb=fed4c59a3c26f04ba3764947aa2f7ecdd9b46889;hp=b6cf2aed32377a426b23d3eebca096b65216da43;hpb=141269ce5f566fcd7ed188ebe9bb878bf4b32018;p=yaz-moved-to-github.git

diff --git a/zutil/zoom-p.h b/zutil/zoom-p.h
index b6cf2ae..0e136ee 100644
--- a/zutil/zoom-p.h
+++ b/zutil/zoom-p.h
@@ -1,20 +1,25 @@
 /*
  * Private C header for ZOOM C.
- * $Id: zoom-p.h,v 1.1 2002-09-16 18:45:14 adam Exp $
+ * $Id: zoom-p.h,v 1.10 2003-07-14 12:59:23 adam Exp $
  */
+
+#if HAVE_XSLT
+#include <yaz/srw.h>
+#endif
+
 #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;
 
 struct ZOOM_query_p {
-    Z_Query *query;
+    Z_Query *z_query;
     Z_SortKeySpecList *sort_spec;
     int refcount;
     ODR odr;
+    char *query_string;
 };
 
 #define STATE_IDLE 0
@@ -26,10 +31,13 @@ struct ZOOM_query_p {
 #define ZOOM_SELECT_EXCEPT 4
 
 struct ZOOM_connection_p {
+    enum oid_proto proto;
     COMSTACK cs;
     char *host_port;
+    char *path;
     int error;
     char *addinfo;
+    const char *diagset;
     int state;
     int mask;
     int reconnect_ok;
@@ -55,7 +63,6 @@ struct ZOOM_connection_p {
     ZOOM_Event m_queue_back;
 };
 
-
 struct ZOOM_options_entry {
     char *name;
     char *value;
@@ -74,15 +81,16 @@ struct ZOOM_options_p {
 typedef struct ZOOM_record_cache_p *ZOOM_record_cache;
 
 struct ZOOM_resultset_p {
-    Z_Query *r_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;
@@ -93,6 +101,8 @@ struct ZOOM_resultset_p {
 struct ZOOM_record_p {
     ODR odr;
     WRBUF wrbuf_marc;
+    WRBUF wrbuf_iconv;
+    WRBUF wrbuf_opac;
     Z_NamePlusRecord *npr;
 };
 
@@ -100,6 +110,7 @@ struct ZOOM_record_cache_p {
     struct ZOOM_record_p rec;
     char *elementSetName;
     char *syntax;
+    char *schema;
     int pos;
     ZOOM_record_cache next;
 };