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
Add extra argument to zebraExplain_lookup_ord so that we can get
[idzebra-moved-to-github.git]
/
index
/
extract.c
diff --git
a/index/extract.c
b/index/extract.c
index
6718670
..
f1506c5
100644
(file)
--- a/
index/extract.c
+++ b/
index/extract.c
@@
-1,4
+1,4
@@
-/* $Id: extract.c,v 1.203 2006-02-20 18:39:43 adam Exp $
+/* $Id: extract.c,v 1.206 2006-03-30 09:52:15 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
Copyright (C) 1995-2005
Index Data ApS
@@
-921,7
+921,7
@@
ZEBRA_RES buffer_extract_record(ZebraHandle zh,
if (!recType)
{
if (!recType)
{
- yaz_log (YLOG_WARN, "No such record type: %s", zh->m_record_type);
+ yaz_log (YLOG_WARN, "No such record type: %s", recordType);
return ZEBRA_FAIL;
}
return ZEBRA_FAIL;
}
@@
-1374,8
+1374,8
@@
void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno,
{
if (staticrank < 0)
{
{
if (staticrank < 0)
{
- yaz_log(YLOG_WARN, "staticrank = %d. Setting to 0",
- staticrank);
+ yaz_log(YLOG_WARN, "staticrank = %ld. Setting to 0",
+ (long) staticrank);
staticrank = 0;
}
*keyp++ = staticrank;
staticrank = 0;
}
*keyp++ = staticrank;
@@
-1553,7
+1553,8
@@
ZEBRA_RES zebra_snippets_rec_keys(ZebraHandle zh,
ord = key.mem[0];
zebraExplain_lookup_ord(zh->reg->zei, ord, &index_type,
ord = key.mem[0];
zebraExplain_lookup_ord(zh->reg->zei, ord, &index_type,
- 0/* db */, 0/* set */, 0/* use */);
+ 0/* db */, 0/* set */, 0/* use */,
+ 0 /* string index */);
assert(index_type);
zebra_term_untrans_iconv(zh, nmem, index_type,
&dst_term, str);
assert(index_type);
zebra_term_untrans_iconv(zh, nmem, index_type,
&dst_term, str);
@@
-1582,7
+1583,7
@@
void print_rec_keys(ZebraHandle zh, zebra_rec_keys_t reckeys)
assert(key.len <= 4 && key.len > 2);
zebraExplain_lookup_ord(zh->reg->zei,
assert(key.len <= 4 && key.len > 2);
zebraExplain_lookup_ord(zh->reg->zei,
- key.mem[0], &index_type, &db, 0, 0);
+ key.mem[0], &index_type, &db, 0, 0, 0);
seqno = (int) key.mem[key.len-1];
seqno = (int) key.mem[key.len-1];