X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=c2642c752aa09223f1184d6d26e3b73bd73d5107;hb=50dbe0d73a13e5c700124b4511251eaeecc5342a;hp=a59fa6a4d5785a77a18cefa1ebd5e4f29709f34a;hpb=69da23537c6bb71ab948e079708bf8ea090de73f;p=idzebra-moved-to-github.git

diff --git a/index/zserver.c b/index/zserver.c
index a59fa6a..c2642c7 100644
--- a/index/zserver.c
+++ b/index/zserver.c
@@ -3,7 +3,19 @@
  * All rights reserved.
  *
  * $Log: zserver.c,v $
- * Revision 1.78  2000-04-05 09:49:35  adam
+ * Revision 1.82  2001-07-09 23:40:09  adam
+ * WIN32 fix.
+ *
+ * Revision 1.81  2001/02/14 21:42:07  adam
+ * Fixed versions as returned in INIT response.
+ *
+ * Revision 1.80  2000/09/05 14:04:05  adam
+ * Updates for prefix 'yaz_' for YAZ log functions.
+ *
+ * Revision 1.79  2000/05/09 10:56:50  adam
+ * Added call to xmalloc/nmem debugging functions.
+ *
+ * Revision 1.78  2000/04/05 09:49:35  adam
  * On Unix, zebra/z'mbol uses automake.
  *
  * Revision 1.77  2000/03/20 19:08:36  adam
@@ -325,8 +337,13 @@ bend_initresult *bend_init (bend_initrequest *q)
     q->bend_fetch = bend_fetch;
     q->bend_scan = bend_scan;
 
+#if ZMBOL
     q->implementation_name = "Z'mbol Information Server";
-    q->implementation_version = "Z'mbol 1.0";
+    q->implementation_version = "Z'mbol " ZEBRAVER;
+#else
+    q->implementation_name = "Zebra Information Server";
+    q->implementation_version = "Zebra " ZEBRAVER;
+#endif
 
     logf (LOG_DEBUG, "bend_init");
 
@@ -454,6 +471,8 @@ static int bend_scan (void *handle, bend_scan_rr *r)
 void bend_close (void *handle)
 {
     zebra_close ((ZebraHandle) handle);
+    xmalloc_trav("bend_close");
+    nmem_print_list();
 }
 
 int bend_sort (void *handle, bend_sort_rr *rr)
@@ -636,7 +655,7 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr)
                                        odr_errmsg(odr_geterror(rr->decode)),
                                        odr_offset(rr->decode));
                                 yaz_log(LOG_LOG, "PDU dump:");
-                                odr_dumpBER(log_file(),
+                                odr_dumpBER(yaz_log_file(),
                                      r->u.single_ASN1_type->buf,
                                      r->u.single_ASN1_type->len);
                             }
@@ -661,7 +680,7 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr)
                                        odr_errmsg(odr_geterror(rr->decode)),
                                        odr_offset(rr->decode));
                                 yaz_log(LOG_LOG, "PDU dump:");
-                                odr_dumpBER(log_file(),
+                                odr_dumpBER(yaz_log_file(),
                                      r->u.single_ASN1_type->buf,
                                      r->u.single_ASN1_type->len);
                             }
@@ -763,7 +782,7 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr)
 				     rec->u.sutrs->len,
 				     rec->u.sutrs->buf);
                         break;
-		    case Z_External_octet        :
+		    case Z_External_octet:
 			if (rec->u.octet_aligned->len > 170)
 			    yaz_log (LOG_LOG, "%d bytes:\n%.168s ...",
 				     rec->u.octet_aligned->len,