friendica/php-json-ld
4
1
Fork 2
Code Issues Pull requests Releases 5 Activity

Ensure expanded frame is properly traversed for @list.

Browse source
This commit is contained in:
Dave Longley 2013-08-06 13:28:25 -04:00
parent 7c7b9ae3be
commit 090183dccc
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
jsonld.php
View file

@ -3300,13 +3300,13 @@ class JsonLdProcessor {
if(property_exists($input, '@type')) { if(property_exists($input, '@type')) {
$type = $input->{'@type'}; $type = $input->{'@type'};
// rename @type blank node // rename @type blank node
if(strpos($type, '_:') === 0) { if(strpos($type, '_:') === 0) {
$type = $input->{'@type'} = $namer->getName($type); $type = $input->{'@type'} = $namer->getName($type);
}
if(!property_exists($graphs->{$graph}, $type)) {
$graphs->{$graph}->{$type} = (object)array('@id' => $type);
} }
} if(!property_exists($graphs->{$graph}, $type)) {
$graphs->{$graph}->{$type} = (object)array('@id' => $type);
}
}
if($list !== null) { if($list !== null) {
$list[] = $input; $list[] = $input;
} }
@ -3412,10 +3412,10 @@ class JsonLdProcessor {
foreach($objects as $o) { foreach($objects as $o) {
if($property === '@type') { if($property === '@type') {
// rename @type blank nodes // rename @type blank nodes
$o = (strpos($o, '_:') === 0) ? $namer->getName($o) : $o; $o = (strpos($o, '_:') === 0) ? $namer->getName($o) : $o;
if(!property_exists($graphs->{$graph}, $o)) { if(!property_exists($graphs->{$graph}, $o)) {
$graphs->{$graph}->{$o} = (object)array('@id' => $o); $graphs->{$graph}->{$o} = (object)array('@id' => $o);
} }
} }
// handle embedded subject or subject reference // handle embedded subject or subject reference
@ -3563,7 +3563,7 @@ class JsonLdProcessor {
// recurse into subject reference // recurse into subject reference
if(self::_isSubjectReference($o)) { if(self::_isSubjectReference($o)) {
$this->_matchFrame( $this->_matchFrame(
$state, array($o->{'@id'}), $frame->{$prop}, $state, array($o->{'@id'}), $frame->{$prop}[0]->{'@list'},
$list, '@list'); $list, '@list');
} }
// include other values automatically // include other values automatically