X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fyaz-z-server-sr.cpp;h=fdddaa50ddbe7668f56207cfddd674c3fbbd4943;hb=2d21fb7f6fdf924a2dcbb69722425f555b80821f;hp=396757f2bd358289c13031ccfe6332a635964e1e;hpb=4c758111f1ff5a815888f70a4c4335ab149f5608;p=yazpp-moved-to-github.git

diff --git a/src/yaz-z-server-sr.cpp b/src/yaz-z-server-sr.cpp
index 396757f..fdddaa5 100644
--- a/src/yaz-z-server-sr.cpp
+++ b/src/yaz-z-server-sr.cpp
@@ -1,15 +1,17 @@
 /*
- * Copyright (c) 2000-2001, Index Data.
+ * Copyright (c) 2000-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-z-server-sr.cpp,v 1.7 2004-11-30 21:10:31 adam Exp $
+ * $Id: yaz-z-server-sr.cpp,v 1.10 2005-06-08 13:28:06 adam Exp $
  *
  */
 
-#include <yaz/ylog.h>
+#include <yaz/log.h>
 #include <yaz++/z-server.h>
 
-Z_Records *Yaz_Facility_Retrieval::pack_records (Yaz_Z_Server *s,
+using namespace yazpp_1;
+
+Z_Records *Yaz_Facility_Retrieval::pack_records (Z_Server *s,
 						 const char *resultSetName,
 						 int start, int xnum,
 						 Z_RecordComposition *comp,
@@ -103,7 +105,7 @@ Z_Records *Yaz_Facility_Retrieval::pack_records (Yaz_Z_Server *s,
     return records;
 }
 
-void Yaz_Facility_Retrieval::fetch_via_piggyback (Yaz_Z_Server *s,
+void Yaz_Facility_Retrieval::fetch_via_piggyback (Z_Server *s,
 						  Z_SearchRequest *req,
 						  Z_SearchResponse *res)
 {
@@ -163,7 +165,7 @@ void Yaz_Facility_Retrieval::fetch_via_piggyback (Yaz_Z_Server *s,
     }
 }
 
-void Yaz_Facility_Retrieval::fetch_via_present (Yaz_Z_Server *s,
+void Yaz_Facility_Retrieval::fetch_via_present (Z_Server *s,
 						Z_PresentRequest *req,
 						Z_PresentResponse *res)
 {
@@ -179,7 +181,7 @@ void Yaz_Facility_Retrieval::fetch_via_present (Yaz_Z_Server *s,
 	    res->records->u.databaseOrSurDiagnostics->num_records;
 }
 
-int Yaz_Facility_Retrieval::init(Yaz_Z_Server *s, Z_InitRequest *initRequest,
+int Yaz_Facility_Retrieval::init(Z_Server *s, Z_InitRequest *initRequest,
 				 Z_InitResponse *initResponse)
 {
     Z_Options *req = initRequest->options;
@@ -204,7 +206,7 @@ ODR Yaz_Facility_Retrieval::odr_decode()
     return m_odr_decode;
 }
 
-int Yaz_Facility_Retrieval::recv(Yaz_Z_Server *s, Z_APDU *apdu_request)
+int Yaz_Facility_Retrieval::recv(Z_Server *s, Z_APDU *apdu_request)
 {   
     Z_APDU *apdu_response;
     m_odr_encode = s->odr_encode();