experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Added XPATH functions position

Browse source
This commit is contained in:
Olof hagsand 2020-10-27 09:40:45 +01:00
parent 8f81eb1c66
commit fab261cb53
13 changed files with 98 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

33
lib/src/clixon_xpath_eval.c
View file

@ -494,6 +494,7 @@ xp_eval_predicate(xp_ctx *xc,
xcc->xc_type = XT_NODESET;
xcc->xc_initial = xc->xc_initial;
xcc->xc_node = x;
xcc->xc_position = i;
/* For each node in the node-set to be filtered, the PredicateExpr is
* evaluated with that node as the context node */
if (cxvec_append(x, &xcc->xc_nodeset, &xcc->xc_size) < 0)
@ -746,12 +747,35 @@ xp_relop(xp_ctx *xc1,
xr->xc_bool = (xc1->xc_bool == xc2->xc_bool);
break;
case XT_NUMBER:
xr->xc_bool = (xc1->xc_number == xc2->xc_number);
switch(op){
case XO_EQ:
xr->xc_bool = (xc1->xc_number == xc2->xc_number);
break;
case XO_NE:
xr->xc_bool = (xc1->xc_number != xc2->xc_number);
break;
case XO_GE:
xr->xc_bool = (xc1->xc_number >= xc2->xc_number);
break;
case XO_LE:
xr->xc_bool = (xc1->xc_number <= xc2->xc_number);
break;
case XO_LT:
xr->xc_bool = (xc1->xc_number < xc2->xc_number);
break;
case XO_GT:
xr->xc_bool = (xc1->xc_number > xc2->xc_number);
break;
default:
clicon_err(OE_XML, 0, "Operator %s not supported for nodeset/nodeset comparison", clicon_int2str(xpopmap,op));
goto done;
break;
}
break;
case XT_STRING:
xr->xc_bool = (strcmp(xc1->xc_string, xc2->xc_string)==0);
break;
}
} /* switch xc1 */
}
else if (xc1->xc_type != XT_NODESET &&
xc2->xc_type != XT_NODESET){
@ -991,6 +1015,11 @@ xp_eval(xp_ctx *xc,
goto done;
goto ok;
break;
case XPATHFN_POSITION:
if (xp_function_position(xc, xs->xs_c0, nsc, localonly, xrp) < 0)
goto done;
goto ok;
break;
case XPATHFN_COUNT:
if (xp_function_count(xc, xs->xs_c0, nsc, localonly, xrp) < 0)
goto done;