Handle present out of range better in sample server.

[yazpp-moved-to-github.git] / src / yaz-z-server.cpp

diff --git a/src/yaz-z-server.cpp b/src/yaz-z-server.cpp
index 99ef2db..8e475e2 100644 (file)
--- a/src/yaz-z-server.cpp
+++ b/src/yaz-z-server.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2000-2003, Index Data.
+ * Copyright (c) 2000-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-z-server.cpp,v 1.17 2003-12-16 14:17:01 adam Exp $
+ * $Id: yaz-z-server.cpp,v 1.20 2004-12-13 20:50:54 adam Exp $
  */
 
 #include <yaz/log.h>
@@ -51,7 +51,7 @@ void Yaz_Z_Server::facility_add(IYaz_Server_Facility *facility,
 void Yaz_Z_Server::recv_GDU (Z_GDU *apdu, int len)
 {
     if (apdu->which == Z_GDU_Z3950)
-       return recv_Z_PDU(apdu->u.z3950, len);
+       recv_Z_PDU(apdu->u.z3950, len);
     else
        delete this;
 }
@@ -100,7 +100,7 @@ void Yaz_Z_Server::recv_Z_PDU (Z_APDU *apdu_request, int len)
        }
        if (!taken)
        {
-           yaz_log (LOG_WARN, "unhandled request = %d", apdu_request->which);
+           yaz_log (YLOG_WARN, "unhandled request = %d", apdu_request->which);
            delete this;
        }
     }
@@ -131,7 +131,7 @@ void Yaz_Z_ServerUtility::create_surrogateDiagnostics(
     Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *)
        odr_malloc (odr, sizeof(*dr));
     
-    yaz_log(LOG_DEBUG, "SurrogateDiagnotic: %d -- %s", error, addinfo);
+    yaz_log(YLOG_DEBUG, "SurrogateDiagnotic: %d -- %s", error, addinfo);
     *err = error;
     rec->databaseName = dbname ? odr_strdup (odr, dbname) : 0;
     rec->which = Z_NamePlusRecord_surrogateDiagnostic;