Author: david
Date: Mon Oct 31 14:40:02 2011
New Revision: 10234
Log:
Add missing context for Xpath queries. Refs issue 2005
Modified:
trunk/plugins/sfSkosPlugin/lib/sfSkosPlugin.class.php
Modified: trunk/plugins/sfSkosPlugin/lib/sfSkosPlugin.class.php
==============================================================================
--- trunk/plugins/sfSkosPlugin/lib/sfSkosPlugin.class.php Mon Oct 31
11:33:29 2011 (r10233)
+++ trunk/plugins/sfSkosPlugin/lib/sfSkosPlugin.class.php Mon Oct 31
14:40:02 2011 (r10234)
@@ -84,19 +84,22 @@
continue;
}
- if (0 < $skos->xpath->query('./skos:related', $concept)->length)
+ // Add parent
+ if (0 < $skos->xpath->query('./skos:broader', $concept)->length)
{
- $skos->addTermRelations($concept);
+ $skos->setParent($concept);
}
- if (0 < $skos->xpath->query('./skos:broader')->length)
+ // Add children
+ if (0 < $skos->xpath->query('./skos:narrower', $concept)->length)
{
- $skos->setParent($concept);
+ $skos->setChildren($concept);
}
- if (0 < $skos->xpath->query('./skos:narrower')->length)
+ // Add relations
+ if (0 < $skos->xpath->query('./skos:related', $concept)->length)
{
- $skos->setChildren($concept);
+ $skos->addTermRelations($concept);
}
}
@@ -248,7 +251,7 @@
return;
}
- foreach($this->xpath->query('./skos:broader') as $broader)
+ foreach($this->xpath->query('./skos:broader', $concept) as $broader)
{
if (!($broader instanceof DOMElement))
{
@@ -276,7 +279,7 @@
return;
}
- foreach($this->xpath->query('./skos:narrower') as $narrower)
+ foreach($this->xpath->query('./skos:narrower', $concept) as $narrower)
{
if (!($narrower instanceof DOMElement))
{
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
