/*
- * Copyright (c) 1998-1999, Index Data.
+ * Copyright (c) 1998-2000, Index Data.
* See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
*
- * $Id: yaz-ir-assoc.h,v 1.10 2000-09-06 14:23:45 adam Exp $
+ * $Id: yaz-ir-assoc.h,v 1.11 2000-09-08 10:23:42 adam Exp $
*/
#include <yaz-z-assoc.h>
/*
- * Copyright (c) 1998-1999, Index Data.
+ * Copyright (c) 1998-2000, Index Data.
* See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
*
- * $Id: yaz-pdu-assoc.h,v 1.7 1999-12-06 13:52:45 adam Exp $
+ * $Id: yaz-pdu-assoc.h,v 1.8 2000-09-08 10:23:42 adam Exp $
*/
#include <yaz/comstack.h>
/*
- * Copyright (c) 1998-1999, Index Data.
+ * Copyright (c) 1998-2000, Index Data.
* See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
*
- * $Id: yaz-pdu-observer.h,v 1.7 1999-12-06 13:52:45 adam Exp $
+ * $Id: yaz-pdu-observer.h,v 1.8 2000-09-08 10:23:42 adam Exp $
*/
#ifndef YAZ_PDU_OBSERVER_H
/*
- * Copyright (c) 1998-1999, Index Data.
+ * Copyright (c) 1998-2000, Index Data.
* See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
*
- * $Id: yaz-proxy.h,v 1.12 2000-08-31 14:41:55 adam Exp $
+ * $Id: yaz-proxy.h,v 1.13 2000-09-08 10:23:42 adam Exp $
*/
#include <yaz-z-assoc.h>
/*
- * Copyright (c) 1998-1999, Index Data.
+ * Copyright (c) 1998-2000, Index Data.
* See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
*
- * $Id: yaz-query.h,v 1.2 1999-04-20 10:30:05 adam Exp $
+ * $Id: yaz-query.h,v 1.3 2000-09-08 10:23:42 adam Exp $
*/
/*
- * Copyright (c) 1998-1999, Index Data.
+ * Copyright (c) 1998-2000, Index Data.
* See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
*
- * $Id: yaz-socket-manager.h,v 1.5 1999-12-06 13:52:45 adam Exp $
+ * $Id: yaz-socket-manager.h,v 1.6 2000-09-08 10:23:42 adam Exp $
*/
#include <yaz-socket-observer.h>
/*
- * Copyright (c) 1998-1999, Index Data.
+ * Copyright (c) 1998-2000, Index Data.
* See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
*
- * $Id: yaz-socket-observer.h,v 1.4 1999-04-20 10:30:05 adam Exp $
+ * $Id: yaz-socket-observer.h,v 1.5 2000-09-08 10:23:42 adam Exp $
*/
#ifndef YAZ_SOCKET_OBSERVER_H
/*
- * Copyright (c) 1998-1999, Index Data.
+ * Copyright (c) 1998-2000, Index Data.
* See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
*
- * $Id: yaz-z-assoc.h,v 1.7 2000-08-07 14:19:59 adam Exp $
+ * $Id: yaz-z-assoc.h,v 1.8 2000-09-08 10:23:42 adam Exp $
*/
#include <yaz/proto.h>
/*
- * Copyright (c) 1998-1999, Index Data.
+ * Copyright (c) 1998-2000, Index Data.
* See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
*
- * $Id: yaz-z-query.h,v 1.6 1999-12-06 13:52:45 adam Exp $
+ * $Id: yaz-z-query.h,v 1.7 2000-09-08 10:23:42 adam Exp $
*/
#include <yaz/proto.h>
--- /dev/null
+/*
+ * Copyright (c) 2000, Index Data.
+ * See the file LICENSE for details.
+ *
+ * $Id: yaz-z-server.h,v 1.1 2000-09-08 10:23:42 adam Exp $
+ */
+
+#include <yaz-z-assoc.h>
+
+class YAZ_EXPORT Yaz_Z_Server : public Yaz_Z_Assoc {
+public:
+ Yaz_Z_Server(IYaz_PDU_Observable *the_PDU_Observable);
+ virtual void recv_Z_PDU(Z_APDU *apdu);
+private:
+ int m_no;
+};
# Copyright (C) 1999, Index Data ApS
# All rights reserved.
# Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.6 1999-12-06 13:52:45 adam Exp $
+# $Id: Makefile.in,v 1.7 2000-09-08 10:23:42 adam Exp $
SHELL=/bin/sh
PROGO3=yaz-proxy-main.o
LIB=libyaz++.lib
PO=yaz-socket-manager.o yaz-pdu-assoc.o yaz-z-assoc.o yaz-proxy.o \
- yaz-z-query.o yaz-ir-assoc.o
+ yaz-z-query.o yaz-ir-assoc.o yaz-z-server.o
.SUFFIXES: .cpp
/*
* Copyright (c) 1998-2000, Index Data.
* See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
*
* $Log: yaz-client.cpp,v $
- * Revision 1.13 2000-09-06 14:23:45 adam
+ * Revision 1.14 2000-09-08 10:23:42 adam
+ * Added skeleton of yaz-z-server.
+ *
+ * Revision 1.13 2000/09/06 14:23:45 adam
* WIN32 updates.
*
* Revision 1.12 2000/09/04 08:59:16 adam
/*
- * Copyright (c) 1998-1999, Index Data.
+ * Copyright (c) 1998-2000, Index Data.
* See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
*
* $Log: yaz-pdu-assoc.cpp,v $
- * Revision 1.12 2000-09-06 14:23:45 adam
+ * Revision 1.13 2000-09-08 10:23:42 adam
+ * Added skeleton of yaz-z-server.
+ *
+ * Revision 1.12 2000/09/06 14:23:45 adam
* WIN32 updates.
*
* Revision 1.11 2000/09/04 08:29:22 adam
}
}
-#if 1
+#if 0
// Single-threaded... Only useful for non-blocking handlers
void Yaz_PDU_Assoc::childNotify(int fd)
#include <pthread.h>
#endif
-void
#ifdef WIN32
-__cdecl
+void __cdecl
+#else
+void *
#endif
events(void *p)
{
/*
- * Copyright (c) 1998-1999, Index Data.
+ * Copyright (c) 1998-2000, Index Data.
* See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
*
* $Log: yaz-proxy-main.cpp,v $
- * Revision 1.10 2000-09-04 08:59:16 adam
+ * Revision 1.11 2000-09-08 10:23:42 adam
+ * Added skeleton of yaz-z-server.
+ *
+ * Revision 1.10 2000/09/04 08:59:16 adam
* Changed call to logging functions (yaz_ added).
*
* Revision 1.9 2000/08/07 14:19:59 adam
/*
* Copyright (c) 1998-2000, Index Data.
* See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
*
* $Log: yaz-proxy.cpp,v $
- * Revision 1.17 2000-09-05 13:57:28 adam
+ * Revision 1.18 2000-09-08 10:23:42 adam
+ * Added skeleton of yaz-z-server.
+ *
+ * Revision 1.17 2000/09/05 13:57:28 adam
* Fixed get_otherInfoAPDU to return otherInfo for extended services.
*
* Revision 1.16 2000/09/04 08:29:22 adam
/*
- * Copyright (c) 1998-1999, Index Data.
+ * Copyright (c) 1998-2000, Index Data.
* See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
*
* $Log: yaz-server.cpp,v $
- * Revision 1.7 1999-12-06 13:52:45 adam
+ * Revision 1.8 2000-09-08 10:23:42 adam
+ * Added skeleton of yaz-z-server.
+ *
+ * Revision 1.7 1999/12/06 13:52:45 adam
* Modified for new location of YAZ header files. Experimental threaded
* operation.
*
*/
#include <yaz/log.h>
-#include <yaz-z-assoc.h>
+#include <yaz-z-server.h>
#include <yaz-pdu-assoc.h>
#include <yaz-socket-manager.h>
-class MyServer : public Yaz_Z_Assoc {
+class MyServer : public Yaz_Z_Server {
public:
MyServer(IYaz_PDU_Observable *the_PDU_Observable);
void recv_Z_PDU(Z_APDU *apdu);
}
MyServer::MyServer(IYaz_PDU_Observable *the_PDU_Observable) :
- Yaz_Z_Assoc (the_PDU_Observable)
+ Yaz_Z_Server (the_PDU_Observable)
{
m_no = 0;
}
/*
- * Copyright (c) 1998-1999, Index Data.
+ * Copyright (c) 1998-2000, Index Data.
* See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
*
* $Log: yaz-socket-manager.cpp,v $
- * Revision 1.9 2000-08-07 14:19:59 adam
+ * Revision 1.10 2000-09-08 10:23:42 adam
+ * Added skeleton of yaz-z-server.
+ *
+ * Revision 1.9 2000/08/07 14:19:59 adam
* Fixed serious bug regarding timeouts. Improved logging for proxy.
*
* Revision 1.8 1999/12/06 13:52:45 adam
/*
- * Copyright (c) 1998-1999, Index Data.
+ * Copyright (c) 1998-2000, Index Data.
* See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
*
* $Log: yaz-z-assoc.cpp,v $
- * Revision 1.12 2000-09-05 13:57:28 adam
+ * Revision 1.13 2000-09-08 10:23:42 adam
+ * Added skeleton of yaz-z-server.
+ *
+ * Revision 1.12 2000/09/05 13:57:28 adam
* Fixed get_otherInfoAPDU to return otherInfo for extended services.
*
* Revision 1.11 2000/09/04 08:59:16 adam
/*
- * Copyright (c) 1998-1999, Index Data.
+ * Copyright (c) 1998-2000, Index Data.
* See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
*
* $Log: yaz-z-query.cpp,v $
- * Revision 1.7 2000-05-10 11:36:58 ian
+ * Revision 1.8 2000-09-08 10:23:42 adam
+ * Added skeleton of yaz-z-server.
+ *
+ * Revision 1.7 2000/05/10 11:36:58 ian
* Added default parameters for refid to request functions.
* Added default parameter for result set name to search and present request.
* Commented out forced logging of PDU contents.
--- /dev/null
+/*
+ * Copyright (c) 2000, Index Data.
+ * See the file LICENSE for details.
+ *
+ * $Log: yaz-z-server.cpp,v $
+ * Revision 1.1 2000-09-08 10:23:42 adam
+ * Added skeleton of yaz-z-server.
+ *
+ */
+
+#include <yaz/log.h>
+#include <yaz-z-server.h>
+
+
+Yaz_Z_Server::Yaz_Z_Server(IYaz_PDU_Observable *the_PDU_Observable)
+ : Yaz_Z_Assoc(the_PDU_Observable)
+{
+ m_no = 0;
+}
+
+void Yaz_Z_Server::recv_Z_PDU (Z_APDU *apdu)
+{
+ logf (LOG_LOG, "recv_Z_PDU in Yaz_Z_Server");
+}
+