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
First indexing using index_types system (ICU).
[idzebra-moved-to-github.git]
/
index
/
rpnscan.c
diff --git
a/index/rpnscan.c
b/index/rpnscan.c
index
4fbb8a5
..
5fd6b38
100644
(file)
--- a/
index/rpnscan.c
+++ b/
index/rpnscan.c
@@
-1,4
+1,4
@@
-/* $Id: rpnscan.c,v 1.12 2007-08-21 13:27:04 adam Exp $
+/* $Id: rpnscan.c,v 1.14 2007-10-29 09:25:40 adam Exp $
Copyright (C) 1995-2007
Index Data ApS
Copyright (C) 1995-2007
Index Data ApS
@@
-102,16
+102,21
@@
static void count_set(ZebraHandle zh, RSET rset, zint *count)
break;
}
}
break;
}
}
- rset_close (rfd);
+ rset_close(rfd);
*count = rset->hits_count;
}
*count = rset->hits_count;
}
-static void get_first_snippet_from_rset(RSET rset, zebra_snippets *snippets,
+static void get_first_snippet_from_rset(ZebraHandle zh,
+ RSET rset, zebra_snippets *snippets,
zint *sysno)
{
struct it_key key;
RSFD rfd;
TERMID termid;
zint *sysno)
{
struct it_key key;
RSFD rfd;
TERMID termid;
+ size_t sysno_mem_index = 0;
+
+ if (zh->m_staticrank)
+ sysno_mem_index = 1;
yaz_log(YLOG_DEBUG, "get_first_snippet_from_rset");
yaz_log(YLOG_DEBUG, "get_first_snippet_from_rset");
@@
-119,11
+124,11
@@
static void get_first_snippet_from_rset(RSET rset, zebra_snippets *snippets,
*sysno = 0;
while (rset_read(rfd, &key, &termid))
{
*sysno = 0;
while (rset_read(rfd, &key, &termid))
{
- if (key.mem[0] != *sysno)
+ if (key.mem[sysno_mem_index] != *sysno)
{
if (*sysno)
break;
{
if (*sysno)
break;
- *sysno = key.mem[0];
+ *sysno = key.mem[sysno_mem_index];
}
if (termid)
{
}
if (termid)
{
@@
-135,7
+140,7
@@
static void get_first_snippet_from_rset(RSET rset, zebra_snippets *snippets,
}
}
}
}
}
}
- rset_close (rfd);
+ rset_close(rfd);
}
struct scan2_info_entry {
}
struct scan2_info_entry {
@@
-155,7
+160,7
@@
static int scan_handle2(char *name, const char *info, int pos, void *client)
return 0;
len_prefix = strlen(scan_info->prefix);
return 0;
len_prefix = strlen(scan_info->prefix);
- if (memcmp (name, scan_info->prefix, len_prefix))
+ if (memcmp(name, scan_info->prefix, len_prefix))
return 1;
/* skip special terms such as first-in-field specials */
return 1;
/* skip special terms such as first-in-field specials */
@@
-165,8
+170,8
@@
static int scan_handle2(char *name, const char *info, int pos, void *client)
wrbuf_rewind(scan_info->term);
wrbuf_puts(scan_info->term, name+len_prefix);
wrbuf_rewind(scan_info->term);
wrbuf_puts(scan_info->term, name+len_prefix);
- assert (*info == sizeof(ISAM_P));
- memcpy (&scan_info->isam_p, info+1, sizeof(ISAM_P));
+ assert(*info == sizeof(ISAM_P));
+ memcpy(&scan_info->isam_p, info+1, sizeof(ISAM_P));
return 0;
}
return 0;
}
@@
-238,7
+243,7
@@
static int scan_save_set(ZebraHandle zh, ODR stream, NMEM nmem,
glist[pos].term = 0;
glist[pos].display_term = 0;
glist[pos].term = 0;
glist[pos].display_term = 0;
- get_first_snippet_from_rset(rset, hit_snippets, &sysno);
+ get_first_snippet_from_rset(zh, rset, hit_snippets, &sysno);
if (sysno)
code = zebra_get_rec_snippets(zh, sysno, rec_snippets);
if (sysno)
code = zebra_get_rec_snippets(zh, sysno, rec_snippets);
@@
-292,7
+297,7
@@
static ZEBRA_RES rpn_scan_ver2(ZebraHandle zh, ODR stream, NMEM nmem,
*num_entries = 0;
return ZEBRA_OK;
}
*num_entries = 0;
return ZEBRA_OK;
}
- rpn_char_map_prepare (zh->reg, index_type, &rcmi);
+ rpn_char_map_prepare(zh->reg, index_type, &rcmi);
for (i = 0; i < ord_no; i++)
ar[i].term = wrbuf_alloc();
for (i = 0; i < ord_no; i++)
ar[i].term = wrbuf_alloc();
@@
-302,7
+307,7
@@
static ZEBRA_RES rpn_scan_ver2(ZebraHandle zh, ODR stream, NMEM nmem,
char termz[IT_MAX_WORD+20];
int prefix_len = 0;
char termz[IT_MAX_WORD+20];
int prefix_len = 0;
- prefix_len = key_SU_encode (ords[i], termz);
+ prefix_len = key_SU_encode(ords[i], termz);
termz[prefix_len] = 0;
strcpy(ar[i].prefix, termz);
termz[prefix_len] = 0;
strcpy(ar[i].prefix, termz);
@@
-372,7
+377,7
@@
static ZEBRA_RES rpn_scan_ver2(ZebraHandle zh, ODR stream, NMEM nmem,
char termz[IT_MAX_WORD+20];
int prefix_len = 0;
char termz[IT_MAX_WORD+20];
int prefix_len = 0;
- prefix_len = key_SU_encode (ords[i], termz);
+ prefix_len = key_SU_encode(ords[i], termz);
termz[prefix_len] = 0;
strcpy(ar[i].prefix, termz);
termz[prefix_len] = 0;
strcpy(ar[i].prefix, termz);
@@
-499,7
+504,7
@@
ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
else
termset_name = termset_value_string;
else
termset_name = termset_value_string;
- limit_set = resultSetRef (zh, termset_name);
+ limit_set = resultSetRef(zh, termset_name);
if (!limit_set)
{
if (!limit_set)
{
@@
-531,7
+536,7
@@
ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
{
int ord;
{
int ord;
- if (zebraExplain_curDatabase (zh->reg->zei, basenames[base_no]))
+ if (zebraExplain_curDatabase(zh->reg->zei, basenames[base_no]))
{
zebra_setError(zh, YAZ_BIB1_DATABASE_UNAVAILABLE,
basenames[base_no]);
{
zebra_setError(zh, YAZ_BIB1_DATABASE_UNAVAILABLE,
basenames[base_no]);