X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=zutil%2Flogrpn.c;h=57d2d2471334945dbdc597dd7315a8411cab2b9b;hb=615dcec32011f62525931e5f04490ff7e721ea04;hp=c30b80d978e460cb5bdebb35ae42567baec1632f;hpb=fd4adcc80d442f84c6a1894e890b1b6ccd02615e;p=yaz-moved-to-github.git

diff --git a/zutil/logrpn.c b/zutil/logrpn.c
index c30b80d..57d2d24 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.7 2002-07-25 12:48:54 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;
@@ -263,14 +266,25 @@ static void zlog_structure (Z_RPNStructure *zs, int level, enum oid_value ast)
         {
             Z_AttributesPlusTerm *zapt = zs->u.simple->u.attributesPlusTerm;
 
-            if (zapt->term->which == Z_Term_general) 
+            switch (zapt->term->which)
             {
+            case Z_Term_general:
                 yaz_log (LOG_LOG, "%*.0s term '%.*s' (general)", level, "",
 			 zapt->term->u.general->len,
 			 zapt->term->u.general->buf);
-            }
-            else
-            {
+                break;
+            case Z_Term_characterString:
+                yaz_log (LOG_LOG, "%*.0s term '%s' (string)", level, "",
+			 zapt->term->u.characterString);
+                break;
+            case Z_Term_numeric:
+                yaz_log (LOG_LOG, "%*.0s term '%d' (numeric)", level, "",
+			 *zapt->term->u.numeric);
+                break;
+            case Z_Term_null:
+                yaz_log (LOG_LOG, "%*.0s term (null)", level, "");
+                break;
+            default:
                 yaz_log (LOG_LOG, "%*.0s term (not general)", level, "");
             }
             zlog_attributes (zapt, level+2, ast);