+ rset_bool_parms bool_parms;
+
+ bool_parms.rset_l = result;
+ bool_parms.rset_r = rset[i];
+ bool_parms.key_size = sizeof(struct it_key);
+ bool_parms.cmp = key_compare_it;
+ result = rset_create (rset_kind_or, &bool_parms);
+ }
+ return result;
+}
+
+static RSET rpn_search_APT_and_list (ZebraHandle zh,
+ Z_AttributesPlusTerm *zapt,
+ const char *termz,
+ oid_value attributeSet,
+ NMEM stream,
+ int reg_type, int complete_flag,
+ const char *rank_type,
+ int num_bases, char **basenames)
+{
+ char term_dst[IT_MAX_WORD+1];
+ const char *termp = termz;
+ RSET rset[60], result;
+ int i, r, rset_no = 0;
+ struct grep_info grep_info;
+
+#ifdef TERM_COUNT
+ grep_info.term_no = 0;
+#endif
+ grep_info.isam_p_size = 0;
+ grep_info.isam_p_buf = NULL;
+ grep_info.zh = zh;
+ grep_info.reg_type = reg_type;
+
+ while (1)
+ {
+ logf (LOG_DEBUG, "APT_and_list termp=%s", termp);
+ grep_info.isam_p_indx = 0;
+ r = string_term (zh, zapt, &termp, attributeSet, stream, &grep_info,
+ reg_type, complete_flag, num_bases, basenames,
+ term_dst);
+ if (r < 1)
+ break;
+ logf (LOG_DEBUG, "term: %s", term_dst);
+ rset[rset_no] = rset_trunc (zh, grep_info.isam_p_buf,
+ grep_info.isam_p_indx, term_dst,
+ strlen(term_dst), rank_type);
+ assert (rset[rset_no]);
+ if (++rset_no >= sizeof(rset)/sizeof(*rset))
+ break;
+ }
+#ifdef TERM_COUNT
+ xfree(grep_info.term_no);
+#endif
+ xfree (grep_info.isam_p_buf);
+ if (rset_no == 0)
+ {
+ rset_null_parms parms;
+
+ parms.rset_term = rset_term_create (term_dst, -1, rank_type);
+ return rset_create (rset_kind_null, &parms);
+ }
+ result = rset[0];
+ for (i = 1; i<rset_no; i++)
+ {
+ rset_bool_parms bool_parms;
+
+ bool_parms.rset_l = result;
+ bool_parms.rset_r = rset[i];
+ bool_parms.key_size = sizeof(struct it_key);
+ bool_parms.cmp = key_compare_it;
+ result = rset_create (rset_kind_and, &bool_parms);
+ }
+ return result;
+}
+
+static int numeric_relation (ZebraHandle zh, Z_AttributesPlusTerm *zapt,
+ const char **term_sub,
+ char *term_dict,
+ oid_value attributeSet,
+ struct grep_info *grep_info,
+ int *max_pos,
+ int reg_type,
+ char *term_dst)
+{
+ AttrType relation;
+ int relation_value;
+ int term_value;
+ int r;
+ char *term_tmp = term_dict + strlen(term_dict);
+
+ attr_init (&relation, zapt, 2);
+ relation_value = attr_find (&relation, NULL);
+
+ logf (LOG_DEBUG, "numeric relation value=%d", relation_value);
+
+ if (!term_100 (zh->zebra_maps, reg_type, term_sub, term_tmp, 1,
+ term_dst))
+ return 0;
+ term_value = atoi (term_tmp);
+ switch (relation_value)
+ {
+ case 1:
+ logf (LOG_DEBUG, "Relation <");
+ gen_regular_rel (term_tmp, term_value-1, 1);
+ break;
+ case 2:
+ logf (LOG_DEBUG, "Relation <=");
+ gen_regular_rel (term_tmp, term_value, 1);
+ break;
+ case 4:
+ logf (LOG_DEBUG, "Relation >=");
+ gen_regular_rel (term_tmp, term_value, 0);
+ break;
+ case 5:
+ logf (LOG_DEBUG, "Relation >");
+ gen_regular_rel (term_tmp, term_value+1, 0);
+ break;
+ case 3:
+ default:
+ logf (LOG_DEBUG, "Relation =");
+ sprintf (term_tmp, "(0*%d)", term_value);
+ }
+ logf (LOG_DEBUG, "dict_lookup_grep: %s", term_tmp);
+ r = dict_lookup_grep (zh->dict, term_dict, 0, grep_info, max_pos,
+ 0, grep_handle);
+ if (r)
+ logf (LOG_WARN, "dict_lookup_grep fail, rel=gt: %d", r);
+ logf (LOG_DEBUG, "%d positions", grep_info->isam_p_indx);
+ return 1;
+}
+
+static int numeric_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt,
+ const char **term_sub,
+ oid_value attributeSet, struct grep_info *grep_info,
+ int reg_type, int complete_flag,
+ int num_bases, char **basenames,
+ char *term_dst)
+{
+ char term_dict[2*IT_MAX_WORD+2];
+ int r, base_no;
+ AttrType use;
+ int use_value;
+ oid_value curAttributeSet = attributeSet;
+ const char *termp;
+ struct rpn_char_map_info rcmi;
+
+ rpn_char_map_prepare (zh, reg_type, &rcmi);
+ attr_init (&use, zapt, 1);
+ use_value = attr_find (&use, &curAttributeSet);
+ logf (LOG_DEBUG, "numeric_term, use value %d", use_value);
+
+ if (use_value == -1)
+ use_value = 1016;
+
+ for (base_no = 0; base_no < num_bases; base_no++)
+ {
+ attent attp;
+ data1_local_attribute *local_attr;
+ int max_pos, prefix_len = 0;
+
+ termp = *term_sub;
+ if ((r=att_getentbyatt (zh, &attp, curAttributeSet, use_value)))