X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fyaz-z-assoc.cpp;h=04c437544529aa2c677098c0af91650cd4055ce6;hb=316df82985a4207a7d52e7d88567bf26d5c2c7c8;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..04c4375 100644
--- a/src/yaz-z-assoc.cpp
+++ b/src/yaz-z-assoc.cpp
@@ -1,10 +1,22 @@
 /*
- * 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.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
@@ -80,7 +92,7 @@ void Yaz_Z_Assoc::set_APDU_log(const char *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;
@@ -150,7 +162,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 +251,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 +272,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;