/*
- * 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.83 1998-09-02 13:53:19 adam
+ * Revision 1.92 1999-05-26 07:49:13 adam
+ * C++ compilation.
+ *
+ * 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).
+ *
+ * Revision 1.87 1998/09/28 11:19:12 adam
+ * Fix for Compiled ASN.1.
+ *
+ * Revision 1.86 1998/09/22 10:48:20 adam
+ * Minor changes in search API.
+ *
+ * Revision 1.85 1998/09/22 10:03:43 adam
+ * Changed result sets to be persistent in the sense that they can
+ * be re-searched if needed.
+ * Fixed memory leak in rsm_or.
+ *
+ * Revision 1.84 1998/09/18 12:41:00 adam
+ * Fixed bug with numerical relations.
+ *
+ * Revision 1.83 1998/09/02 13:53:19 adam
* Extra parameter decode added to search routines to implement
* persistent queries.
*
*/
#include <stdio.h>
#include <assert.h>
-#ifdef WINDOWS
+#ifdef WIN32
#include <io.h>
#else
#include <unistd.h>
static const char **rpn_char_map_handler (void *vp, const char **from, int len)
{
- struct rpn_char_map_info *p = vp;
+ struct rpn_char_map_info *p = (struct rpn_char_map_info *) vp;
return zebra_maps_input (p->zm, p->reg_type, from, len);
}
int *new_term_no;
#endif
p->isam_p_size = 2*p->isam_p_size + 100;
- new_isam_p_buf = xmalloc (sizeof(*new_isam_p_buf) *
- p->isam_p_size);
+ new_isam_p_buf = (ISAM_P *) xmalloc (sizeof(*new_isam_p_buf) *
+ p->isam_p_size);
if (p->isam_p_buf)
{
memcpy (new_isam_p_buf, p->isam_p_buf,
p->isam_p_buf = new_isam_p_buf;
#ifdef TERM_COUNT
- new_term_no = xmalloc (sizeof(*new_term_no) *
- p->isam_p_size);
+ new_term_no = (int *) xmalloc (sizeof(*new_term_no) *
+ p->isam_p_size);
if (p->term_no)
{
memcpy (new_term_no, p->isam_p_buf,
static int grep_handle (char *name, const char *info, void *p)
{
- add_isam_p (name, info, p);
+ add_isam_p (name, info, (struct grep_info *) p);
return 0;
}
}
else
{
- strcpy (dst, "((-");
+ strcpy (dst, "(-(");
islt = 0;
}
val = -val;
static int string_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt,
const char **term_sub,
- oid_value attributeSet, struct grep_info *grep_info,
+ oid_value attributeSet, NMEM stream,
+ struct grep_info *grep_info,
int reg_type, int complete_flag,
int num_bases, char **basenames,
char *term_dst)
logf (LOG_DEBUG, "att_getentbyatt fail. set=%d use=%d r=%d",
curAttributeSet, use_value, r);
if (r == -1)
+ {
+ char val_str[32];
+ sprintf (val_str, "%d", use_value);
zh->errCode = 114;
+ zh->errString = nmem_strdup (stream, val_str);
+ }
else
+ {
+ int oid[OID_SIZE];
+ struct oident oident;
+
+ oident.proto = PROTO_Z3950;
+ oident.oclass = CLASS_ATTSET;
+ oident.value = curAttributeSet;
+ oid_ent_to_oid (&oident, oid);
+
zh->errCode = 121;
+ zh->errString = nmem_strdup (stream, oident.desc);
+ }
return -1;
}
if (zebraExplain_curDatabase (zh->zei, basenames[base_no]))
}
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++] = ')';
int term_index;
const char *flags = NULL;
- rsfd = xmalloc (sizeof(*rsfd)*rset_no);
- more = xmalloc (sizeof(*more)*rset_no);
- buf = xmalloc (sizeof(*buf)*rset_no);
+ rsfd = (RSFD *) xmalloc (sizeof(*rsfd)*rset_no);
+ more = (int *) xmalloc (sizeof(*more)*rset_no);
+ buf = (struct it_key **) xmalloc (sizeof(*buf)*rset_no);
for (i = 0; i<rset_no; i++)
{
int j;
- buf[i] = xmalloc (sizeof(**buf));
+ buf[i] = (struct it_key *) xmalloc (sizeof(**buf));
rsfd[i] = rset_open (rset[i], RSETF_READ);
if (!(more[i] = rset_read (rset[i], rsfd[i], buf[i], &term_index)))
break;
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)
{
logf (LOG_DEBUG, "APT_phrase termp=%s", termp);
grep_info.isam_p_indx = 0;
- r = string_term (zh, zapt, &termp, attributeSet, &grep_info,
+ r = string_term (zh, zapt, &termp, attributeSet, stream, &grep_info,
reg_type, complete_flag, num_bases, basenames,
term_dst);
if (r < 1)
grep_info.isam_p_indx, term_dst,
strlen(term_dst), rank_type);
assert (rset[rset_no]);
- if (++rset_no >= sizeof(rset)/sizeof(*rset))
+ if (++rset_no >= (int) (sizeof(rset)/sizeof(*rset)))
break;
}
#ifdef TERM_COUNT
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)
{
logf (LOG_DEBUG, "APT_or_list termp=%s", termp);
grep_info.isam_p_indx = 0;
- r = string_term (zh, zapt, &termp, attributeSet, &grep_info,
+ r = string_term (zh, zapt, &termp, attributeSet, stream, &grep_info,
reg_type, complete_flag, num_bases, basenames,
term_dst);
if (r < 1)
grep_info.isam_p_indx, term_dst,
strlen(term_dst), rank_type);
assert (rset[rset_no]);
- if (++rset_no >= sizeof(rset)/sizeof(*rset))
+ if (++rset_no >= (int) (sizeof(rset)/sizeof(*rset)))
break;
}
#ifdef TERM_COUNT
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)
{
logf (LOG_DEBUG, "APT_and_list termp=%s", termp);
grep_info.isam_p_indx = 0;
- r = string_term (zh, zapt, &termp, attributeSet, &grep_info,
+ r = string_term (zh, zapt, &termp, attributeSet, stream, &grep_info,
reg_type, complete_flag, num_bases, basenames,
term_dst);
if (r < 1)
grep_info.isam_p_indx, term_dst,
strlen(term_dst), rank_type);
assert (rset[rset_no]);
- if (++rset_no >= sizeof(rset)/sizeof(*rset))
+ if (++rset_no >= (int) (sizeof(rset)/sizeof(*rset)))
break;
}
#ifdef TERM_COUNT
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)
grep_info.isam_p_indx, term_dst,
strlen(term_dst), rank_type);
assert (rset[rset_no]);
- if (++rset_no >= sizeof(rset)/sizeof(*rset))
+ if (++rset_no >= (int) (sizeof(rset)/sizeof(*rset)))
break;
}
#ifdef TERM_COUNT
static RSET rpn_search_APT_local (ZebraHandle zh, Z_AttributesPlusTerm *zapt,
const char *termz,
oid_value attributeSet,
+ NMEM stream,
const char *rank_type)
{
RSET result;
}
static RSET rpn_sort_spec (ZebraHandle zh, Z_AttributesPlusTerm *zapt,
- oid_value attributeSet, ODR stream,
+ oid_value attributeSet, NMEM stream,
Z_SortKeySpecList *sort_sequence,
const char *rank_type)
{
if (!sort_sequence->specs)
{
sort_sequence->num_specs = 10;
- sort_sequence->specs = odr_malloc (stream, sort_sequence->num_specs *
- sizeof(*sort_sequence->specs));
+ sort_sequence->specs = (Z_SortKeySpec **)
+ nmem_malloc (stream, sort_sequence->num_specs *
+ sizeof(*sort_sequence->specs));
for (i = 0; i<sort_sequence->num_specs; i++)
sort_sequence->specs[i] = 0;
}
if (zapt->term->which != Z_Term_general)
i = 0;
else
- i = atoi_n (zapt->term->u.general->buf, zapt->term->u.general->len);
+ i = atoi_n ((char *) zapt->term->u.general->buf,
+ zapt->term->u.general->len);
if (i >= sort_sequence->num_specs)
i = 0;
if (!oid_ent_to_oid (&oe, oid))
return 0;
- sks = odr_malloc (stream, sizeof(*sks));
- sks->sortElement = odr_malloc (stream, sizeof(*sks->sortElement));
+ sks = (Z_SortKeySpec *) nmem_malloc (stream, sizeof(*sks));
+ sks->sortElement = (Z_SortElement *)
+ nmem_malloc (stream, sizeof(*sks->sortElement));
sks->sortElement->which = Z_SortElement_generic;
- sk = sks->sortElement->u.generic = odr_malloc (stream, sizeof(*sk));
+ sk = sks->sortElement->u.generic = (Z_SortKey *)
+ nmem_malloc (stream, sizeof(*sk));
sk->which = Z_SortKey_sortAttributes;
- sk->u.sortAttributes = odr_malloc (stream, sizeof(*sk->u.sortAttributes));
+ sk->u.sortAttributes = (Z_SortAttributes *)
+ nmem_malloc (stream, sizeof(*sk->u.sortAttributes));
sk->u.sortAttributes->id = oid;
- sk->u.sortAttributes->list =
- odr_malloc (stream, sizeof(*sk->u.sortAttributes->list));
+ sk->u.sortAttributes->list = (Z_AttributeList *)
+ nmem_malloc (stream, sizeof(*sk->u.sortAttributes->list));
sk->u.sortAttributes->list->num_attributes = 1;
- sk->u.sortAttributes->list->attributes =
- odr_malloc (stream, sizeof(*sk->u.sortAttributes->list->attributes));
- ae = *sk->u.sortAttributes->list->attributes =
- odr_malloc (stream, sizeof(**sk->u.sortAttributes->list->attributes));
+ sk->u.sortAttributes->list->attributes = (Z_AttributeElement **)
+ nmem_malloc (stream, sizeof(*sk->u.sortAttributes->list->attributes));
+ ae = *sk->u.sortAttributes->list->attributes = (Z_AttributeElement *)
+ nmem_malloc (stream, sizeof(**sk->u.sortAttributes->list->attributes));
ae->attributeSet = 0;
- ae->attributeType = odr_malloc (stream, sizeof(*ae->attributeType));
+ ae->attributeType = (int *)
+ nmem_malloc (stream, sizeof(*ae->attributeType));
*ae->attributeType = 1;
ae->which = Z_AttributeValue_numeric;
- ae->value.numeric = odr_malloc (stream, sizeof(*ae->value.numeric));
+ ae->value.numeric = (int *)
+ nmem_malloc (stream, sizeof(*ae->value.numeric));
*ae->value.numeric = use_value;
- sks->sortRelation = odr_malloc (stream, sizeof(*sks->sortRelation));
+ sks->sortRelation = (int *)
+ nmem_malloc (stream, sizeof(*sks->sortRelation));
if (sort_relation_value == 1)
*sks->sortRelation = Z_SortRelation_ascending;
else if (sort_relation_value == 2)
else
*sks->sortRelation = Z_SortRelation_ascending;
- sks->caseSensitivity = odr_malloc (stream, sizeof(*sks->caseSensitivity));
+ sks->caseSensitivity = (int *)
+ nmem_malloc (stream, sizeof(*sks->caseSensitivity));
*sks->caseSensitivity = 0;
+#ifdef ASN_COMPILED
+ sks->which = Z_SortKeySpec_null;
+ sks->u.null = odr_nullval ();
+#else
sks->missingValueAction = 0;
+#endif
sort_sequence->specs[i] = sks;
static RSET rpn_search_APT (ZebraHandle zh, Z_AttributesPlusTerm *zapt,
- oid_value attributeSet, ODR stream,
+ oid_value attributeSet, NMEM stream,
Z_SortKeySpecList *sort_sequence,
int num_bases, char **basenames)
{
if (!strcmp (search_type, "phrase"))
{
- return rpn_search_APT_phrase (zh, zapt, termz, attributeSet,
+ return rpn_search_APT_phrase (zh, zapt, termz, attributeSet, stream,
reg_id, complete_flag, rank_type,
num_bases, basenames);
}
else if (!strcmp (search_type, "and-list"))
{
- return rpn_search_APT_and_list (zh, zapt, termz, attributeSet,
+ return rpn_search_APT_and_list (zh, zapt, termz, attributeSet, stream,
reg_id, complete_flag, rank_type,
num_bases, basenames);
}
else if (!strcmp (search_type, "or-list"))
{
- return rpn_search_APT_or_list (zh, zapt, termz, attributeSet,
+ return rpn_search_APT_or_list (zh, zapt, termz, attributeSet, stream,
reg_id, complete_flag, rank_type,
num_bases, basenames);
}
else if (!strcmp (search_type, "local"))
{
- return rpn_search_APT_local (zh, zapt, termz, attributeSet,
+ return rpn_search_APT_local (zh, zapt, termz, attributeSet, stream,
rank_type);
}
else if (!strcmp (search_type, "numeric"))
{
- return rpn_search_APT_numeric (zh, zapt, termz, attributeSet,
+ return rpn_search_APT_numeric (zh, zapt, termz, attributeSet, stream,
reg_id, complete_flag, rank_type,
num_bases, basenames);
}
}
static RSET rpn_search_structure (ZebraHandle zh, Z_RPNStructure *zs,
- oid_value attributeSet, ODR stream,
+ oid_value attributeSet, NMEM stream,
Z_SortKeySpecList *sort_sequence,
int num_bases, char **basenames)
{
#ifdef ASN_COMPILED
if (*zop->u.prox->u.known != Z_ProxUnit_word)
{
- char *val = odr_malloc (stream, 16);
+ char *val = (char *) nmem_malloc (stream, 16);
zh->errCode = 132;
zh->errString = val;
sprintf (val, "%d", *zop->u.prox->u.known);
#else
if (*zop->u.prox->proximityUnitCode != Z_ProxUnit_word)
{
- char *val = odr_malloc (stream, 16);
+ char *val = (char *) nmem_malloc (stream, 16);
zh->errCode = 132;
zh->errString = val;
sprintf (val, "%d", *zop->u.prox->proximityUnitCode);
return r;
}
-void rpn_search (ZebraHandle zh, ODR stream, ODR decode,
+
+RSET rpn_search (ZebraHandle zh, NMEM nmem,
Z_RPNQuery *rpn, int num_bases, char **basenames,
- const char *setname)
+ const char *setname,
+ ZebraSet sset)
{
RSET rset;
oident *attrset;
Z_SortKeySpecList *sort_sequence;
int sort_status, i;
- zlog_rpn (rpn);
-
zh->errCode = 0;
zh->errString = NULL;
zh->hits = 0;
- sort_sequence = odr_malloc (stream, sizeof(*sort_sequence));
+ sort_sequence = (Z_SortKeySpecList *)
+ nmem_malloc (nmem, sizeof(*sort_sequence));
sort_sequence->num_specs = 10;
- sort_sequence->specs = odr_malloc (stream, sort_sequence->num_specs *
- sizeof(*sort_sequence->specs));
+ sort_sequence->specs = (Z_SortKeySpec **)
+ nmem_malloc (nmem, sort_sequence->num_specs *
+ sizeof(*sort_sequence->specs));
for (i = 0; i<sort_sequence->num_specs; i++)
sort_sequence->specs[i] = 0;
attrset = oid_getentbyoid (rpn->attributeSetId);
attributeSet = attrset->value;
- rset = rpn_search_structure (zh, rpn->RPNStructure, attributeSet, stream,
- sort_sequence,
- num_bases, basenames);
+ rset = rpn_search_structure (zh, rpn->RPNStructure, attributeSet,
+ nmem, sort_sequence, num_bases, basenames);
if (!rset)
- return;
+ return 0;
- resultSetAdd (zh, setname, 1, rset, &zh->hits);
if (zh->errCode)
logf (LOG_DEBUG, "search error: %d", zh->errCode);
-
+
for (i = 0; sort_sequence->specs[i]; i++)
;
sort_sequence->num_specs = i;
- if (i)
- resultSetSort (zh, stream, 1, &setname, setname, sort_sequence,
- &sort_status);
+ if (!i)
+ resultSetRank (zh, sset, rset);
+ else
+ {
+ logf (LOG_DEBUG, "resultSetSortSingle in rpn_search");
+ resultSetSortSingle (zh, nmem, sset, rset,
+ sort_sequence, &sort_status);
+ if (zh->errCode)
+ {
+ logf (LOG_DEBUG, "resultSetSortSingle status = %d", zh->errCode);
+ }
+ }
+ return rset;
}
struct scan_info_entry {
static int scan_handle (char *name, const char *info, int pos, void *client)
{
int len_prefix, idx;
- struct scan_info *scan_info = client;
+ struct scan_info *scan_info = (struct scan_info *) client;
len_prefix = strlen(scan_info->prefix);
if (memcmp (name, scan_info->prefix, len_prefix))
idx = scan_info->after - pos + scan_info->before;
else
idx = - pos - 1;
- scan_info->list[idx].term = odr_malloc (scan_info->odr,
- strlen(name + len_prefix)+1);
+ scan_info->list[idx].term = (char *)
+ odr_malloc (scan_info->odr, strlen(name + len_prefix)+1);
strcpy (scan_info->list[idx].term, name + len_prefix);
assert (*info == sizeof(ISAM_P));
memcpy (&scan_info->list[idx].isam_p, info+1, sizeof(ISAM_P));
return 0;
}
-static void scan_term_untrans (ZebraHandle zh, ODR stream, int reg_type,
+static void scan_term_untrans (ZebraHandle zh, NMEM stream, int reg_type,
char **dst, const char *src)
{
char term_dst[1024];
term_untrans (zh, reg_type, term_dst, src);
- *dst = odr_malloc (stream, strlen(term_dst)+1);
+ *dst = (char *) nmem_malloc (stream, strlen(term_dst)+1);
strcpy (*dst, term_dst);
}
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);
/* prepare dictionary scanning */
before = pos-1;
after = 1+num-pos;
- scan_info_array = odr_malloc (stream, ord_no * sizeof(*scan_info_array));
+ scan_info_array = (struct scan_info *)
+ odr_malloc (stream, ord_no * sizeof(*scan_info_array));
for (i = 0; i < ord_no; i++)
{
int j, prefix_len = 0;
scan_info->after = after;
scan_info->odr = stream;
- scan_info->list = odr_malloc (stream, (before+after)*
- sizeof(*scan_info->list));
+ scan_info->list = (struct scan_info_entry *)
+ odr_malloc (stream, (before+after) * sizeof(*scan_info->list));
for (j = 0; j<before+after; j++)
scan_info->list[j].term = NULL;
dict_scan (zh->dict, termz, &before_tmp, &after_tmp, scan_info,
scan_handle);
}
- glist = odr_malloc (stream, (before+after)*sizeof(*glist));
+ glist = (ZebraScanEntry *)
+ odr_malloc (stream, (before+after)*sizeof(*glist));
/* consider terms after main term */
for (i = 0; i < ord_no; i++)
}
if (j0 == -1)
break;
- scan_term_untrans (zh, stream, reg_id,
+ scan_term_untrans (zh, stream->mem, reg_id,
&glist[i+before].term, mterm);
rset = rset_trunc (zh, &scan_info_array[j0].list[ptr[j0]].isam_p, 1,
glist[i+before].term, strlen(glist[i+before].term),
if (j0 == -1)
break;
- scan_term_untrans (zh, stream, reg_id,
+ scan_term_untrans (zh, stream->mem, reg_id,
&glist[before-1-i].term, mterm);
rset = rset_trunc
projects / idzebra-moved-to-github.git / blobdiff