Skip to content
Snippets Groups Projects
Commit ab55664b authored by alangrafu's avatar alangrafu
Browse files

Merge branch 'hotfixes' into development

parents 5af2ce02 9b3eb65b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
classes/Utils.php
+ 7
− 1
View file @ ab55664b
...@@ -85,7 +85,7 @@ class Utils{ ...@@ -85,7 +85,7 @@ class Utils{
foreach($w as $k => $v){ foreach($w as $k => $v){
if($conf['use_external_uris'] === true && $v['type'] == 'uri'){ if($conf['use_external_uris'] === true && $v['type'] == 'uri'){
$v['value'] = preg_replace("|^".$conf['ns']['local']."|", $conf['basedir'], $v['value']); $v['value'] = preg_replace("|^".$conf['ns']['local']."|", $conf['basedir'], $v['value']);
} }
$row[$k]['value'] = $v['value']; $row[$k]['value'] = $v['value'];
if($v['type'] == 'uri'){ if($v['type'] == 'uri'){
$row[$k]['curie'] = Utils::uri2curie($v['value']); $row[$k]['curie'] = Utils::uri2curie($v['value']);
...@@ -294,12 +294,18 @@ class Utils{ ...@@ -294,12 +294,18 @@ class Utils{
} }
if(Utils::getResultsType($query) == $conf['endpoint']['select']['output']){ if(Utils::getResultsType($query) == $conf['endpoint']['select']['output']){
$rPointer[$modelFile] = Utils::sparqlResult2Obj($aux); $rPointer[$modelFile] = Utils::sparqlResult2Obj($aux);
if(sizeof($rPointer)>0){
$rPointer[$modelFile]['first'] = $rPointer[$modelFile][0];
}
}else{ }else{
$rPointer[$modelFile] = $aux; $rPointer[$modelFile] = $aux;
} }
}else{ }else{
if(Utils::getResultsType($query) == $conf['endpoint']['select']['output']){ if(Utils::getResultsType($query) == $conf['endpoint']['select']['output']){
$rPointer = Utils::sparqlResult2Obj($aux); $rPointer = Utils::sparqlResult2Obj($aux);
if(sizeof($rPointer)>0){
$rPointer['first'] = $rPointer[0];
}
}else{ }else{
$rPointer = $aux; $rPointer = $aux;
} }
......
views/special.index.view.html
+ 1
− 1
View file @ ab55664b
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<body> <body>
<h1>Classes available</h1> <h1>Classes available</h1>
<ul> <ul>
{% if r.value.resource != null %} {% if r.resource.value != null %}
<!-- Only one class available --> <!-- Only one class available -->
<li><a href='{{base.baseUrl}}special/instances/{{ r.resource.curie }}'>{{r.resource.curie}}</a></li> <li><a href='{{base.baseUrl}}special/instances/{{ r.resource.curie }}'>{{r.resource.curie}}</a></li>
{% endif %} {% endif %}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment