Merge branch 'develop'

This commit is contained in:
Babibubebon 2020-08-27 01:07:55 +09:00
commit 522148b596
No known key found for this signature in database
GPG key ID: 575C0B67FDDAF4AE
6 changed files with 1194 additions and 459 deletions

View file

@ -31,7 +31,7 @@ $app->configure('namespaces');
// Register namespaces
foreach (config('namespaces') as $prefix => $uri) {
EasyRdf_Namespace::set($prefix, $uri);
\EasyRdf\RdfNamespace::set($prefix, $uri);
}
/*

View file

@ -6,7 +6,7 @@
"type": "project",
"require": {
"php": "^7.2",
"easyrdf/easyrdf": "^0.9.1",
"easyrdf/easyrdf": "^1.0.0",
"laravel/lumen-framework": "^6.0",
"ml/json-ld": "^1.1"
},

1637
composer.lock generated

File diff suppressed because it is too large Load diff

View file

@ -2,7 +2,7 @@
return [
'version' => '1.2.2',
'version' => '1.2.3',
/*
|--------------------------------------------------------------------------

View file

@ -3,7 +3,7 @@
@if($subject !== $primaryTopic)
is
@endif
<a href="{{ $predicate }}">{{ \EasyRdf_Namespace::shorten($predicate) ?? $predicate }}</a>
<a href="{{ $predicate }}">{{ \EasyRdf\RdfNamespace::shorten($predicate) ?? $predicate }}</a>
@if($subject !== $primaryTopic)
of
@endif
@ -14,14 +14,14 @@
@foreach($objects as $object)
<li>
@if($object['type'] === 'uri')
<a href="{{ $object['value'] }}">{{ \EasyRdf_Namespace::shorten($object['value']) ?? $object['value'] }}</a>
<a href="{{ $object['value'] }}">{{ \EasyRdf\RdfNamespace::shorten($object['value']) ?? $object['value'] }}</a>
@elseif($object['type'] === 'literal')
{{ $object['value'] }}
@if(isset($object['lang']))
<small class="langtag">{{ '@'.$object['lang'] }}</small>
@endif
@if(isset($object['datatype']))
<small class="datatype">^^{{ \EasyRdf_Namespace::shorten($object['datatype']) ?? $object['datatype'] }}</small>
<small class="datatype">^^{{ \EasyRdf\RdfNamespace::shorten($object['datatype']) ?? $object['datatype'] }}</small>
@endif
@endif
</li>

View file

@ -12,7 +12,9 @@
An Entity of Type:
<ul class="list-inline" style="display: inline">
@foreach($graph->typesAsResources($primaryTopic) as $type)
<li class="list-inline-item"><a href="{{ $type->getUri() }}">{{ $type->shorten() }}</a></li>
<li class="list-inline-item"><a href="{{ $type->getUri() }}">
{{ $type->shorten() ?? $type->getUri() }}</a>
</li>
@endforeach
</li>
</div>