projects
/
yazpp-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Aha! $(CXX) is the C++ compiler in make's world.
[yazpp-moved-to-github.git]
/
src
/
yaz-z-server-ursula.cpp
diff --git
a/src/yaz-z-server-ursula.cpp
b/src/yaz-z-server-ursula.cpp
index
c8d0f97
..
882f9fc
100644
(file)
--- a/
src/yaz-z-server-ursula.cpp
+++ b/
src/yaz-z-server-ursula.cpp
@@
-2,13
+2,7
@@
* Copyright (c) 2001, Index Data.
* See the file LICENSE for details.
*
* Copyright (c) 2001, Index Data.
* See the file LICENSE for details.
*
- * $Log: yaz-z-server-ursula.cpp,v $
- * Revision 1.2 2001-04-05 15:12:24 adam
- * WIN32 updates.
- *
- * Revision 1.1 2001/04/04 14:02:49 adam
- * URSULA / Z-ruth service.
- *
+ * $Id: yaz-z-server-ursula.cpp,v 1.6 2001-11-04 22:36:21 adam Exp $
*/
#include <yaz/log.h>
*/
#include <yaz/log.h>
@@
-41,7
+35,7
@@
int Yaz_Facility_Ursula::recv(Yaz_Z_Server *s, Z_APDU *apdu_request)
if (r->which != ODR_EXTERNAL_octet)
{
if (r->which != ODR_EXTERNAL_octet)
{
- logf (LOG_LOG, "ursula::recv not octet alighed");
+ yaz_log (LOG_LOG, "ursula::recv not octet alighed");
return 0;
}
odr_setbuf (s->odr_decode(), (char*) r->u.octet_aligned->buf,
return 0;
}
odr_setbuf (s->odr_decode(), (char*) r->u.octet_aligned->buf,
@@
-49,13
+43,15
@@
int Yaz_Facility_Ursula::recv(Yaz_Z_Server *s, Z_APDU *apdu_request)
Z_UrsPDU *pdu = 0;
if (!z_UrsPDU (s->odr_decode(), &pdu, 0, ""))
{
Z_UrsPDU *pdu = 0;
if (!z_UrsPDU (s->odr_decode(), &pdu, 0, ""))
{
- logf (LOG_LOG, "ursula::decode failed");
+ yaz_log (LOG_LOG, "ursula::decode failed");
return 0;
}
yaz_log (LOG_LOG, "got ursula packet");
apdu_response = s->create_Z_PDU(Z_APDU_extendedServicesResponse);
return 0;
}
yaz_log (LOG_LOG, "got ursula packet");
apdu_response = s->create_Z_PDU(Z_APDU_extendedServicesResponse);
- ursula_service(req, pdu, apdu_response->u.extendedServicesResponse);
+ ursula_service(req, pdu, apdu_response->u.extendedServicesResponse, NULL);
+ // FIXME: Initialize the response pdu... ADAM!!!
+ s->transfer_referenceId(apdu_request, apdu_response);
s->send_Z_PDU(apdu_response);
return 1;
}
s->send_Z_PDU(apdu_response);
return 1;
}
-#endif
\ No newline at end of file
+#endif