X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzrpn.c;h=01019044d599b1bca3c5d4e9aedf1c879670a228;hb=ec874a59d0538f9eae969cf885e63f5ebda0f601;hp=415200fe87fcf339c3624e3e67a27b1adba46632;hpb=3d01abbe1238c82d62e4c01eb7cac760d3d53377;p=idzebra-moved-to-github.git

diff --git a/index/zrpn.c b/index/zrpn.c
index 415200f..0101904 100644
--- a/index/zrpn.c
+++ b/index/zrpn.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zrpn.c,v $
- * Revision 1.68  1997-10-27 14:33:06  adam
+ * Revision 1.70  1997-10-31 12:34:43  adam
+ * Changed a few log statements.
+ *
+ * Revision 1.69  1997/10/29 12:05:02  adam
+ * Server produces diagnostic "Unsupported Attribute Set" when appropriate.
+ *
+ * Revision 1.68  1997/10/27 14:33:06  adam
  * Moved towards generic character mapping depending on "structure"
  * field in abstract syntax file. Fixed a few memory leaks. Fixed
  * bug with negative integers when doing searches with relational
@@ -727,11 +733,14 @@ static int field_term (ZServerInfo *zi, Z_AttributesPlusTerm *zapt,
         int max_pos, prefix_len = 0;
 
         termp = *term_sub;
-        if (!att_getentbyatt (zi, &attp, curAttributeSet, use_value))
+        if ((r=att_getentbyatt (zi, &attp, curAttributeSet, use_value)))
         {
-            logf (LOG_DEBUG, "att_getentbyatt fail. set=%d use=%d",
-                  curAttributeSet, use_value);
-            zi->errCode = 114;
+            logf (LOG_DEBUG, "att_getentbyatt fail. set=%d use=%d r=%d",
+                  curAttributeSet, use_value, r);
+	    if (r == -1)
+		zi->errCode = 114;
+	    else
+		zi->errCode = 121;
             return -1;
         }
         if (zebTargetInfo_curDatabase (zi->zti, basenames[base_no]))
@@ -764,7 +773,7 @@ static int field_term (ZServerInfo *zi, Z_AttributesPlusTerm *zapt,
         term_dict[prefix_len++] = ')';        
         term_dict[prefix_len++] = 1;
         term_dict[prefix_len++] = reg_type;
-	logf (LOG_LOG, "reg_type = %d", term_dict[prefix_len-1]);
+	logf (LOG_DEBUG, "reg_type = %d", term_dict[prefix_len-1]);
         term_dict[prefix_len] = '\0';
         if (!relational_term (zi, zapt, &termp, term_dict,
                               attributeSet, grep_info, &max_pos, reg_type))
@@ -1152,7 +1161,7 @@ static RSET rpn_search_APT_phrase (ZServerInfo *zi,
 
     while (1)
     { 
-	logf (LOG_LOG, "APT_phrase termp=%s", termp);
+	logf (LOG_DEBUG, "APT_phrase termp=%s", termp);
 	grep_info.isam_p_indx = 0;
         r = field_term (zi, zapt, &termp, attributeSet, &grep_info,
 			reg_type, complete_flag, num_bases, basenames);
@@ -1525,14 +1534,18 @@ int rpn_scan (ZServerInfo *zi, Z_AttributesPlusTerm *zapt,
         use_value = 1016;
     for (base_no = 0; base_no < num_bases && ord_no < 32; base_no++)
     {
+	int r;
         attent attp;
         data1_local_attribute *local_attr;
 
-        if (!att_getentbyatt (zi, &attp, attributeset, use_value))
+        if ((r=att_getentbyatt (zi, &attp, attributeset, use_value)))
         {
             logf (LOG_DEBUG, "att_getentbyatt fail. set=%d use=%d",
                   attributeset, use_value);
-            return zi->errCode = 114;
+	    if (r == -1)
+		zi->errCode = 114;
+	    else
+		zi->errCode = 121;
         }
         if (zebTargetInfo_curDatabase (zi->zti, basenames[base_no]))
         {