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
Bug #529. On Unix, combine pthreed locks with file locking because file
[idzebra-moved-to-github.git]
/
recctrl
/
recgrs.c
diff --git
a/recctrl/recgrs.c
b/recctrl/recgrs.c
index
f45f4d7
..
bc77d38
100644
(file)
--- a/
recctrl/recgrs.c
+++ b/
recctrl/recgrs.c
@@
-1,4
+1,4
@@
-/* $Id: recgrs.c,v 1.110 2006-05-19 13:49:35 adam Exp $
+/* $Id: recgrs.c,v 1.112 2006-06-13 20:04:15 adam Exp $
Copyright (C) 1995-2006
Index Data ApS
Copyright (C) 1995-2006
Index Data ApS
@@
-529,10
+529,8
@@
static void index_xpath(struct source_parser *sp, data1_node *n,
int termlist_only = 1;
data1_termlist *tl;
int xpdone = 0;
int termlist_only = 1;
data1_termlist *tl;
int xpdone = 0;
- yaz_log(YLOG_DEBUG, "index_xpath level=%d xpath_index=%s",
- level, xpath_index);
if ((!n->root->u.root.absyn) ||
if ((!n->root->u.root.absyn) ||
- (n->root->u.root.absyn->enable_xpath_indexing)) {
+ (n->root->u.root.absyn->xpath_indexing == DATA1_XPATH_INDEXING_ENABLE)) {
termlist_only = 0;
}
termlist_only = 0;
}
@@
-1357,7
+1355,7
@@
int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p,
p->odr, &dummy)))
p->diagnostic = 238; /* not available in requested syntax */
else
p->odr, &dummy)))
p->diagnostic = 238; /* not available in requested syntax */
else
- p->rec_len = (size_t) (-1);
+ p->rec_len = -1;
break;
case VAL_EXPLAIN:
/* ensure our data1 tree is UTF-8 */
break;
case VAL_EXPLAIN:
/* ensure our data1 tree is UTF-8 */
@@
-1367,7
+1365,7
@@
int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p,
p->odr)))
p->diagnostic = 238;
else
p->odr)))
p->diagnostic = 238;
else
- p->rec_len = (size_t) (-1);
+ p->rec_len = -1;
break;
case VAL_SUMMARY:
/* ensure our data1 tree is UTF-8 */
break;
case VAL_SUMMARY:
/* ensure our data1 tree is UTF-8 */
@@
-1376,7
+1374,7
@@
int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p,
p->odr)))
p->diagnostic = 238;
else
p->odr)))
p->diagnostic = 238;
else
- p->rec_len = (size_t) (-1);
+ p->rec_len = -1;
break;
case VAL_SUTRS:
if (p->encoding)
break;
case VAL_SUTRS:
if (p->encoding)