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

diff --git a/src/zoom-p.h b/src/zoom-p.h
index 87b5fb6..40e2506 100644
--- a/src/zoom-p.h
+++ b/src/zoom-p.h
@@ -1,8 +1,28 @@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
- * See the file LICENSE for details.
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2009 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:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Index Data nor the names of its contributors
+ *       may be used to endorse or promote products derived from this
+ *       software without specific prior written permission.
  *
- * $Id: zoom-p.h,v 1.24 2007-09-09 05:54:45 adam Exp $
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /**
  * \file zoom-p.h
@@ -53,6 +73,7 @@ struct ZOOM_connection_p {
     int reconnect_ok;
     ODR odr_in;
     ODR odr_out;
+    ODR odr_print;
     char *buf_in;
     int len_in;
     char *buf_out;
@@ -127,11 +148,13 @@ struct ZOOM_record_p {
     ODR odr;
     WRBUF wrbuf_marc;
     WRBUF wrbuf_iconv;
-    WRBUF wrbuf_opac;
     Z_NamePlusRecord *npr;
     const char *schema;
-    Z_SRW_diagnostic *diag;
-    const char *diagset;
+
+    const char *diag_uri;
+    const char *diag_message;
+    const char *diag_details;
+    const char *diag_set;
 };
 
 struct ZOOM_record_cache_p {
@@ -176,6 +199,7 @@ struct ZOOM_task_p {
             ZOOM_resultset resultset;
             char *syntax;
             char *elementSetName;
+            int recv_search_fired;
         } search;
 #define ZOOM_TASK_RETRIEVE 2
         struct {
@@ -212,6 +236,7 @@ void ZOOM_options_addref (ZOOM_options opt);
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab