projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated with more info.
[yaz-moved-to-github.git]
/
zutil
/
yaz-ccl.c
diff --git
a/zutil/yaz-ccl.c
b/zutil/yaz-ccl.c
index
aede44b
..
440972f
100644
(file)
--- a/
zutil/yaz-ccl.c
+++ b/
zutil/yaz-ccl.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: yaz-ccl.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: yaz-ccl.c,v $
- * Revision 1.7 2000-11-16 09:58:02 adam
+ * Revision 1.9 2000-11-27 14:16:55 adam
+ * Fixed bug in ccl_rpn_simple regarding resultSetId's.
+ *
+ * Revision 1.8 2000/11/16 13:03:13 adam
+ * Function ccl_rpn_query sets attributeSet to Bib-1.
+ *
+ * Revision 1.7 2000/11/16 09:58:02 adam
* Implemented local AttributeSet setting for CCL field maps.
*
* Revision 1.6 2000/02/02 15:13:23 adam
* Implemented local AttributeSet setting for CCL field maps.
*
* Revision 1.6 2000/02/02 15:13:23 adam
@@
-142,7
+148,7
@@
static Z_Operand *ccl_rpn_simple (ODR o, struct ccl_rpn_node *p)
break;
case CCL_RPN_SET:
zo->which = Z_Operand_resultSetId;
break;
case CCL_RPN_SET:
zo->which = Z_Operand_resultSetId;
- zo->u.resultSetId = p->u.setname;
+ zo->u.resultSetId = odr_strdup (o, p->u.setname);
break;
default:
return 0;
break;
default:
return 0;
@@
-239,9
+245,14
@@
static Z_RPNStructure *ccl_rpn_structure (ODR o, struct ccl_rpn_node *p)
Z_RPNQuery *ccl_rpn_query (ODR o, struct ccl_rpn_node *p)
{
Z_RPNQuery *zq;
Z_RPNQuery *ccl_rpn_query (ODR o, struct ccl_rpn_node *p)
{
Z_RPNQuery *zq;
+ oident bib1;
+ int oid[OID_SIZE];
+ bib1.proto = PROTO_Z3950;
+ bib1.oclass = CLASS_ATTSET;
+ bib1.value = VAL_BIB1;
zq = (Z_RPNQuery *)odr_malloc (o, sizeof(*zq));
zq = (Z_RPNQuery *)odr_malloc (o, sizeof(*zq));
- zq->attributeSetId = NULL;
+ zq->attributeSetId = odr_oiddup (o, oid_ent_to_oid (&bib1, oid));
zq->RPNStructure = ccl_rpn_structure (o, p);
return zq;
}
zq->RPNStructure = ccl_rpn_structure (o, p);
return zq;
}