X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-z-assoc.cpp;h=e33b81361585ca8e7abc6b8b6e5a6b15b07dcc76;hb=355215b6f2c914f2eb099dda88828b8f0c8cb001;hp=5cc0000520848cbfb056514efe0d371082d0d55b;hpb=6104ba97908b1292806a1242b65beb0edbf2314f;p=yazpp-moved-to-github.git

diff --git a/src/yaz-z-assoc.cpp b/src/yaz-z-assoc.cpp
index 5cc0000..e33b813 100644
--- a/src/yaz-z-assoc.cpp
+++ b/src/yaz-z-assoc.cpp
@@ -1,10 +1,29 @@
 /*
- * 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.9  2000-08-10 08:42:42  adam
+ * Revision 1.15  2000-10-11 11:58:17  adam
+ * Moved header files to include/yaz++. Switched to libtool and automake.
+ * Configure script creates yaz++-config script.
+ *
+ * Revision 1.14  2000/09/12 16:40:33  heikki
+ * minor
+ *
+ * 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
+ * Changed call to logging functions (yaz_ added).
+ *
+ * Revision 1.10  2000/09/04 08:29:22  adam
+ * Fixed memory leak(s). Added re-use of associations, rather than
+ * re-init, when maximum number of targets are in use.
+ *
+ * Revision 1.9  2000/08/10 08:42:42  adam
  * Fixes for {set,get}_APDU_log.
  *
  * Revision 1.8  2000/08/07 14:19:59  adam
@@ -43,7 +62,7 @@
 #include <assert.h>
 
 #include <yaz/log.h>
-#include <yaz-z-assoc.h>
+#include <yaz++/yaz-z-assoc.h>
 #include <yaz/otherinfo.h>
 
 int Yaz_Z_Assoc::yaz_init_func()
@@ -52,7 +71,7 @@ int Yaz_Z_Assoc::yaz_init_func()
     return 1;
 }
 
-int Yaz_Z_Assoc::yaz_init_flag = Yaz_Z_Assoc::yaz_init_func();
+int Yaz_Z_Assoc::yaz_init_flag =  Yaz_Z_Assoc::yaz_init_func();  
 
 Yaz_Z_Assoc::Yaz_Z_Assoc(IYaz_PDU_Observable *the_PDU_Observable)
 {
@@ -76,11 +95,11 @@ void Yaz_Z_Assoc::set_APDU_log(const char *fname)
     delete [] m_APDU_fname;
     m_APDU_fname = 0;
 
-    if (fname)
+    if (fname) 
     {
 	m_APDU_fname = new char[strlen(fname)+1];
 	strcpy (m_APDU_fname, fname);
-	if (*fname)
+	if (*fname && strcmp(fname, "-"))
 	    m_APDU_file = fopen (fname, "a");
 	else
 	    m_APDU_file = stderr;
@@ -95,7 +114,7 @@ const char *Yaz_Z_Assoc::get_APDU_log()
 
 Yaz_Z_Assoc::~Yaz_Z_Assoc()
 {
-    m_PDU_Observable->destroy();
+    m_PDU_Observable->destroy();  
     delete m_PDU_Observable;
     odr_destroy (m_odr_print);     // note: also runs fclose on m_APDU_file ..
     odr_destroy (m_odr_out);
@@ -150,7 +169,7 @@ Z_APDU *Yaz_Z_Assoc::decode_Z_PDU(const char *buf, int len)
              odr_errmsg(odr_geterror(m_odr_in)),
              odr_offset(m_odr_in));
         logf(LOG_LOG, "PDU dump:");
-        odr_dumpBER(log_file(), buf, len);
+        odr_dumpBER(yaz_log_file(), buf, len);
         return 0;
     }
     else
@@ -239,6 +258,12 @@ void Yaz_Z_Assoc::get_otherInfoAPDU(Z_APDU *apdu, Z_OtherInformation ***oip)
     case Z_APDU_scanRequest:
 	*oip = &apdu->u.scanRequest->otherInfo;
 	break;
+    case Z_APDU_extendedServicesRequest:
+        *oip = &apdu->u.extendedServicesRequest->otherInfo;
+        break;
+    case Z_APDU_deleteResultSetRequest:
+        *oip = &apdu->u.deleteResultSetRequest->otherInfo;
+        break;
     case Z_APDU_initResponse:
 	*oip = &apdu->u.initResponse->otherInfo;
 	break;
@@ -254,6 +279,12 @@ void Yaz_Z_Assoc::get_otherInfoAPDU(Z_APDU *apdu, Z_OtherInformation ***oip)
     case Z_APDU_scanResponse:
 	*oip = &apdu->u.scanResponse->otherInfo;
 	break;
+    case Z_APDU_extendedServicesResponse:
+        *oip = &apdu->u.extendedServicesResponse->otherInfo;
+        break;
+    case Z_APDU_deleteResultSetResponse:
+        *oip = &apdu->u.deleteResultSetResponse->otherInfo;
+        break;
     default:
 	*oip = 0;
 	break;