/*
- * Copyright (C) 1995-1999, Index Data
+ * Copyright (C) 1995-2000, Index Data
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: zrpn.c,v $
- * Revision 1.101 2000-03-02 14:35:03 adam
+ * Revision 1.104 2000-04-05 09:49:35 adam
+ * On Unix, zebra/z'mbol uses automake.
+ *
+ * Revision 1.103 2000/03/20 19:08:36 adam
+ * Added remote record import using Z39.50 extended services and Segment
+ * Requests.
+ *
+ * Revision 1.102 2000/03/15 15:00:31 adam
+ * First work on threaded version.
+ *
+ * Revision 1.101 2000/03/02 14:35:03 adam
* Fixed proximity handling.
*
* Revision 1.100 1999/12/28 15:48:12 adam
static void rpn_char_map_prepare (ZebraHandle zh, int reg_type,
struct rpn_char_map_info *map_info)
{
- map_info->zm = zh->zebra_maps;
+ map_info->zm = zh->service->zebra_maps;
map_info->reg_type = reg_type;
- dict_grep_cmap (zh->dict, map_info, rpn_char_map_handler);
+ dict_grep_cmap (zh->service->dict, map_info, rpn_char_map_handler);
}
typedef struct {
{
while (*src)
{
- const char *cp = zebra_maps_output (zh->zebra_maps, reg_type, &src);
+ const char *cp = zebra_maps_output (zh->service->zebra_maps,
+ reg_type, &src);
if (!cp)
*dst++ = *src++;
else
switch (relation_value)
{
case 1:
- if (!term_100 (zh->zebra_maps, reg_type, term_sub, term_component,
+ if (!term_100 (zh->service->zebra_maps, reg_type,
+ term_sub, term_component,
space_split, term_dst))
return 0;
logf (LOG_DEBUG, "Relation <");
*term_tmp = '\0';
break;
case 2:
- if (!term_100 (zh->zebra_maps, reg_type, term_sub, term_component,
+ if (!term_100 (zh->service->zebra_maps, reg_type,
+ term_sub, term_component,
space_split, term_dst))
return 0;
logf (LOG_DEBUG, "Relation <=");
*term_tmp = '\0';
break;
case 5:
- if (!term_100 (zh->zebra_maps, reg_type, term_sub, term_component,
- space_split, term_dst))
+ if (!term_100 (zh->service->zebra_maps, reg_type,
+ term_sub, term_component, space_split, term_dst))
return 0;
logf (LOG_DEBUG, "Relation >");
*term_tmp = '\0';
break;
case 4:
- if (!term_100 (zh->zebra_maps, reg_type, term_sub, term_component,
- space_split, term_dst))
+ if (!term_100 (zh->service->zebra_maps, reg_type, term_sub,
+ term_component, space_split, term_dst))
return 0;
logf (LOG_DEBUG, "Relation >=");
case 3:
default:
logf (LOG_DEBUG, "Relation =");
- if (!term_100 (zh->zebra_maps, reg_type, term_sub, term_component,
- space_split, term_dst))
+ if (!term_100 (zh->service->zebra_maps, reg_type, term_sub,
+ term_component, space_split, term_dst))
return 0;
strcat (term_tmp, "(");
strcat (term_tmp, term_component);
}
return -1;
}
- if (zebraExplain_curDatabase (zh->zei, basenames[base_no]))
+ if (zebraExplain_curDatabase (zh->service->zei, basenames[base_no]))
{
zh->errCode = 109; /* Database unavailable */
zh->errString = basenames[base_no];
char ord_buf[32];
int i, ord_len;
- ord = zebraExplain_lookupSU (zh->zei, attp.attset_ordinal,
+ ord = zebraExplain_lookupSU (zh->service->zei, attp.attset_ordinal,
local_attr->local);
if (ord < 0)
continue;
reg_type, space_split, term_dst))
return 0;
logf (LOG_DEBUG, "dict_lookup_grep: %s", term_dict+prefix_len);
- r = dict_lookup_grep (zh->dict, term_dict, 0, grep_info, &max_pos,
- 0, grep_handle);
+ r = dict_lookup_grep (zh->service->dict, term_dict, 0,
+ grep_info, &max_pos, 0, grep_handle);
if (r)
logf (LOG_WARN, "dict_lookup_grep fail, rel=gt: %d", r);
break;
case 1: /* right truncation */
term_dict[j++] = '(';
- if (!term_100 (zh->zebra_maps, reg_type,
+ if (!term_100 (zh->service->zebra_maps, reg_type,
&termp, term_dict + j, space_split, term_dst))
return 0;
strcat (term_dict, ".*)");
- dict_lookup_grep (zh->dict, term_dict, 0, grep_info,
+ dict_lookup_grep (zh->service->dict, term_dict, 0, grep_info,
&max_pos, 0, grep_handle);
break;
case 2: /* keft truncation */
term_dict[j++] = '('; term_dict[j++] = '.'; term_dict[j++] = '*';
- if (!term_100 (zh->zebra_maps, reg_type,
+ if (!term_100 (zh->service->zebra_maps, reg_type,
&termp, term_dict + j, space_split, term_dst))
return 0;
strcat (term_dict, ")");
- dict_lookup_grep (zh->dict, term_dict, 0, grep_info,
+ dict_lookup_grep (zh->service->dict, term_dict, 0, grep_info,
&max_pos, 0, grep_handle);
break;
case 3: /* left&right truncation */
term_dict[j++] = '('; term_dict[j++] = '.'; term_dict[j++] = '*';
- if (!term_100 (zh->zebra_maps, reg_type,
+ if (!term_100 (zh->service->zebra_maps, reg_type,
&termp, term_dict + j, space_split, term_dst))
return 0;
strcat (term_dict, ".*)");
- dict_lookup_grep (zh->dict, term_dict, 0, grep_info,
+ dict_lookup_grep (zh->service->dict, term_dict, 0, grep_info,
&max_pos, 0, grep_handle);
break;
zh->errCode = 120;
return -1;
case 101: /* process # in term */
term_dict[j++] = '(';
- if (!term_101 (zh->zebra_maps, reg_type,
+ if (!term_101 (zh->service->zebra_maps, reg_type,
&termp, term_dict + j, space_split, term_dst))
return 0;
strcat (term_dict, ")");
- r = dict_lookup_grep (zh->dict, term_dict, 0, grep_info,
+ r = dict_lookup_grep (zh->service->dict, term_dict, 0, grep_info,
&max_pos, 0, grep_handle);
if (r)
logf (LOG_WARN, "dict_lookup_grep err, trunc=#: %d", r);
break;
case 102: /* Regexp-1 */
term_dict[j++] = '(';
- if (!term_102 (zh->zebra_maps, reg_type,
+ if (!term_102 (zh->service->zebra_maps, reg_type,
&termp, term_dict + j, space_split, term_dst))
return 0;
strcat (term_dict, ")");
logf (LOG_DEBUG, "Regexp-1 tolerance=%d", r);
- r = dict_lookup_grep (zh->dict, term_dict, 0, grep_info,
+ r = dict_lookup_grep (zh->service->dict, term_dict, 0, grep_info,
&max_pos, 0, grep_handle);
if (r)
logf (LOG_WARN, "dict_lookup_grep err, trunc=regular: %d",
case 103: /* Regexp-2 */
r = 1;
term_dict[j++] = '(';
- if (!term_103 (zh->zebra_maps, reg_type,
+ if (!term_103 (zh->service->zebra_maps, reg_type,
&termp, term_dict + j, &r, space_split, term_dst))
return 0;
strcat (term_dict, ")");
logf (LOG_DEBUG, "Regexp-2 tolerance=%d", r);
- r = dict_lookup_grep (zh->dict, term_dict, r, grep_info,
+ r = dict_lookup_grep (zh->service->dict, term_dict, r, grep_info,
&max_pos, 2, grep_handle);
if (r)
logf (LOG_WARN, "dict_lookup_grep err, trunc=eregular: %d",
break;
case 104: /* process # and ! in term */
term_dict[j++] = '(';
- if (!term_104 (zh->zebra_maps, reg_type,
+ if (!term_104 (zh->service->zebra_maps, reg_type,
&termp, term_dict + j, space_split, term_dst))
return 0;
strcat (term_dict, ")");
- r = dict_lookup_grep (zh->dict, term_dict, 0, grep_info,
+ r = dict_lookup_grep (zh->service->dict, term_dict, 0, grep_info,
&max_pos, 0, grep_handle);
if (r)
logf (LOG_WARN, "dict_lookup_grep err, trunc=#/!: %d", r);
break;
case 105: /* process * and ! in term */
term_dict[j++] = '(';
- if (!term_105 (zh->zebra_maps, reg_type,
+ if (!term_105 (zh->service->zebra_maps, reg_type,
&termp, term_dict + j, space_split, term_dst, 1))
return 0;
strcat (term_dict, ")");
- r = dict_lookup_grep (zh->dict, term_dict, 0, grep_info,
+ r = dict_lookup_grep (zh->service->dict, term_dict, 0, grep_info,
&max_pos, 0, grep_handle);
if (r)
logf (LOG_WARN, "dict_lookup_grep err, trunc=*/!: %d", r);
break;
case 106: /* process * and ! in term */
term_dict[j++] = '(';
- if (!term_105 (zh->zebra_maps, reg_type,
+ if (!term_105 (zh->service->zebra_maps, reg_type,
&termp, term_dict + j, space_split, term_dst, 0))
return 0;
strcat (term_dict, ")");
- r = dict_lookup_grep (zh->dict, term_dict, 0, grep_info,
+ r = dict_lookup_grep (zh->service->dict, term_dict, 0, grep_info,
&max_pos, 0, grep_handle);
if (r)
logf (LOG_WARN, "dict_lookup_grep err, trunc=*/!: %d", r);
while ((len = (cp_end - cp)) > 0)
{
- map = zebra_maps_input (zh->zebra_maps, reg_type, &cp, len);
+ map = zebra_maps_input (zh->service->zebra_maps, reg_type, &cp, len);
if (**map == *CHR_SPACE)
space_map = *map;
else
flags);
parms.rset_term->nn = min_nn;
parms.key_size = sizeof (struct it_key);
- parms.temp_path = res_get (zh->res, "setTmpDir");
+ parms.temp_path = res_get (zh->service->res, "setTmpDir");
result = rset_create (rset_kind_temp, &parms);
rsfd_result = rset_open (result, RSETF_WRITE);
flags);
parms.rset_term->nn = min_nn;
parms.key_size = sizeof (struct it_key);
- parms.temp_path = res_get (zh->res, "setTmpDir");
+ parms.temp_path = res_get (zh->service->res, "setTmpDir");
result = rset_create (rset_kind_temp, &parms);
rsfd_result = rset_open (result, RSETF_WRITE);
}
for (i = 0; i<rset_no; i++)
{
- if (rset[i])
+ if (rsfd[i])
rset_close (rset[i], rsfd[i]);
xfree (buf[i]);
}
break;
}
if (ex_list)
- wrbuf = zebra_replace(zh->zebra_maps, reg_id, ex_list,
+ wrbuf = zebra_replace(zh->service->zebra_maps, reg_id, ex_list,
termz, strlen(termz));
if (!wrbuf)
return nmem_strdup(stream, termz);
logf (LOG_DEBUG, "numeric relation value=%d", relation_value);
- if (!term_100 (zh->zebra_maps, reg_type, term_sub, term_tmp, 1,
+ if (!term_100 (zh->service->zebra_maps, reg_type, term_sub, term_tmp, 1,
term_dst))
return 0;
term_value = atoi (term_tmp);
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,
+ r = dict_lookup_grep (zh->service->dict, term_dict, 0, grep_info, max_pos,
0, grep_handle);
if (r)
logf (LOG_WARN, "dict_lookup_grep fail, rel=gt: %d", r);
zh->errCode = 121;
return -1;
}
- if (zebraExplain_curDatabase (zh->zei, basenames[base_no]))
+ if (zebraExplain_curDatabase (zh->service->zei, basenames[base_no]))
{
zh->errCode = 109; /* Database unavailable */
zh->errString = basenames[base_no];
char ord_buf[32];
int i, ord_len;
- ord = zebraExplain_lookupSU (zh->zei, attp.attset_ordinal,
+ ord = zebraExplain_lookupSU (zh->service->zei, attp.attset_ordinal,
local_attr->local);
if (ord < 0)
continue;
parms.rset_term = rset_term_create (termz, -1, rank_type);
parms.key_size = sizeof (struct it_key);
- parms.temp_path = res_get (zh->res, "setTmpDir");
+ parms.temp_path = res_get (zh->service->res, "setTmpDir");
result = rset_create (rset_kind_temp, &parms);
rsfd = rset_open (result, RSETF_WRITE);
int sort_flag;
char termz[IT_MAX_WORD+1];
- zebra_maps_attr (zh->zebra_maps, zapt, ®_id, &search_type,
+ zebra_maps_attr (zh->service->zebra_maps, zapt, ®_id, &search_type,
&rank_type, &complete_flag, &sort_flag);
logf (LOG_DEBUG, "reg_id=%c", reg_id);
attr_init (&use, zapt, 1);
use_value = attr_find (&use, &attributeset);
- if (zebra_maps_attr (zh->zebra_maps, zapt, ®_id, &search_type,
+ if (zebra_maps_attr (zh->service->zebra_maps, zapt, ®_id, &search_type,
&rank_type, &complete_flag, &sort_flag))
{
zh->errCode = 113;
*num_entries = 0;
return;
}
- if (zebraExplain_curDatabase (zh->zei, basenames[base_no]))
+ if (zebraExplain_curDatabase (zh->service->zei, basenames[base_no]))
{
zh->errString = basenames[base_no];
zh->errCode = 109; /* Database unavailable */
{
int ord;
- ord = zebraExplain_lookupSU (zh->zei, attp.attset_ordinal,
+ ord = zebraExplain_lookupSU (zh->service->zei, attp.attset_ordinal,
local_attr->local);
if (ord > 0)
ords[ord_no++] = ord;
trans_scan_term (zh, zapt, termz+prefix_len, reg_id);
- dict_scan (zh->dict, termz, &before_tmp, &after_tmp, scan_info,
- scan_handle);
+ dict_scan (zh->service->dict, termz, &before_tmp, &after_tmp,
+ scan_info, scan_handle);
}
glist = (ZebraScanEntry *)
odr_malloc (stream, (before+after)*sizeof(*glist));