From 67260891a47e8b76c5a38b7f418e5daea31fbab7 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 29 Mar 2001 15:14:26 +0000
Subject: [PATCH] Minor updates.

---
 src/yaz-my-server.cpp    |   24 +++++++++++++++++++-----
 src/yaz-z-server-ill.cpp |    7 +++++--
 src/yaz-z-server.cpp     |    6 ++++--
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/yaz-my-server.cpp b/src/yaz-my-server.cpp
index c7c92f4..d9176b9 100644
--- a/src/yaz-my-server.cpp
+++ b/src/yaz-my-server.cpp
@@ -3,7 +3,10 @@
  * See the file LICENSE for details.
  * 
  * $Log: yaz-my-server.cpp,v $
- * Revision 1.1  2001-03-27 14:47:45  adam
+ * Revision 1.2  2001-03-29 15:14:26  adam
+ * Minor updates.
+ *
+ * Revision 1.1  2001/03/27 14:47:45  adam
  * New server facility scheme.
  *
  * Revision 1.15  2001/03/26 14:43:49  adam
@@ -87,6 +90,7 @@ public:
 
 class MyServer : public Yaz_Z_Server {
 public:
+    ~MyServer();
     MyServer(IYaz_PDU_Observable *the_PDU_Observable);
     IYaz_PDU_Observer* sessionNotify(IYaz_PDU_Observable *the_PDU_Observable,
 				     int fd);
@@ -95,6 +99,8 @@ public:
     void connectNotify();
 
 private:
+    MyRetrieval *m_retrieval;
+    MyILL       *m_ill;
     int m_no;
 };
 
@@ -152,17 +158,23 @@ void MyRetrieval::sr_record (const char *resultSetName,
 			   strlen(rec));
 }
 
+MyServer::~MyServer()
+{
+    delete m_ill;
+    delete m_retrieval;
+}
+
 IYaz_PDU_Observer *MyServer::sessionNotify(
     IYaz_PDU_Observable *the_PDU_Observable, int fd)
 {
     MyServer *new_server;
-    MyRetrieval *new_ret = new MyRetrieval;
-    MyILL *new_ill = new MyILL;
     m_no++;
     new_server = new MyServer(the_PDU_Observable);
     new_server->timeout(900);
-    new_server->facility_add(new_ret, "my sr");
-    new_server->facility_add(new_ill, "my ill");
+    new_server->m_retrieval = new MyRetrieval;
+    new_server->m_ill = new MyILL;
+    new_server->facility_add(new_server->m_retrieval, "my sr");
+    new_server->facility_add(new_server->m_ill, "my ill");
 
     new_server->set_APDU_log(get_APDU_log());
 
@@ -173,6 +185,8 @@ MyServer::MyServer(IYaz_PDU_Observable *the_PDU_Observable) :
     Yaz_Z_Server (the_PDU_Observable)
 {
     m_no = 0;
+    m_ill = 0;
+    m_retrieval = 0;
 }
 
 void MyServer::timeoutNotify()
diff --git a/src/yaz-z-server-ill.cpp b/src/yaz-z-server-ill.cpp
index 2571f3c..9563658 100644
--- a/src/yaz-z-server-ill.cpp
+++ b/src/yaz-z-server-ill.cpp
@@ -3,7 +3,10 @@
  * See the file LICENSE for details.
  * 
  * $Log: yaz-z-server-ill.cpp,v $
- * Revision 1.1  2001-03-27 14:47:45  adam
+ * Revision 1.2  2001-03-29 15:14:26  adam
+ * Minor updates.
+ *
+ * Revision 1.1  2001/03/27 14:47:45  adam
  * New server facility scheme.
  *
  */
@@ -61,7 +64,7 @@ ODR Yaz_Facility_ILL::odr_encode()
 }
 
 int Yaz_Facility_ILL::init(Yaz_Z_Server *s, Z_InitRequest *initRequest,
-				 Z_InitResponse *initResponse)
+			   Z_InitResponse *initResponse)
 {
     Z_Options *req = initRequest->options;
     Z_Options *res = initResponse->options;
diff --git a/src/yaz-z-server.cpp b/src/yaz-z-server.cpp
index 09d251e..a2812f9 100644
--- a/src/yaz-z-server.cpp
+++ b/src/yaz-z-server.cpp
@@ -3,7 +3,10 @@
  * See the file LICENSE for details.
  * 
  * $Log: yaz-z-server.cpp,v $
- * Revision 1.8  2001-03-27 14:47:45  adam
+ * Revision 1.9  2001-03-29 15:14:26  adam
+ * Minor updates.
+ *
+ * Revision 1.8  2001/03/27 14:47:45  adam
  * New server facility scheme.
  *
  * Revision 1.7  2001/03/26 14:43:49  adam
@@ -53,7 +56,6 @@ void Yaz_Z_Server::facility_reset ()
 	Yaz_Z_Server_Facility_Info *p_next = p->m_next;
 
 	delete [] p->m_name;
-	delete [] p->m_facility;
 	delete p;
 	p = p_next;
     }
-- 
1.7.10.4