X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=include%2Fyazpp%2Fz-server.h;h=7ce1776d142d5a870be02e96936e62ce01c76ab6;hp=c8085c7ee7e13e56a14be068770729f2641f7c0f;hb=HEAD;hpb=0cc824e02bc2c69986bec8c9dd9ff53f07a0cd3d

diff --git a/include/yazpp/z-server.h b/include/yazpp/z-server.h
index c8085c7..7ce1776 100644
--- a/include/yazpp/z-server.h
+++ b/include/yazpp/z-server.h
@@ -1,8 +1,28 @@
-/*
- * Copyright (c) 2000-2005, Index Data.
- * See the file LICENSE for details.
- * 
- * $Id: z-server.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>
@@ -14,12 +34,12 @@ class Z_Server;
 class YAZ_EXPORT Z_ServerUtility {
  public:
     void create_databaseRecord (ODR odr, Z_NamePlusRecord *rec,
-                                const char *dbname, int format,
+                                const char *dbname, const Odr_oid *format,
                                 const void *buf, int len);
     void create_surrogateDiagnostics(ODR odr, Z_NamePlusRecord *rec,
                                      const char *dbname, int error,
                                      char *const addinfo);
-    
+
     Z_Records *create_nonSurrogateDiagnostics (ODR odr, int error,
                                                const char *addinfo);
 
@@ -81,10 +101,10 @@ class YAZ_EXPORT Yaz_Facility_Retrieval : public IServer_Facility,
                              Z_PresentResponse *presentResponse) = 0;
     virtual void sr_record (const char *resultSetName,
                             int position,
-                            int *format,
-                                Z_RecordComposition *comp,
-                                Z_NamePlusRecord *namePlusRecord,
-                                Z_Records *diagnostics) = 0;
+                            Odr_oid *format,
+                            Z_RecordComposition *comp,
+                            Z_NamePlusRecord *namePlusRecord,
+                            Z_Records *diagnostics) = 0;
     int init(Z_Server *server,
              Z_InitRequest *initRequest,
              Z_InitResponse *initResponse);
@@ -97,8 +117,8 @@ class YAZ_EXPORT Yaz_Facility_Retrieval : public IServer_Facility,
                              const char *resultSetName,
                              int start, int num,
                              Z_RecordComposition *comp,
-                             int *next, int *pres,
-                             int *oid);
+                             Odr_int *next, Odr_int *pres,
+                             Odr_oid *oid);
 
     void fetch_via_piggyback (Z_Server *s,
                               Z_SearchRequest *searchRequest,
@@ -143,6 +163,7 @@ class YAZ_EXPORT Yaz_USMARC {
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab