Allowing to pass multiple unique attributes for tags in a dictionary #61
Conversation
haugs2
force-pushed
the
feature/multiple_uniqueattributes
branch
from
e8b6b00
to
11ca642
Compare
Pull Request Test Coverage Report for Build 233
💛 - Coveralls |
haugs2
force-pushed
the
feature/multiple_uniqueattributes
branch
from
11ca642
to
18460ae
Compare
haugs2
force-pushed
the
feature/multiple_uniqueattributes
branch
from
18460ae
to
045796b
Compare
|
OK, that sounds reasonable, I won't get time to look at in detail until a few weeks though. |
|
No problem, thank you very much for your consideration and taking the time to review! |
| if attr in left.attrib or attr in right.attrib: | ||
| # One of the nodes have a unique attribute, we check only that. | ||
| if isinstance(attr, dict): | ||
| for tag, attr_list in attr.items(): |
There was a problem hiding this comment.
We could shortcut the whole test here, if we check that the tags are the same before the loop.
Then you also need only if tag != left.tag below, as the tags now are known to be the same.
| if attr in left.attrib or attr in right.attrib] | ||
| for inner_attr in attr_list_consolidated: | ||
| matches += int(left.attrib.get(inner_attr) | ||
| == right.attrib.get(inner_attr)) |
There was a problem hiding this comment.
You could also shortcut this here. You don't need to check all attributes unless the match. Find one that doesn't match, and it's not a match. So no need to count matches.
| # If only one node has it, it means they are not the same. | ||
| return int(left.attrib.get(attr) == right.attrib.get(attr)) | ||
| match = int(left.attrib.get(attr) == right.attrib.get(attr)) | ||
| if match is None: |
There was a problem hiding this comment.
No, this is wrong. If one side has a unique attribute, it's either a full match or not a match. Nothing else needs to be checked. You can loop through the unique attributes, and if one side has one, and the other don't, then you can exit the whole function with a 0.
Extending the option 'uniqueattrs' by allowing to pass a dictionary where key denotes the tagname and value denotes a list of attributes which must be equal for nodes to match. This extends the current (tag, attribute)-tuple by providing the possibility to have multiple attributes which must be equal for a match. Helpful for XML represented databases where primary keys consist of multilple fields