/* This file is part of the Zebra server.
- Copyright (C) 1994-2009 Index Data
+ Copyright (C) 2004-2013 Index Data
Zebra is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <assert.h>
NMEM nmem;
};
-static int zebra_create_record_stream(ZebraHandle zh,
+static int zebra_create_record_stream(ZebraHandle zh,
Record *rec,
struct ZebraRecStream *stream)
{
RecordAttr *recordAttr = rec_init_attr(zh->reg->zei, *rec);
- if ((*rec)->size[recInfo_storeData] > 0
+ if ((*rec)->size[recInfo_storeData] > 0
|| (*rec)->info[recInfo_filename] == 0)
zebra_create_stream_mem(stream, (*rec)->info[recInfo_storeData],
(*rec)->size[recInfo_storeData]);
{
char full_rep[1024];
int fd;
-
+
if (zh->path_reg && !yaz_is_abspath((*rec)->info[recInfo_filename])){
strcpy(full_rep, zh->path_reg);
strcat(full_rep, "/");
}
else
strcpy(full_rep, (*rec)->info[recInfo_filename]);
-
+
if ((fd = open(full_rep, O_BINARY|O_RDONLY)) == -1){
yaz_log(YLOG_WARN|YLOG_ERRNO, "Retrieve fail; missing file: %s",
full_rep);
}
return 0;
}
-
+
struct index_spec {
const char *index_name;
{
cp++;
cp0 = cp;
-
+
while (*cp != '\0' && *cp != ',' && *cp != ':')
cp++;
spec->index_type = nmem_strdupn(nmem, cp0, cp - cp0);
{
cp++;
cp0 = cp;
-
+
while (*cp != '\0' && *cp != ',' && *cp != ':')
cp++;
spec->extra = nmem_strdupn(nmem, cp0, cp - cp0);
*error = 1;
return first;
}
-
-static int parse_zebra_elem(const char *elem,
- const char **index, size_t *index_len,
- const char **type, size_t *type_len)
-{
- *index = 0;
- *index_len = 0;
-
- *type = 0;
- *type_len = 0;
-
- if (elem && *elem)
- {
- char *cp;
- /* verify that '::' is in the beginning of *elem
- and something more follows */
- if (':' != *elem
- || !(elem +1) || ':' != *(elem +1)
- || !(elem +2) || '\0' == *(elem +2))
- return 0;
-
- /* pick out info from string after '::' */
- elem = elem + 2;
- cp = strchr(elem, ':');
-
- if (!cp) /* index, no colon, no type */
- {
- *index = elem;
- *index_len = strlen(elem);
- }
- else if (cp[1] == '\0') /* colon, but no following type */
- {
- return 0;
- }
- else /* index, colon and type */
- {
- *index = elem;
- *index_len = cp - elem;
- *type = cp+1;
- *type_len = strlen(cp+1);
- }
- }
- return 1;
-}
-
static int sort_fetch(
struct special_fetch_s *fi, const char *elemsetname,
const Odr_oid **output_format,
WRBUF result, WRBUF addinfo)
{
- const char *retrieval_index;
- size_t retrieval_index_len;
- const char *retrieval_type;
- size_t retrieval_type_len;
- char retrieval_index_cstr[256];
- char retrieval_type_cstr[256];
int ord;
ZebraHandle zh = fi->zh;
+ int error;
+ struct index_spec *spec;
- if (!parse_zebra_elem(elemsetname,
- &retrieval_index, &retrieval_index_len,
- &retrieval_type, &retrieval_type_len))
- {
+ spec = parse_index_spec(elemsetname, fi->nmem, &error);
+ if (error)
return YAZ_BIB1_SPECIFIED_ELEMENT_SET_NAME_NOT_VALID_FOR_SPECIFIED_;
- }
-
- if (retrieval_type_len == 0)
- return -1; /* must have a register type specified */
- if (!retrieval_index_len ||
- retrieval_index_len >= sizeof(retrieval_index_cstr)-1)
- {
- return YAZ_BIB1_SPECIFIED_ELEMENT_SET_NAME_NOT_VALID_FOR_SPECIFIED_;
- }
-
- memcpy(retrieval_index_cstr, retrieval_index, retrieval_index_len);
- retrieval_index_cstr[retrieval_index_len] = '\0';
-
- memcpy(retrieval_type_cstr, retrieval_type, retrieval_type_len);
- retrieval_type_cstr[retrieval_type_len] = '\0';
+ /* for sort fetches.. We allow only one index and type must be given */
+ if (!spec || spec->next || !spec->index_type)
+ return -1;
ord = zebraExplain_lookup_attr_str(zh->reg->zei,
zinfo_index_category_sort,
- retrieval_type_cstr,
- retrieval_index_cstr);
+ spec->index_type,
+ spec->index_name);
if (ord == -1)
return -1; /* is not a sort index */
else
const char *string_index = 0;
WRBUF wrbuf_result = result;
int off = 0;
-
- zebraExplain_lookup_ord(zh->reg->zei, ord, &index_type, &db,
+
+ zebraExplain_lookup_ord(zh->reg->zei, ord, &index_type, &db,
&string_index);
if (!oid_oidcmp(input_format, yaz_oid_recsyn_xml))
{
*output_format = yaz_oid_recsyn_xml;
wrbuf_printf(wrbuf_result, ZEBRA_XML_HEADER_STR
" sysno=\"" ZINT_FORMAT "\""
- " set=\"zebra::index%s/\">\n",
+ " set=\"zebra::index%s\">\n",
fi->sysno, elemsetname);
}
else if (!oid_oidcmp(input_format, yaz_oid_recsyn_sutrs))
}
else
{
- yaz_log(YLOG_WARN, "unsupported format for element set zebra::%s",
+ yaz_log(YLOG_WARN, "unsupported format for element set zebra::%s",
elemsetname);
*output_format = 0;
wrbuf_destroy(wrbuf_str);
assert(off < wrbuf_len(wrbuf_str));
zebra_term_untrans(zh, index_type, dst_buf,
wrbuf_buf(wrbuf_str)+off);
-
+
if (!oid_oidcmp(input_format, yaz_oid_recsyn_xml))
{
- wrbuf_printf(wrbuf_result, " <index name=\"%s\"",
+ wrbuf_printf(wrbuf_result, " <index name=\"%s\"",
string_index);
wrbuf_printf(wrbuf_result, " type=\"%s\">", index_type);
wrbuf_xmlputs(wrbuf_result, dst_buf);
return 0;
}
}
-
+
static int special_index_fetch(
struct special_fetch_s *fi, const char *elemsetname,
const Odr_oid *input_format,
WRBUF result, WRBUF addinfo,
Record rec)
{
- const char *retrieval_index;
- size_t retrieval_index_len;
- const char *retrieval_type;
- size_t retrieval_type_len;
zebra_rec_keys_t keys;
int ret_code = 0;
- char retrieval_type_cstr[256];
ZebraHandle zh = fi->zh;
-
+ struct index_spec *spec, *spec_list;
+ int error;
+
/* set output variables before processing possible error states */
/* *rec_lenp = 0; */
if (oid_oidcmp(input_format, yaz_oid_recsyn_xml)
&& oid_oidcmp(input_format, yaz_oid_recsyn_sutrs))
{
- yaz_log(YLOG_WARN, "unsupported format for element set zebra::%s",
+ yaz_log(YLOG_WARN, "unsupported format for element set zebra::%s",
elemsetname);
*output_format = 0;
return YAZ_BIB1_NO_SYNTAXES_AVAILABLE_FOR_THIS_REQUEST;
}
- if (!parse_zebra_elem(elemsetname,
- &retrieval_index, &retrieval_index_len,
- &retrieval_type, &retrieval_type_len))
- return YAZ_BIB1_SPECIFIED_ELEMENT_SET_NAME_NOT_VALID_FOR_SPECIFIED_;
-
- if (retrieval_type_len)
+ spec_list = parse_index_spec(elemsetname, fi->nmem, &error);
+ if (error)
{
- memcpy(retrieval_type_cstr, retrieval_type, retrieval_type_len);
- retrieval_type_cstr[retrieval_type_len] = '\0';
+ return YAZ_BIB1_SPECIFIED_ELEMENT_SET_NAME_NOT_VALID_FOR_SPECIFIED_;
}
-
- if (retrieval_index_len)
- {
- char retrieval_index_cstr[256];
- if (retrieval_index_len < sizeof(retrieval_index_cstr) -1)
- {
- memcpy(retrieval_index_cstr, retrieval_index, retrieval_index_len);
- retrieval_index_cstr[retrieval_index_len] = '\0';
-
- if (zebraExplain_lookup_attr_str(zh->reg->zei,
- zinfo_index_category_index,
- (retrieval_type_len == 0 ? 0 :
- retrieval_type_cstr),
- retrieval_index_cstr) == -1)
- return YAZ_BIB1_SPECIFIED_ELEMENT_SET_NAME_NOT_VALID_FOR_SPECIFIED_;
- }
+ for (spec = spec_list; spec; spec = spec->next)
+ {
+ if (zebraExplain_lookup_attr_str(zh->reg->zei,
+ zinfo_index_category_index,
+ spec->index_type,
+ spec->index_name) == -1)
+ return YAZ_BIB1_SPECIFIED_ELEMENT_SET_NAME_NOT_VALID_FOR_SPECIFIED_;
}
keys = zebra_rec_keys_open();
const char *str;
struct it_key key_in;
WRBUF wrbuf = result;
-
+
if (!oid_oidcmp(input_format, yaz_oid_recsyn_xml))
{
*output_format = input_format;
wrbuf_printf(wrbuf, ZEBRA_XML_HEADER_STR
" sysno=\"" ZINT_FORMAT "\""
- " set=\"zebra::index%s/\">\n",
+ " set=\"zebra::index%s\">\n",
fi->sysno, elemsetname);
}
else if (!oid_oidcmp(input_format, yaz_oid_recsyn_sutrs))
const char *index_type;
const char *db = 0;
const char *string_index = 0;
- size_t string_index_len;
char dst_buf[IT_MAX_WORD];
-
+ int match = 0;
+
zebraExplain_lookup_ord(zh->reg->zei, ord, &index_type, &db,
&string_index);
- string_index_len = strlen(string_index);
-
- /* process only if index is not defined,
- or if defined and matching */
- if (retrieval_index == 0
- || (string_index_len == retrieval_index_len
- && !memcmp(string_index, retrieval_index,
- string_index_len)))
+ if (!spec_list)
+ match = 1; /* match all if no specs were given */
+ else
{
- /* process only if type is not defined, or is matching */
- if (retrieval_type == 0
- || !strcmp(retrieval_type_cstr, index_type))
+ for (spec = spec_list; spec; spec = spec->next)
{
- if (zebra_term_untrans(zh, index_type, dst_buf, str))
- *dst_buf = '\0'; /* untrans failed */
+ if ((!spec->index_type ||
+ !yaz_matchstr(spec->index_type, index_type))
+ &&
+ !yaz_matchstr(spec->index_name, string_index))
+ match = 1;
+ }
+ }
+ if (match)
+ {
+ if (zebra_term_untrans(zh, index_type, dst_buf, str))
+ *dst_buf = '\0'; /* untrans failed */
- if (!oid_oidcmp(input_format, yaz_oid_recsyn_xml))
- {
- wrbuf_printf(wrbuf, " <index name=\"%s\"",
- string_index);
-
- wrbuf_printf(wrbuf, " type=\"%s\"", index_type);
-
- wrbuf_printf(wrbuf, " seq=\"" ZINT_FORMAT "\">",
- key_in.mem[key_in.len -1]);
- wrbuf_xmlputs(wrbuf, dst_buf);
- wrbuf_printf(wrbuf, "</index>\n");
- }
- else
- {
- wrbuf_printf(wrbuf, "%s ", string_index);
-
- wrbuf_printf(wrbuf, "%s", index_type);
-
- for (i = 1; i < key_in.len; i++)
- wrbuf_printf(wrbuf, " " ZINT_FORMAT,
- key_in.mem[i]);
-
- wrbuf_printf(wrbuf, " %s", dst_buf);
-
- wrbuf_printf(wrbuf, "\n");
+ if (!oid_oidcmp(input_format, yaz_oid_recsyn_xml))
+ {
+ wrbuf_printf(wrbuf, " <index name=\"%s\"",
+ string_index);
- }
-
+ wrbuf_printf(wrbuf, " type=\"%s\"", index_type);
+
+ wrbuf_printf(wrbuf, " seq=\"" ZINT_FORMAT "\">",
+ key_in.mem[key_in.len -1]);
+ wrbuf_xmlputs(wrbuf, dst_buf);
+ wrbuf_printf(wrbuf, "</index>\n");
+ }
+ else
+ {
+ wrbuf_printf(wrbuf, "%s ", string_index);
+
+ wrbuf_printf(wrbuf, "%s", index_type);
+
+ for (i = 1; i < key_in.len; i++)
+ wrbuf_printf(wrbuf, " " ZINT_FORMAT,
+ key_in.mem[i]);
+
+ wrbuf_printf(wrbuf, " %s", dst_buf);
+
+ wrbuf_printf(wrbuf, "\n");
}
}
}
const char *index_type;
const char *db = 0;
const char *string_index = 0;
-
- zebraExplain_lookup_ord(zh->reg->zei, w->ord,
+
+ zebraExplain_lookup_ord(zh->reg->zei, w->ord,
&index_type, &db, &string_index);
/* only report for same index type */
if (!strcmp(w_index_type, index_type))
const char *db = 0;
const char *string_index = 0;
- zebraExplain_lookup_ord(zh->reg->zei, doc_w->ord,
+ zebraExplain_lookup_ord(zh->reg->zei, doc_w->ord,
&index_type, &db, &string_index);
if (mark_state == 0)
{
-
+
wrbuf_printf(wrbuf, " <snippet name=\"%s\"", string_index);
wrbuf_printf(wrbuf, " type=\"%s\"", index_type);
snippet_check_fields(zh, wrbuf, doc, doc_w, index_type);
if (doc_w->match)
wrbuf_puts(wrbuf, "<s>");
/* not printing leading ws */
- if (mark_state || !doc_w->ws || doc_w->match)
+ if (mark_state || !doc_w->ws || doc_w->match)
wrbuf_xmlputs(wrbuf, doc_w->term);
if (doc_w->match)
wrbuf_puts(wrbuf, "</s>");
yaz_log(YLOG_LOG, "HIT SNIPPET:");
zebra_snippets_log(hit_snippet, YLOG_LOG, 1);
#endif
-
+
zebra_snippets_ring(rec_snippets, hit_snippet, 5, 5);
-
+
#if 0
yaz_log(YLOG_LOG, "---------------------------");
yaz_log(YLOG_LOG, "RING SNIPPET:");
zebra_snippets_log(rec_snippets, YLOG_LOG, 1);
#endif
snippet_xml_record(zh, wrbuf, rec_snippets);
-
+
*output_format = yaz_oid_recsyn_xml;
-
+
zebra_snippets_destroy(hit_snippet);
}
zebra_snippets_destroy(rec_snippets);
char *info;
zint hits = 0;
NMEM nmem = nmem_create();
-
+
strcpy(ord_buf + ord_len, term);
-
+
info = dict_lookup(zh->reg->dict, ord_buf);
if (info)
{
ISAM_P isam_p;
RSET rsets[2], rset;
memcpy(&isam_p, info+1, sizeof(ISAM_P));
-
+
rsets[0] = zebra_create_rset_isam(zh, nmem, kc, kc->scope, isam_p, 0);
rsets[1] = rset_dup(rset_set);
-
+
rset = rset_create_and(nmem, kc, kc->scope, 2, rsets);
zebra_count_set(zh, rset, &hits, zh->approx_limit);
qsort(col, no_terms_collect, sizeof(*col), term_qsort_handle);
}
-static struct term_collect *term_collect_create(zebra_strmap_t sm,
+static struct term_collect *term_collect_create(zebra_strmap_t sm,
int no_terms_collect,
NMEM nmem)
{
void *data_buf;
size_t data_len;
zebra_strmap_it it;
- struct term_collect *col = nmem_malloc(nmem,
+ struct term_collect *col = nmem_malloc(nmem,
sizeof *col *no_terms_collect);
int i;
for (i = 0; i < no_terms_collect; i++)
int oc = *(int*) data_buf;
int j = 0;
/* insertion may be slow but terms terms will be "infrequent" and
- thus number of iterations should be small below
+ thus number of iterations should be small below
*/
while (j < no_terms_collect && oc > col[j].oc)
j++;
- if (j)
+ if (j)
{ /* oc <= col[j] and oc > col[j-1] */
--j;
memmove(col, col+1, sizeof(*col) * j);
{
if (!poset[rec_i].sysno)
continue;
-
+
zebra_sort_sysno(zh->reg->sort_index, poset[rec_i].sysno);
zebra_sort_type(zh->reg->sort_index, ord_array[ord_i]);
-
+
wrbuf_rewind(w);
if (zebra_sort_read(zh->reg->sort_index, 0, w))
{
zebra_rec_keys_t keys = zebra_rec_keys_open();
zebra_rec_keys_set_buf(keys, rec->info[recInfo_delKeys],
rec->size[recInfo_delKeys], 0);
-
- yaz_log(YLOG_DEBUG, "rec %d " ZINT_FORMAT " %s",
+
+ yaz_log(YLOG_DEBUG, "rec %d " ZINT_FORMAT " %s",
j, sysnos[j], zebra_rec_keys_empty(keys) ? "empty" : "non-empty");
if (zebra_rec_keys_rewind(keys))
{
{
int ord_i;
struct index_spec *spec;
- for (spec = spec_list, ord_i = 0; ord_i < no_ord;
+ for (spec = spec_list, ord_i = 0; ord_i < no_ord;
ord_i++, spec = spec->next)
{
int ord = CAST_ZINT_TO_INT(key_in.mem[0]);
- if (ord == ord_array[ord_i] &&
+ if (ord == ord_array[ord_i] &&
str[0] != FIRST_IN_FIELD_CHAR)
{
int *freq;
zebra_strmap_t sm = map_array[ord_i];
-
+
freq = zebra_strmap_lookup(sm, str, 0, 0);
if (freq)
(*freq)++;
return 0;
}
-static int perform_facet(ZebraHandle zh,
+static int perform_facet(ZebraHandle zh,
struct special_fetch_s *fi,
WRBUF result,
int num_recs, ZebraMetaRecord *poset,
NMEM nmem = nmem_create();
struct term_collect *col;
int no_collect_terms = 20;
-
+
if (spec->extra)
no_collect_terms = atoi(spec->extra);
if (no_collect_terms < 1)
no_collect_terms = 1;
col = term_collect_create(map_array[i], no_collect_terms, nmem);
term_collect_freq(zh, col, no_collect_terms, ord_array[i],
- resultSetRef(zh, fi->setname),
+ resultSetRef(zh, fi->setname),
cat == zinfo_index_category_sort ? 1.0 : -1.0);
-
+
if (use_xml)
wrbuf_printf(wr, " <facet type=\"%s\" index=\"%s\">\n",
spec->index_type, spec->index_name);
{
wrbuf_printf(wr, " <term coccur=\"%d\"", col[j].oc);
if (col[j].set_occur)
- wrbuf_printf(wr, " occur=\"" ZINT_FORMAT "\"",
+ wrbuf_printf(wr, " occur=\"" ZINT_FORMAT "\"",
col[j].set_occur);
wrbuf_printf(wr, ">");
wrbuf_xmlputs(wr, dst_buf);
{
wrbuf_printf(wr, "term %d", col[j].oc);
if (col[j].set_occur)
- wrbuf_printf(wr, " " ZINT_FORMAT,
+ wrbuf_printf(wr, " " ZINT_FORMAT,
col[j].set_occur);
wrbuf_printf(wr, ": %s\n", dst_buf);
}
use_xml = 1;
spec_list = parse_index_spec(elemsetname, fi->nmem, &error);
-
+
if (!spec_list || error)
{
return YAZ_BIB1_SPECIFIED_ELEMENT_SET_NAME_NOT_VALID_FOR_SPECIFIED_;
- }
-
+ }
+
for (spec = spec_list; spec; spec = spec->next)
{
if (!spec->index_type)
if (ord == -1)
break;
ord_array[i] = ord;
-
+
}
}
if (spec)
struct special_fetch_s *fi = (struct special_fetch_s *) handle;
ZebraHandle zh = fi->zh;
zint sysno = fi->sysno;
-
+
/* processing zebra::facet */
if (elemsetname && 0 == strncmp(elemsetname, "facet", 5))
{
- return facet_fetch(fi, elemsetname + 5,
+ return facet_fetch(fi, elemsetname + 5,
input_format, output_format,
result, addinfo);
}
{
wrbuf_printf(result, ZINT_FORMAT, fi->sysno);
*output_format = input_format;
- }
+ }
else if (!oid_oidcmp(input_format, yaz_oid_recsyn_xml))
{
wrbuf_printf(result, ZEBRA_XML_HEADER_STR
return YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS;
}
- /* processing special elementsetnames zebra::data */
+ /* processing special elementsetnames zebra::data */
if (elemsetname && 0 == strcmp(elemsetname, "data"))
{
struct ZebraRecStream stream;
- RecordAttr *recordAttr = rec_init_attr(zh->reg->zei, rec);
+ RecordAttr *recordAttr = rec_init_attr(zh->reg->zei, rec);
char *b;
zebra_create_record_stream(zh, &rec, &stream);
if (elemsetname && 0 == strcmp(elemsetname, "meta"))
{
int ret = 0;
- RecordAttr *recordAttr = rec_init_attr(zh->reg->zei, rec);
+ RecordAttr *recordAttr = rec_init_attr(zh->reg->zei, rec);
if (!oid_oidcmp(input_format, yaz_oid_recsyn_xml))
{
*output_format = input_format;
-
+
wrbuf_printf(result, ZEBRA_XML_HEADER_STR
" sysno=\"" ZINT_FORMAT "\"", sysno);
retrieve_puts_attr(result, "base", rec->info[recInfo_databaseName]);
retrieve_puts_attr(result, "type", rec->info[recInfo_fileType]);
if (fi->score >= 0)
retrieve_puts_attr_int(result, "score", fi->score);
-
+
wrbuf_printf(result,
" rank=\"" ZINT_FORMAT "\""
" size=\"%i\""
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
projects / idzebra-moved-to-github.git / blobdiff