Fix xpath-expressions (#35) #39
Conversation
This change aims to implement support for ALL valid xpath-expressions inside the „expression“-field. See #35 for details.
fields/field.reflection.php
Outdated
| @@ -385,9 +385,38 @@ public function compile(&$entry) | |||
| // Find queries: | |||
| preg_match_all('/\{[^\}]+\}/', $expression, $matches); | |||
|
|
|||
| // Find replacements: | |||
| // Get root node name | |||
| $root_node_name = $xpath->evaluate('name(/*)'); | |||
There was a problem hiding this comment.
I would do
preg_quote ((string)$xpath->evaluate('name(/*)'), '#');
|
I added the requested change and ran all tests again – looking good! It would be great if this could go into the integration-branch, I'd then prepare the readme and the meta and submit another PR for a new 2.0.4-release that should fix all the irritation about expressions! |
fields/field.reflection.php
Outdated
|
|
||
| // Insert a '/' if the expression contains a '(' directly followed by the root node name | ||
| // Fixes expression 1.J (when used inside an xpath-function) | ||
| else if (strpos($match,'('.$root_node_name) !== false) { |
There was a problem hiding this comment.
Sorry about that, we need to keep $root_node_name intact to make the strpos work... !!
$root_node_name = (string)$xpath->evaluate('name(/*)')
$root_node_name_quoted = preg_quote ($root_node_name, '#'); // <-- use in preg_* calls onlyThere was a problem hiding this comment.
Implemented it as suggested – but as I'm really not an expert regarding all this preg/regex-stuff, I would be glad if you could give me a hint what kind of difference exists between my previous solution…
preg_match('#^{'.$root_node_name.'#', $match))
and the one we have now:
preg_match('#^{'.$root_node_name_quoted.'#', $match))
I mean both work as expected in all situations I tested, but I'd really like to understand that change :)
See #39 (review) -125301233
|
So now this should be ready to go into 'integration' :) I will prepare the readme and meta for the 2.0.4-release and send another PR – or would you mind giving me direct access to this repo so I can manage the release (and maybe also an additional gh-pages-branch for the docs) myself? |
+ Better solution for modifying path-expressions (#35) + Fixing some indenting…
|
I improved my solution so I have to call the xpath-evaluation only once and also will work without preg-calls. I also added "backwards-compatibilty" with "wrong" xpath-expressions that worked in version 1.X of the extension. Tested this again all use cases, looking good and I hope these are my final changes to this commit ;) |
This change aims to implement support for all valid xpath-expressions inside the „expression“-field.
See #35 for details.