projects
/
idzebra-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
1355119
)
Simplify snippet_add_incomplete_field
author
Adam Dickmeiss
<adam@indexdata.dk>
Tue, 30 Aug 2011 11:55:26 +0000
(13:55 +0200)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Tue, 30 Aug 2011 11:55:26 +0000
(13:55 +0200)
Same functionality.
index/extract.c
patch
|
blob
|
history
diff --git
a/index/extract.c
b/index/extract.c
index
7e81792
..
a4688e5
100644
(file)
--- a/
index/extract.c
+++ b/
index/extract.c
@@
-170,8
+170,7
@@
static void snippet_add_incomplete_field(RecWord *p, int ord, zebra_map_t zm)
while (map)
{
while (map)
{
- char buf[IT_MAX_WORD+1];
- int i, remain;
+ int remain;
/* Skip spaces */
while (map && *map && **map == *CHR_SPACE)
/* Skip spaces */
while (map && *map && **map == *CHR_SPACE)
@@
-189,17
+188,10
@@
static void snippet_add_incomplete_field(RecWord *p, int ord, zebra_map_t zm)
{
zebra_snippets_appendn(h->snippets, p->seqno, 1, ord,
start, last - start);
{
zebra_snippets_appendn(h->snippets, p->seqno, 1, ord,
start, last - start);
-
}
start = last;
}
start = last;
-
- i = 0;
while (map && *map && **map != *CHR_SPACE)
{
while (map && *map && **map != *CHR_SPACE)
{
- const char *cp = *map;
-
- while (i < IT_MAX_WORD && *cp)
- buf[i++] = *(cp++);
remain = p->term_len - (b - p->term_buf);
last = b;
if (remain > 0)
remain = p->term_len - (b - p->term_buf);
last = b;
if (remain > 0)
@@
-207,8
+199,8
@@
static void snippet_add_incomplete_field(RecWord *p, int ord, zebra_map_t zm)
else
map = 0;
}
else
map = 0;
}
- if (!i)
- return;
+ if (start == last)
+ return ;
if (first)
{
if (first)
{
@@
-285,7
+277,6
@@
void extract_snippet(ZebraHandle zh, zebra_snippets *sn,
{
struct recExtractCtrl extractCtrl;
struct snip_rec_info info;
{
struct recExtractCtrl extractCtrl;
struct snip_rec_info info;
- int r;
extractCtrl.stream = stream;
extractCtrl.first_record = 1;
extractCtrl.stream = stream;
extractCtrl.first_record = 1;
@@
-308,8
+299,7
@@
void extract_snippet(ZebraHandle zh, zebra_snippets *sn,
extractCtrl.setStoreData = 0;
extractCtrl.setStoreData = 0;
- r = (*rt->extract)(recTypeClientData, &extractCtrl);
-
+ (*rt->extract)(recTypeClientData, &extractCtrl);
}
static void searchRecordKey(ZebraHandle zh,
}
static void searchRecordKey(ZebraHandle zh,
@@
-575,7
+565,6
@@
ZEBRA_RES zebra_extract_file(ZebraHandle zh, zint *sysno, const char *fname,
char gprefix[128];
char ext[128];
char ext_res[128];
char gprefix[128];
char ext[128];
char ext_res[128];
- struct file_read_info *fi = 0;
const char *original_record_type = 0;
RecType recType;
void *recTypeClientData;
const char *original_record_type = 0;
RecType recType;
void *recTypeClientData;
@@
-641,7
+630,6
@@
ZEBRA_RES zebra_extract_file(ZebraHandle zh, zint *sysno, const char *fname,
if (sysno && (action == action_delete || action == action_a_delete))
{
streamp = 0;
if (sysno && (action == action_delete || action == action_a_delete))
{
streamp = 0;
- fi = 0;
}
else
{
}
else
{