projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed type of index_type char/int to string.
[idzebra-moved-to-github.git]
/
index
/
zsets.c
diff --git
a/index/zsets.c
b/index/zsets.c
index
a81f4d8
..
04cc69e
100644
(file)
--- a/
index/zsets.c
+++ b/
index/zsets.c
@@
-1,4
+1,4
@@
-/* $Id: zsets.c,v 1.120 2007-03-20 22:07:35 adam Exp $
+/* $Id: zsets.c,v 1.123 2007-10-29 16:57:53 adam Exp $
Copyright (C) 1995-2007
Index Data ApS
Copyright (C) 1995-2007
Index Data ApS
@@
-100,7
+100,6
@@
static ZEBRA_RES resultSetSearch(ZebraHandle zh, NMEM nmem, NMEM rset_nmem,
Z_RPNQuery *rpn, ZebraSet sset)
{
RSET rset = 0;
Z_RPNQuery *rpn, ZebraSet sset)
{
RSET rset = 0;
- oident *attrset;
Z_SortKeySpecList *sort_sequence;
int sort_status, i;
ZEBRA_RES res = ZEBRA_OK;
Z_SortKeySpecList *sort_sequence;
int sort_status, i;
ZEBRA_RES res = ZEBRA_OK;
@@
-114,11
+113,9
@@
static ZEBRA_RES resultSetSearch(ZebraHandle zh, NMEM nmem, NMEM rset_nmem,
for (i = 0; i<sort_sequence->num_specs; i++)
sort_sequence->specs[i] = 0;
for (i = 0; i<sort_sequence->num_specs; i++)
sort_sequence->specs[i] = 0;
- attrset = oid_getentbyoid (rpn->attributeSetId);
-
rpn_get_top_approx_limit(zh, rpn->RPNStructure, &sset->approx_limit);
rpn_get_top_approx_limit(zh, rpn->RPNStructure, &sset->approx_limit);
- res = rpn_search_top(zh, rpn->RPNStructure, attrset->value,
+ res = rpn_search_top(zh, rpn->RPNStructure, rpn->attributeSetId,
nmem, rset_nmem,
sort_sequence,
sset->num_bases, sset->basenames,
nmem, rset_nmem,
sort_sequence,
sset->num_bases, sset->basenames,
@@
-545,7
+542,7
@@
struct sortKeyInfo {
int relation;
int ord;
int numerical;
int relation;
int ord;
int numerical;
- int index_type;
+ const char *index_type;
};
void resultSetInsertSort(ZebraHandle zh, ZebraSet sset,
};
void resultSetInsertSort(ZebraHandle zh, ZebraSet sset,
@@
-582,10
+579,10
@@
void resultSetInsertSort(ZebraHandle zh, ZebraSet sset,
char this_entry_org[1024];
char other_entry_org[1024];
double diff;
char this_entry_org[1024];
char other_entry_org[1024];
double diff;
- int index_type = criteria[j].index_type;
- zebra_term_untrans(zh, index_type, this_entry_org,
+ const char *index_type = criteria[j].index_type;
+ zebra_term_untrans(zh, *index_type, this_entry_org,
this_entry_buf);
this_entry_buf);
- zebra_term_untrans(zh, index_type, other_entry_org,
+ zebra_term_untrans(zh, *index_type, other_entry_org,
other_entry_buf);
diff = atof(this_entry_org) - atof(other_entry_org);
other_entry_buf);
diff = atof(this_entry_org) - atof(other_entry_org);
@@
-888,7
+885,7
@@
ZEBRA_RES resultSetSortSingle(ZebraHandle zh, NMEM nmem,
sort_criteria[i].ord =
zebraExplain_lookup_attr_str(zh->reg->zei,
zinfo_index_category_sort,
sort_criteria[i].ord =
zebraExplain_lookup_attr_str(zh->reg->zei,
zinfo_index_category_sort,
- -1, sk->u.sortField);
+ 0, sk->u.sortField);
if (sks->which != Z_SortKeySpec_null
&& sort_criteria[i].ord == -1)
{
if (sks->which != Z_SortKeySpec_null
&& sort_criteria[i].ord == -1)
{
@@
-1276,7
+1273,7
@@
ZEBRA_RES zebra_snippets_hit_vector(ZebraHandle zh, const char *setname,
struct ord_list *ol;
for (ol = termid->ol; ol; ol = ol->next)
{
struct ord_list *ol;
for (ol = termid->ol; ol; ol = ol->next)
{
- zebra_snippets_append(snippets, key.mem[key.len-1],
+ zebra_snippets_append(snippets, key.mem[key.len-1], 0,
ol->ord, termid->name);
}
}
ol->ord, termid->name);
}
}