Updated WIN32 code specific sections. Changed header.

[idzebra-moved-to-github.git] / index / zrpn.c

diff --git a/index/zrpn.c b/index/zrpn.c
index 265dc6a..fdb31e9 100644 (file)
--- a/index/zrpn.c
+++ b/index/zrpn.c
@@ -1,10 +1,19 @@
 /*
- * Copyright (C) 1995-1998, Index Data
+ * Copyright (C) 1995-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zrpn.c,v $
- * Revision 1.88  1998-10-18 07:54:52  adam
+ * Revision 1.91  1999-02-02 14:51:13  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.90  1998/11/16 16:03:43  adam
+ * Moved loggin utilities to Yaz. Was implemented in file zlogs.c.
+ *
+ * Revision 1.89  1998/11/16 10:11:55  adam
+ * Added addtional info for error 114 - unsupported use attribute.
+ *
+ * Revision 1.88  1998/10/18 07:54:52  adam
  * Additional info added for diagnostics 114 (Unsupported use attribute) and
  * 121 (Unsupported attribute set).
  *
@@ -310,7 +319,7 @@
  */
 #include <stdio.h>
 #include <assert.h>
-#ifdef WINDOWS
+#ifdef WIN32
 #include <io.h>
 #else
 #include <unistd.h>
@@ -1016,7 +1025,10 @@ static int string_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt,
         }
         if (!prefix_len)
         {
-            zh->errCode = 114;
+           char val_str[32];
+           sprintf (val_str, "%d", use_value);
+           zh->errCode = 114;
+           zh->errString = nmem_strdup (stream, val_str);
             return -1;
         }
         term_dict[prefix_len++] = ')';        
@@ -2210,7 +2222,6 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
     if (attributeset == VAL_NONE)
         attributeset = VAL_BIB1;
 
-    zlog_scan (zapt, attributeset);
     logf (LOG_DEBUG, "position = %d, num = %d", pos, num);
         
     attr_init (&use, zapt, 1);