X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=src%2Fyaz-z-server-sr.cpp;h=b07b83969cbc9b006e19ea2147d1525928af8d20;hp=401b8e3e0d19baacf8b4f2d45d1cd16794ff89fd;hb=8353663886b90d762d43790780be6cb58fb93c8a;hpb=7411ed6df7fc0b535f83503f73d70e80f390e295

diff --git a/src/yaz-z-server-sr.cpp b/src/yaz-z-server-sr.cpp
index 401b8e3..b07b839 100644
--- a/src/yaz-z-server-sr.cpp
+++ b/src/yaz-z-server-sr.cpp
@@ -1,13 +1,10 @@
-/*
- * Copyright (c) 2000-2004, Index Data.
+/* This file is part of the yazpp toolkit.
+ * Copyright (C) 1998-2011 Index Data and Mike Taylor
  * See the file LICENSE for details.
- * 
- * $Id: yaz-z-server-sr.cpp,v 1.11 2005-06-25 15:53:19 adam Exp $
- *
  */
 
 #include <yaz/log.h>
-#include <yaz++/z-server.h>
+#include <yazpp/z-server.h>
 
 using namespace yazpp_1;
 
@@ -15,8 +12,8 @@ Z_Records *Yaz_Facility_Retrieval::pack_records (Z_Server *s,
                                                  const char *resultSetName,
                                                  int start, int xnum,
                                                  Z_RecordComposition *comp,
-                                                 int *next, int *pres,
-                                                 int *format)
+                                                 Odr_int *next, Odr_int *pres,
+                                                 Odr_oid *format)
 {
     int recno, total_length = 0, toget = xnum, dumped_records = 0;
     Z_Records *records =
@@ -30,7 +27,7 @@ Z_Records *Yaz_Facility_Retrieval::pack_records (Z_Server *s,
     records->u.databaseOrSurDiagnostics = reclist;
     reclist->num_records = 0;
     reclist->records = list;
-    *pres = Z_PRES_SUCCESS;
+    *pres = Z_PresentStatus_success;
     *next = 0;
 
     for (recno = start; reclist->num_records < toget; recno++)
@@ -47,7 +44,7 @@ Z_Records *Yaz_Facility_Retrieval::pack_records (Z_Server *s,
 
         if (records->which != Z_Records_DBOSD)
         {
-            *pres = Z_PRES_FAILURE;
+            *pres = Z_PresentStatus_failure;
             return records;
         }
 
@@ -68,7 +65,7 @@ Z_Records *Yaz_Facility_Retrieval::pack_records (Z_Server *s,
             /* record is small enough, really */
             if (this_length <= m_preferredMessageSize)
             {
-                *pres = Z_PRES_PARTIAL_2;
+                *pres = Z_PresentStatus_partial_2;
                 break;
             }
             if (this_length >= m_maximumRecordSize)
@@ -117,7 +114,7 @@ void Yaz_Facility_Retrieval::fetch_via_piggyback (Z_Server *s,
     Z_RecordComposition comp, *compp = 0;
     int hits = *res->resultCount;
     
-    int *nulint = (int *)odr_malloc (odr_encode(), sizeof(*nulint));
+    Odr_int *nulint = (Odr_int *)odr_malloc (odr_encode(), sizeof(*nulint));
     *nulint = 0;
     
     comp.which = Z_RecordComp_simple;
@@ -139,8 +136,9 @@ void Yaz_Facility_Retrieval::fetch_via_piggyback (Z_Server *s,
     
     if (toget && !res->records)
     {
-        res->presentStatus = (int *) odr_malloc (odr_encode(), sizeof(int));
-        *res->presentStatus = Z_PRES_SUCCESS;
+        res->presentStatus = (Odr_int *)
+            odr_malloc (odr_encode(), sizeof(Odr_int));
+        *res->presentStatus = Z_PresentStatus_success;
         res->records =
             pack_records(s, req->resultSetName, 1, toget, compp, 
                          res->nextResultSetPosition,
@@ -241,6 +239,7 @@ int Yaz_Facility_Retrieval::recv(Z_Server *s, Z_APDU *apdu_request)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab