X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=include%2Fyazpp%2Fir-assoc.h;h=e8252b4a1d0f12e6d6cea954e96b71e5dcd464a3;hp=eb3d1100c14d73494dfbc2e2c8c6786bbaa9999d;hb=82d0b6ce2accdbe9987d0b8b4e6e818514455e22;hpb=0cc824e02bc2c69986bec8c9dd9ff53f07a0cd3d

diff --git a/include/yazpp/ir-assoc.h b/include/yazpp/ir-assoc.h
index eb3d110..e8252b4 100644
--- a/include/yazpp/ir-assoc.h
+++ b/include/yazpp/ir-assoc.h
@@ -1,8 +1,28 @@
-/*
- * Copyright (c) 1998-2005, Index Data.
- * See the file LICENSE for details.
- * 
- * $Id: ir-assoc.h,v 1.1 2006-03-29 13:14:15 adam Exp $
+/* This file is part of the yazpp toolkit.
+ * Copyright (C) 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.
+ *
+ * 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.
  */
 
 #include <yazpp/z-assoc.h>
@@ -57,9 +77,9 @@ class YAZ_EXPORT IR_Assoc: public Z_Assoc {
     /// Send Services
     int send_initRequest(char* pRefId=NULL);
     int send_searchRequest(Yaz_Z_Query *query, char* pResultSetId = NULL, char* pRefId = NULL);
-    int send_presentRequest(int start, int number, char* pResultSetId = NULL, char* pRefId = NULL);
+    int send_presentRequest(Odr_int start, Odr_int number, char* pResultSetId = NULL, char* pRefId = NULL);
     int send_deleteResultSetRequest(char* pResultSetId = 0, char* pRefId = 0);
-    
+
     /// Recv Services
     virtual void recv_initRequest(Z_InitRequest *initRequest);
     virtual void recv_initResponse(Z_InitResponse *initResponse);
@@ -74,7 +94,7 @@ class YAZ_EXPORT IR_Assoc: public Z_Assoc {
     char *m_cookie;
     int m_num_databaseNames;
     char **m_databaseNames;
-    int m_preferredRecordSyntax;
+    char *m_preferredRecordSyntax;
     Z_ElementSetNames *m_elementSetNames;
     int m_lastReceived;
     int m_log;
@@ -83,6 +103,7 @@ class YAZ_EXPORT IR_Assoc: public Z_Assoc {
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab