X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fsession.h;h=f7c81ce4363065289e124d17f330a0674ee778c5;hp=b3f044a762445c27cce47d9b842eb95c82a1d549;hb=8356ea58313ee1f350226172cf99bfb0b7c5583c;hpb=a6af2d19dddb0c2ef961d087d8ca0f2b3bda8f7a

diff --git a/src/session.h b/src/session.h
index b3f044a..f7c81ce 100644
--- a/src/session.h
+++ b/src/session.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: session.h,v 1.10 2006-03-15 13:32:05 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 session.h
@@ -13,10 +33,11 @@
 
 #include <yaz/comstack.h>
 #include <yaz/cql.h>
+#include <yaz/ccl.h>
 #include <yaz/odr.h>
-#include <yaz/oid.h>
 #include <yaz/proto.h>
 #include <yaz/backend.h>
+#include <yaz/retrieval.h>
 #include "eventl.h"
 
 struct gfs_server {
@@ -24,10 +45,12 @@ struct gfs_server {
     char *host;
     int listen_ref;
     cql_transform_t cql_transform;
+    CCL_bibset ccl_transform;
     void *server_node_ptr;
     char *directory;
     char *docpath;
     char *stylesheet;
+    yaz_retrieval_t retrieval;
     struct gfs_server *next;
 };
 
@@ -99,8 +122,8 @@ typedef struct association
     association_state state;
 
     /* session parameters */
-    int preferredMessageSize;
-    int maximumRecordSize;
+    Odr_int preferredMessageSize;
+    Odr_int maximumRecordSize;
     int version;                  /* highest version-bit set (2 or 3) */
 
     unsigned cs_get_mask;
@@ -109,10 +132,8 @@ typedef struct association
 
     struct bend_initrequest *init;
     statserv_options_block *last_control;
-    cql_transform_t cql_transform;
-    void *server_node_ptr;
-    const char *docpath;
-    const char *stylesheet;
+
+    struct gfs_server *server;
 } association;
 
 association *create_association(IOCHAN channel, COMSTACK link,
@@ -133,10 +154,13 @@ int statserv_must_terminate(void);
 
 int control_association(association *assoc, const char *host, int force);
 
+int ir_read(IOCHAN h, int event);
+
 #endif
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab