From a57b3c893b5eac42f8351f39331c7188e3abcd99 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 22 Jan 2002 10:54:46 +0000
Subject: [PATCH] MARC decode fix. Attribute set fix for scan in server. Prox
 logging.

---
 CHANGELOG        |    3 +++
 server/seshigh.c |    4 ++--
 util/marcdisp.c  |    7 +++++--
 zutil/logrpn.c   |    5 ++++-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index ec28a46..ab789fa 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@ Possible compatibility problems with earlier versions marked with '*'.
 
 --- 1.8.5 2002/XX/XX
 
+Fix in MARC decoder. Proximity logging. Fix for attribute set
+in scan handler for server. Patches by Shigeru Ishida.
+
 SSL/COMSTACK updates. cs_rcvconnect completes SSL handshake. ZOOM
 works with SSL.
 
diff --git a/server/seshigh.c b/server/seshigh.c
index 5806a15..556475b 100644
--- a/server/seshigh.c
+++ b/server/seshigh.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2001, Index Data
  * See the file LICENSE for details.
  *
- * $Id: seshigh.c,v 1.123 2002-01-17 21:03:36 adam Exp $
+ * $Id: seshigh.c,v 1.124 2002-01-22 10:54:46 adam Exp $
  */
 
 /*
@@ -1273,7 +1273,7 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd)
 	bsrr->print = assoc->print;
 	bsrr->step_size = res->stepSize;
 	if (!(attset = oid_getentbyoid(req->attributeSet)) ||
-	    attset->oclass != CLASS_RECSYN)
+	    attset->oclass != CLASS_ATTSET)
 	    bsrr->attributeset = VAL_NONE;
 	else
 	    bsrr->attributeset = attset->value;
diff --git a/util/marcdisp.c b/util/marcdisp.c
index 3249b53..b28c88e 100644
--- a/util/marcdisp.c
+++ b/util/marcdisp.c
@@ -3,7 +3,10 @@
  * See the file LICENSE for details.
  *
  * $Log: marcdisp.c,v $
- * Revision 1.15  2001-10-29 09:17:19  adam
+ * Revision 1.16  2002-01-22 10:54:46  adam
+ * MARC decode fix. Attribute set fix for scan in server. Prox logging.
+ *
+ * Revision 1.15  2001/10/29 09:17:19  adam
  * New function marc_display_exl - used by YAZ client. Server returns
  * bad record on position 98 (for testing).
  *
@@ -98,7 +101,7 @@ int marc_display_wrbuf (const char *buf, WRBUF wr, int debug,
 	identifier_length = atoi_n (buf+11, 1);
     else
         identifier_length = 2;
-    base_address = atoi_n (buf+12, 4);
+    base_address = atoi_n (buf+12, 5);
 
     length_data_entry = atoi_n (buf+20, 1);
     length_starting = atoi_n (buf+21, 1);
diff --git a/zutil/logrpn.c b/zutil/logrpn.c
index c30b80d..5d52db6 100644
--- a/zutil/logrpn.c
+++ b/zutil/logrpn.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2001, Index Data
  * All rights reserved.
  *
- * $Id: logrpn.c,v 1.5 2001-11-13 23:00:43 adam Exp $
+ * $Id: logrpn.c,v 1.6 2002-01-22 10:54:46 adam Exp $
  */
 #include <stdio.h>
 
@@ -250,6 +250,9 @@ static void zlog_structure (Z_RPNStructure *zs, int level, enum oid_value ast)
         case Z_Operator_and_not:
             yaz_log (LOG_LOG, "%*.0s and-not", level, "");
             break;
+	case Z_Operator_prox:
+            yaz_log (LOG_LOG, "%*.0s proximity", level, "");
+	    break;
         default:
             yaz_log (LOG_LOG, "%*.0s unknown complex", level, "");
             return;
-- 
1.7.10.4