+ return 0;
+}
+
+
+static ZEBRA_RES term_list_trunc(ZebraHandle zh,
+ Z_AttributesPlusTerm *zapt,
+ const char *termz_org,
+ oid_value attributeSet,
+ NMEM stream,
+ int reg_type, int complete_flag,
+ const char *rank_type, int xpath_use,
+ int num_bases, char **basenames,
+ NMEM rset_nmem,
+ RSET **result_sets, int *num_result_sets)
+{
+ char term_dst[IT_MAX_WORD+1];
+ struct grep_info grep_info;
+ char *termz = normalize_term(zh, zapt, termz_org, stream, reg_type);
+ const char *termp = termz;
+ int alloc_sets = 0;
+
+ *num_result_sets = 0;
+ *term_dst = 0;
+ if (grep_info_prepare(zh, zapt, &grep_info, reg_type, stream))
+ return ZEBRA_FAIL;
+ while(1)
+ {
+ ZEBRA_RES res;
+
+ if (alloc_sets == *num_result_sets)
+ {
+ int add = 10;
+ RSET *rnew = (RSET *) nmem_malloc(stream, (alloc_sets+add) *
+ sizeof(*rnew));
+ if (alloc_sets)
+ memcpy(rnew, *result_sets, alloc_sets * sizeof(*rnew));
+ alloc_sets = alloc_sets + add;
+ *result_sets = rnew;
+ }
+ res = term_trunc(zh, zapt, &termp, attributeSet,
+ stream, &grep_info,
+ reg_type, complete_flag,
+ num_bases, basenames,
+ term_dst, rank_type,
+ xpath_use, rset_nmem,
+ &(*result_sets)[*num_result_sets]);
+ if (res != ZEBRA_OK)
+ {
+ int i;
+ for (i = 0; i < *num_result_sets; i++)
+ rset_delete((*result_sets)[i]);
+ grep_info_delete (&grep_info);
+ return res;
+ }
+ if ((*result_sets)[*num_result_sets] == 0)
+ break;
+ (*num_result_sets)++;
+ }
+ grep_info_delete(&grep_info);
+ return ZEBRA_OK;
+}
+
+static ZEBRA_RES rpn_search_APT_phrase(ZebraHandle zh,
+ Z_AttributesPlusTerm *zapt,
+ const char *termz_org,
+ oid_value attributeSet,
+ NMEM stream,
+ int reg_type, int complete_flag,
+ const char *rank_type, int xpath_use,
+ int num_bases, char **basenames,
+ NMEM rset_nmem,
+ RSET *rset)
+{
+ RSET *result_sets = 0;
+ int num_result_sets = 0;
+ ZEBRA_RES res =
+ term_list_trunc(zh, zapt, termz_org, attributeSet,
+ stream, reg_type, complete_flag,
+ rank_type, xpath_use,
+ num_bases, basenames,
+ rset_nmem,
+ &result_sets, &num_result_sets);
+ if (res != ZEBRA_OK)
+ return res;
+ if (num_result_sets == 0)
+ *rset = rsnull_create (rset_nmem, key_it_ctrl);
+ else if (num_result_sets == 1)
+ *rset = result_sets[0];
+ else
+ *rset = rsprox_create(rset_nmem, key_it_ctrl, key_it_ctrl->scope,
+ num_result_sets, result_sets,
+ 1 /* ordered */, 0 /* exclusion */,
+ 3 /* relation */, 1 /* distance */);
+ if (!*rset)
+ return ZEBRA_FAIL;
+ return ZEBRA_OK;
+}
+
+static ZEBRA_RES rpn_search_APT_or_list(ZebraHandle zh,
+ Z_AttributesPlusTerm *zapt,
+ const char *termz_org,
+ oid_value attributeSet,
+ NMEM stream,
+ int reg_type, int complete_flag,
+ const char *rank_type,
+ int xpath_use,
+ int num_bases, char **basenames,
+ NMEM rset_nmem,
+ RSET *rset)
+{
+ RSET *result_sets = 0;
+ int num_result_sets = 0;
+ ZEBRA_RES res =
+ term_list_trunc(zh, zapt, termz_org, attributeSet,
+ stream, reg_type, complete_flag,
+ rank_type, xpath_use,
+ num_bases, basenames,
+ rset_nmem,
+ &result_sets, &num_result_sets);
+ if (res != ZEBRA_OK)
+ return res;
+ if (num_result_sets == 0)
+ *rset = rsnull_create (rset_nmem, key_it_ctrl);
+ else if (num_result_sets == 1)
+ *rset = result_sets[0];
+ else
+ *rset = rsmulti_or_create(rset_nmem, key_it_ctrl, key_it_ctrl->scope,
+ num_result_sets, result_sets);
+ if (!*rset)
+ return ZEBRA_FAIL;
+ return ZEBRA_OK;
+}
+
+static ZEBRA_RES rpn_search_APT_and_list(ZebraHandle zh,
+ Z_AttributesPlusTerm *zapt,
+ const char *termz_org,
+ oid_value attributeSet,
+ NMEM stream,
+ int reg_type, int complete_flag,
+ const char *rank_type,
+ int xpath_use,
+ int num_bases, char **basenames,
+ NMEM rset_nmem,
+ RSET *rset)
+{
+ RSET *result_sets = 0;
+ int num_result_sets = 0;
+ ZEBRA_RES res =
+ term_list_trunc(zh, zapt, termz_org, attributeSet,
+ stream, reg_type, complete_flag,
+ rank_type, xpath_use,
+ num_bases, basenames,
+ rset_nmem,
+ &result_sets, &num_result_sets);
+ if (res != ZEBRA_OK)
+ return res;
+ if (num_result_sets == 0)
+ *rset = rsnull_create (rset_nmem, key_it_ctrl);
+ else if (num_result_sets == 1)
+ *rset = result_sets[0];
+ else
+ *rset = rsmulti_and_create(rset_nmem, key_it_ctrl, key_it_ctrl->scope,
+ num_result_sets, result_sets);
+ if (!*rset)
+ return ZEBRA_FAIL;
+ return ZEBRA_OK;
+}
+
+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,
+ int *error_code)
+{
+ AttrType relation;
+ int relation_value;
+ int term_value;
+ int r;
+ char *term_tmp = term_dict + strlen(term_dict);
+
+ *error_code = 0;
+ attr_init(&relation, zapt, 2);
+ relation_value = attr_find(&relation, NULL);
+
+ yaz_log(log_level_rpn, "numeric relation value=%d", relation_value);
+
+ if (!term_100(zh->reg->zebra_maps, reg_type, term_sub, term_tmp, 1,
+ term_dst))
+ return 0;
+ term_value = atoi (term_tmp);
+ switch (relation_value)
+ {
+ case 1:
+ yaz_log(log_level_rpn, "Relation <");
+ gen_regular_rel(term_tmp, term_value-1, 1);
+ break;
+ case 2:
+ yaz_log(log_level_rpn, "Relation <=");
+ gen_regular_rel(term_tmp, term_value, 1);
+ break;
+ case 4:
+ yaz_log(log_level_rpn, "Relation >=");
+ gen_regular_rel(term_tmp, term_value, 0);
+ break;
+ case 5:
+ yaz_log(log_level_rpn, "Relation >");
+ gen_regular_rel(term_tmp, term_value+1, 0);
+ break;
+ case -1:
+ case 3:
+ yaz_log(log_level_rpn, "Relation =");
+ sprintf(term_tmp, "(0*%d)", term_value);
+ break;
+ default:
+ *error_code = 117;
+ return 0;
+ }
+ yaz_log(log_level_rpn, "dict_lookup_grep: %s", term_tmp);
+ r = dict_lookup_grep(zh->reg->dict, term_dict, 0, grep_info, max_pos,
+ 0, grep_handle);
+ if (r)
+ yaz_log(YLOG_WARN, "dict_lookup_grep fail, rel = gt: %d", r);
+ yaz_log(log_level_rpn, "%d positions", grep_info->isam_p_indx);
+ return 1;
+}
+
+static ZEBRA_RES 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, int xpath_use, NMEM stream)
+{
+ char term_dict[2*IT_MAX_WORD+2];
+ int r, base_no;
+ AttrType use;
+ int use_value;
+ const char *use_string = 0;
+ oid_value curAttributeSet = attributeSet;
+ const char *termp;
+ struct rpn_char_map_info rcmi;
+
+ int bases_ok = 0; /* no of databases with OK attribute */
+ int errCode = 0; /* err code (if any is not OK) */
+ char *errString = 0; /* addinfo */
+
+ rpn_char_map_prepare (zh->reg, reg_type, &rcmi);
+ attr_init(&use, zapt, 1);
+ use_value = attr_find_ex(&use, &curAttributeSet, &use_string);
+
+ if (use_value == -1)
+ use_value = 1016;
+
+ for (base_no = 0; base_no < num_bases; base_no++)