Author: david
Date: Mon Oct 31 16:47:54 2011
New Revision: 10236
Log:
Fix typo. Test for non-existent parent/child terms. Fixes 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
15:20:03 2011 (r10235)
+++ trunk/plugins/sfSkosPlugin/lib/sfSkosPlugin.class.php Mon Oct 31
16:47:54 2011 (r10236)
@@ -260,6 +260,11 @@
$parentUri =
$broader->getAttributeNodeNS('http://www.w3.org/1999/02/22-rdf-syntax-ns#',
'resource');
+ if (!isset($this->terms[$parentUri->nodeValue]))
+ {
+ continue;
+ }
+
if ($parentUri instanceof DOMAttr)
{
$this->terms[$uri->nodeValue]->parent =
$this->terms[$parentUri->nodeValue];
@@ -274,7 +279,7 @@
{
$uri =
$concept->getAttributeNodeNS('http://www.w3.org/1999/02/22-rdf-syntax-ns#',
'about');
- if (!isset($this->terms[$uri]))
+ if (!isset($this->terms[$uri->nodeValue]))
{
return;
}
@@ -290,8 +295,9 @@
if ($childUri instanceof DOMAttr)
{
- // Test if this child is already parented
- if ($this->terms[$uri->nodeValue]->id ==
$this->terms[$childUri->nodeValue]->parentId)
+ // Skip if child doesn't exists, or it has already been parented
+ if (!isset($this->terms[$childUri->nodeValue]) ||
+ $this->terms[$uri->nodeValue]->id ==
$this->terms[$childUri->nodeValue]->parentId)
{
continue;
}
--
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.
