X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-server.cpp;h=0cbf8010ef083ca90da9579f94f12cde6837ce7c;hb=eea3cf8293bab09d65bac8d34e16b1a12ed67919;hp=7d496c964b88d6090b93c15859b57e2af63e8881;hpb=bf377ba45c8c1cbcf843fdecc6d5c68fda6bad18;p=yazpp-moved-to-github.git

diff --git a/src/yaz-server.cpp b/src/yaz-server.cpp
index 7d496c9..0cbf801 100644
--- a/src/yaz-server.cpp
+++ b/src/yaz-server.cpp
@@ -4,21 +4,47 @@
  * Sebastian Hammer, Adam Dickmeiss
  * 
  * $Log: yaz-server.cpp,v $
- * Revision 1.1  1999-01-28 09:41:07  adam
- * Initial revision
+ * Revision 1.7  1999-12-06 13:52:45  adam
+ * Modified for new location of YAZ header files. Experimental threaded
+ * operation.
+ *
+ * Revision 1.6  1999/04/21 12:09:01  adam
+ * Many improvements. Modified to proxy server to work with "sessions"
+ * based on cookies.
+ *
+ * Revision 1.5  1999/04/09 11:46:57  adam
+ * Added object Yaz_Z_Assoc. Much more functional client.
+ *
+ * Revision 1.4  1999/03/23 14:17:57  adam
+ * More work on timeout handling. Work on yaz-client.
+ *
+ * Revision 1.3  1999/02/02 14:01:22  adam
+ * First WIN32 port of YAZ++.
+ *
+ * Revision 1.2  1999/01/28 13:08:47  adam
+ * Yaz_PDU_Assoc better encapsulated. Memory leak fix in
+ * yaz-socket-manager.cc.
+ *
+ * Revision 1.1.1.1  1999/01/28 09:41:07  adam
+ * First implementation of YAZ++.
  *
  */
 
-#include <log.h>
-#include <yaz-ir-assoc.h>
+#include <yaz/log.h>
+#include <yaz-z-assoc.h>
 #include <yaz-pdu-assoc.h>
 #include <yaz-socket-manager.h>
 
-class MyServer : public Yaz_IR_Assoc {
+class MyServer : public Yaz_Z_Assoc {
 public:
     MyServer(IYaz_PDU_Observable *the_PDU_Observable);
     void recv_Z_PDU(Z_APDU *apdu);
     IYaz_PDU_Observer* clone(IYaz_PDU_Observable *the_PDU_Observable);
+    void failNotify();
+    void timeoutNotify();
+    void connectNotify();
+private:
+    int m_no;
 };
 
 static int stop = 0;
@@ -42,31 +68,58 @@ void MyServer::recv_Z_PDU(Z_APDU *apdu)
         logf (LOG_LOG, "got presentRequest");
 	apdu = create_Z_PDU(Z_APDU_presentResponse);
 	send_Z_PDU(apdu);
-	stop = 1;
+	// stop = 1;
         break;
     }
 }
 
 IYaz_PDU_Observer *MyServer::clone(IYaz_PDU_Observable *the_PDU_Observable)
 {
-    return new MyServer(the_PDU_Observable);
+    MyServer *new_server;
+    logf (LOG_LOG, "child no %d", m_no);
+    m_no++;
+    new_server = new MyServer(the_PDU_Observable);
+    new_server->timeout(60);
+    return new_server;
 }
 
 MyServer::MyServer(IYaz_PDU_Observable *the_PDU_Observable) :
-    Yaz_IR_Assoc (the_PDU_Observable)
+    Yaz_Z_Assoc (the_PDU_Observable)
 {
+    m_no = 0;
+}
 
+void MyServer::timeoutNotify()
+{
+    logf (LOG_LOG, "connection timed out");
+    delete this;
+}
+
+void MyServer::failNotify()
+{
+    logf (LOG_LOG, "connection closed by client");
+    delete this;
+}
+
+void MyServer::connectNotify()
+{
 }
 
 int main(int argc, char **argv)
 {
     Yaz_SocketManager mySocketManager;
+    Yaz_PDU_Assoc *my_PDU_Assoc = new Yaz_PDU_Assoc(&mySocketManager);
 
-    Yaz_PDU_Assoc my_PDU_Assoc(&mySocketManager, 0);
-    MyServer z(&my_PDU_Assoc);
-
-    z.server("@:9999");
+    MyServer z(my_PDU_Assoc);
 
+    if (argc <= 1)
+	z.server("@:9999");
+    else
+    {
+	for (int i = 1; i < argc; i++)
+	    z.server(argv[i]);
+    }
     while (!stop && mySocketManager.processEvent() > 0)
 	;
+    return 0;
 }