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

Change @datatype to @type.

Browse source
This commit is contained in:
Dave Longley 2011-12-17 21:08:58 -05:00
parent 31181efa26
commit aee96b1ec6
1 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
jsonld.php
View file

@ -402,7 +402,6 @@ function _getKeywords($ctx)
// state // state
$rval = (object)array( $rval = (object)array(
'@datatype' => '@datatype',
'@iri' => '@iri', '@iri' => '@iri',
'@language' => '@language', '@language' => '@language',
'@literal' => '@literal', '@literal' => '@literal',
@ -767,7 +766,7 @@ function _compareObjects($o1, $o2)
{ {
if(property_exists($o1, '@literal')) if(property_exists($o1, '@literal'))
{ {
$rval = _compareObjectKeys($o1, $o2, '@datatype'); $rval = _compareObjectKeys($o1, $o2, '@type');
if($rval === 0) if($rval === 0)
{ {
$rval = _compareObjectKeys($o1, $o2, '@language'); $rval = _compareObjectKeys($o1, $o2, '@language');
@ -818,7 +817,7 @@ function _compareBlankNodeObjects($a, $b)
3.2.3. The bnode with the alphabetically-first string is first. 3.2.3. The bnode with the alphabetically-first string is first.
3.2.4. The bnode with a @literal is first. 3.2.4. The bnode with a @literal is first.
3.2.5. The bnode with the alphabetically-first @literal is first. 3.2.5. The bnode with the alphabetically-first @literal is first.
3.2.6. The bnode with the alphabetically-first @datatype is first. 3.2.6. The bnode with the alphabetically-first @type is first.
3.2.7. The bnode with a @language is first. 3.2.7. The bnode with a @language is first.
3.2.8. The bnode with the alphabetically-first @language is first. 3.2.8. The bnode with the alphabetically-first @language is first.
3.2.9. The bnode with the alphabetically-first @iri is first. 3.2.9. The bnode with the alphabetically-first @iri is first.
@ -1348,12 +1347,12 @@ class JsonLdProcessor
// type coercion can only occur if language is not specified // type coercion can only occur if language is not specified
if(!property_exists($value, '@language')) if(!property_exists($value, '@language'))
{ {
// datatype must match coerce type if specified // type must match coerce type if specified
if(property_exists($value, '@datatype')) if(property_exists($value, '@type'))
{ {
$type = $value->{'@datatype'}; $type = $value->{'@type'};
} }
// datatype is IRI // type is IRI
else if(property_exists($value, '@iri')) else if(property_exists($value, '@iri'))
{ {
$type = '@iri'; $type = '@iri';
@ -1394,7 +1393,7 @@ class JsonLdProcessor
else if($type !== $coerce) else if($type !== $coerce)
{ {
throw new Exception( throw new Exception(
'Cannot coerce type because the datatype does not match.'); 'Cannot coerce type because the type does not match.');
} }
// do reverse type-coercion // do reverse type-coercion
else else
@ -1548,9 +1547,9 @@ class JsonLdProcessor
{ {
$rval->{'@language'} = $value->{$keywords->{'@language'}}; $rval->{'@language'} = $value->{$keywords->{'@language'}};
} }
else if(property_exists($value, $keywords->{'@datatype'})) else if(property_exists($value, $keywords->{'@type'}))
{ {
$rval->{'@datatype'} = $value->{$keywords->{'@datatype'}}; $rval->{'@type'} = $value->{$keywords->{'@type'}};
} }
} }
} }
@ -1581,7 +1580,7 @@ class JsonLdProcessor
} }
} }
// coerce to appropriate datatype, only expand subjects if requested // coerce to appropriate type, only expand subjects if requested
if($coerce !== null and ( if($coerce !== null and (
$property !== $keywords->{'@subject'} or $expandSubjects)) $property !== $keywords->{'@subject'} or $expandSubjects))
{ {
@ -1592,10 +1591,10 @@ class JsonLdProcessor
{ {
$rval->{'@iri'} = _expandTerm($ctx, $value, null); $rval->{'@iri'} = _expandTerm($ctx, $value, null);
} }
// other datatype // other type
else else
{ {
$rval->{'@datatype'} = $coerce; $rval->{'@type'} = $coerce;
if($coerce === JSONLD_XSD_DOUBLE) if($coerce === JSONLD_XSD_DOUBLE)
{ {
// do special JSON-LD double format // do special JSON-LD double format
@ -2040,10 +2039,10 @@ class JsonLdProcessor
{ {
$rval .= '"' . $obj->{'@literal'} . '"'; $rval .= '"' . $obj->{'@literal'} . '"';
// datatype literal // type literal
if(property_exists($obj, '@datatype')) if(property_exists($obj, '@type'))
{ {
$rval .= '^^<' . $obj->{'@datatype'} . '>'; $rval .= '^^<' . $obj->{'@type'} . '>';
} }
// language literal // language literal
else if(property_exists($obj, '@language')) else if(property_exists($obj, '@language'))