X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fzoom-p.h;h=35352215518a6be2e934b6ae8cafbe55c1c60af5;hb=e2ee7361cc2ac8d8d00bbf4e74c46a77ccef1911;hp=40e250655ee665630922da8933578568ffe72fd9;hpb=88c261910ace93cd45d25bfbb21ad32f8225ece1;p=yaz-moved-to-github.git

diff --git a/src/zoom-p.h b/src/zoom-p.h
index 40e2506..3535221 100644
--- a/src/zoom-p.h
+++ b/src/zoom-p.h
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2009 Index Data.
+ * Copyright (C) 1995-2010 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -35,6 +35,7 @@
 #include <yaz/zoom.h>
 #include <yaz/sortspec.h>
 #include <yaz/srw.h>
+#include <yaz/mutex.h>
 
 typedef struct ZOOM_Event_p *ZOOM_Event;
 
@@ -60,6 +61,8 @@ typedef struct ZOOM_task_p *ZOOM_task;
 #define STATE_CONNECTING 1
 #define STATE_ESTABLISHED 2
 
+typedef struct ZOOM_resultsets_p *ZOOM_resultsets;
+
 struct ZOOM_connection_p {
     enum oid_proto proto;
     COMSTACK cs;
@@ -99,12 +102,19 @@ struct ZOOM_connection_p {
 
     ZOOM_task tasks;
     ZOOM_options options;
-    ZOOM_resultset resultsets;
+    ZOOM_resultsets resultsets;
     ZOOM_Event m_queue_front;
     ZOOM_Event m_queue_back;
     zoom_sru_mode sru_mode;
+    int no_redirects; /* 0 for no redirects. >0 for number of redirects */
+};
+
+struct ZOOM_resultsets_p {
+    ZOOM_resultset resultset;
+    ZOOM_resultsets next;
 };
 
+
 struct ZOOM_options_entry {
     char *name;
     char *value;
@@ -130,7 +140,7 @@ struct ZOOM_resultset_p {
     Z_SortKeySpecList *r_sort_spec;
     ZOOM_query query;
     int refcount;
-    int size;
+    Odr_int size;
     int step;
     int piggyback;
     char *setname;
@@ -139,18 +149,22 @@ struct ZOOM_resultset_p {
     ZOOM_record_cache record_hash[RECORD_HASH_SIZE];
     ZOOM_options options;
     ZOOM_connection connection;
-    ZOOM_resultset next;
     char **databaseNames;
     int num_databaseNames;
+    YAZ_MUTEX mutex;
 };
 
 struct ZOOM_record_p {
     ODR odr;
-    WRBUF wrbuf_marc;
-    WRBUF wrbuf_iconv;
+    WRBUF wrbuf;
     Z_NamePlusRecord *npr;
     const char *schema;
 
+#if YAZ_HAVE_XML2
+    xmlChar *xml_mem;
+    int xml_size;
+#endif
+
     const char *diag_uri;
     const char *diag_message;
     const char *diag_details;