-/* $Id: zrpn.c,v 1.210 2006-03-30 09:52:16 adam Exp $
- Copyright (C) 1995-2005
+/* $Id: zrpn.c,v 1.213 2006-05-17 17:46:45 adam Exp $
+ Copyright (C) 1995-2006
Index Data ApS
This file is part of the Zebra server.
break;
case 3:
case 102:
+ case 103:
case -1:
+ if (!**term_sub)
+ return 1;
yaz_log(log_level_rpn, "Relation =");
if (!term_100(zh->reg->zebra_maps, reg_type, term_sub,
term_component, space_split, term_dst))
term_dict[prefix_len++] = 1;
term_dict[prefix_len++] = ord_buf[i];
}
+ if (ord_len > init_pos)
+ init_pos = ord_len;
}
bases_ok++;
if (prefix_len)
case 103: /* Regexp-2 */
regex_range = 1;
term_dict[j++] = '(';
- init_pos = 2;
if (!term_103(zh->reg->zebra_maps, reg_type,
&termp, term_dict + j, ®ex_range,
space_split, term_dst))
struct grep_info grep_info;
const char *termp = termz;
int alloc_sets = 0;
+ int empty_term = *termz ? 0 : 1;
+ empty_term = 0;
*num_result_sets = 0;
*term_dst = 0;
if (grep_info_prepare(zh, zapt, &grep_info, reg_type) == ZEBRA_FAIL)
if ((*result_sets)[*num_result_sets] == 0)
break;
(*num_result_sets)++;
+
+ if (empty_term)
+ break;
+ if (!*termp)
+ break;
}
grep_info_delete(&grep_info);
return ZEBRA_OK;
num_bases, basenames, rset_nmem,
rset, kc);
}
+ else if (!strcmp(search_type, "always"))
+ {
+ *termz = '\0';
+ res = rpn_search_APT_phrase(zh, zapt, termz, attributeSet, stream,
+ reg_id, complete_flag, rank_type,
+ xpath_use,
+ num_bases, basenames, rset_nmem,
+ rset, kc);
+ }
else
{
zebra_setError(zh, YAZ_BIB1_UNSUPP_STRUCTURE_ATTRIBUTE, 0);
return ZEBRA_OK;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+