From 28ce7c0c12fe468d0fcd9c57ca3ece7677c17cbd Mon Sep 17 00:00:00 2001
From: Alvaro Graves <alvaro@graves.cl>
Date: Wed, 25 Jan 2012 16:50:42 -0800
Subject: [PATCH] Fixed https://github.com/alangrafu/lodspeakr/issues/30
Also, moved `util/ldspk.sh` to `util/lodspk.sh` for consistency
---
classes/BasicSpecialFunction.php | 42 ++++++-------
classes/Utils.php | 62 ++++++++++---------
.../service.instances/html.queries/main.query | 4 +-
modules/classModule.php | 38 ++++++------
modules/serviceModule.php | 2 +-
modules/staticModule.php | 4 +-
modules/uriModule.php | 28 ++++-----
utils/{ldspkr.sh => lodspk.sh} | 0
utils/modules/create-class.sh | 20 +++---
utils/modules/create-service.sh | 6 +-
utils/modules/create-uri.sh | 20 +++---
views/class.rdfs:Resource/html.template | 22 +++----
views/class.rdfs:Resource/json.template | 2 +-
views/class.rdfs:Resource/nt.template | 2 +-
views/class.rdfs:Resource/rdf.template | 2 +-
views/class.rdfs:Resource/ttl.template | 2 +-
views/header.inc | 4 +-
views/service.classes/html.template | 4 +-
views/service.instances/html.template | 6 +-
19 files changed, 135 insertions(+), 135 deletions(-)
rename utils/{ldspkr.sh => lodspk.sh} (100%)
diff --git a/classes/BasicSpecialFunction.php b/classes/BasicSpecialFunction.php
index fe5daa22..2fb9d487 100644
--- a/classes/BasicSpecialFunction.php
+++ b/classes/BasicSpecialFunction.php
@@ -27,7 +27,7 @@ class SpecialFunction extends AbstractSpecialFunction{
public function execute($uri, $context){
global $conf;
- global $base;
+ global $lodspk;
global $results;
global $rRoot;
$f = $this->getFunction($uri);
@@ -71,25 +71,25 @@ class SpecialFunction extends AbstractSpecialFunction{
}
$results['params'] = $params;
- $base = $conf['view']['standard'];
- $base['type'] = $modelFile;
- $base['root'] = $conf['root'];
- $base['home'] = $conf['basedir'];
- $base['this']['value'] = $uri;
- $base['this']['curie'] = Utils::uri2curie($uri);
- $base['this']['contentType'] = $acceptContentType;
- $base['model']['directory'] = $conf['model']['directory'];
- $base['view']['directory'] = $conf['view']['directory'];
- $base['ns'] = $conf['ns'];
- $base['endpoint'] = $conf['endpoint'];
- $base['type'] = $modelFile;
- $base['header'] = $prefixHeader;
- $base['args'] = $args;
- $base['baseUrl'] = $conf['basedir'];
- $base['this']['value'] = $uri;
- $base['this']['contentType'] = $acceptContentType;
- $base['view']['directory'] = $conf['home'].$conf['view']['directory'].$conf['service']['prefix'].$f.'/';
- $base['model']['directory'] = $conf['home'].$conf['model']['directory'];
+ $lodspk = $conf['view']['standard'];
+ $lodspk['type'] = $modelFile;
+ $lodspk['root'] = $conf['root'];
+ $lodspk['home'] = $conf['basedir'];
+ $lodspk['this']['value'] = $uri;
+ $lodspk['this']['curie'] = Utils::uri2curie($uri);
+ $lodspk['this']['contentType'] = $acceptContentType;
+ $lodspk['model']['directory'] = $conf['model']['directory'];
+ $lodspk['view']['directory'] = $conf['view']['directory'];
+ $lodspk['ns'] = $conf['ns'];
+ $lodspk['endpoint'] = $conf['endpoint'];
+ $lodspk['type'] = $modelFile;
+ $lodspk['header'] = $prefixHeader;
+ $lodspk['args'] = $args;
+ $lodspk['baseUrl'] = $conf['basedir'];
+ $lodspk['this']['value'] = $uri;
+ $lodspk['this']['contentType'] = $acceptContentType;
+ $lodspk['view']['directory'] = $conf['home'].$conf['view']['directory'].$conf['service']['prefix'].$f.'/';
+ $lodspk['model']['directory'] = $conf['home'].$conf['model']['directory'];
chdir($conf['model']['directory']);
$first = array();
Utils::queryFile($modelFile, $endpoints['local'], $results, $first);
@@ -102,7 +102,7 @@ class SpecialFunction extends AbstractSpecialFunction{
//Need to redefine viewFile as 'local' i.e., inside service.foo/ so I can load files with the relative path correctly
$viewFile = $extension.".template";
- Utils::processDocument($viewFile, $base, $results);
+ Utils::processDocument($viewFile, $lodspk, $results);
}catch (Exception $ex){
echo $ex->getMessage();
diff --git a/classes/Utils.php b/classes/Utils.php
index 3baefa1a..e5f79ff4 100644
--- a/classes/Utils.php
+++ b/classes/Utils.php
@@ -220,16 +220,16 @@ class Utils{
return $doc;
}
- public static function processDocument($viewFile, $base, $data){
+ public static function processDocument($viewFile, $lodspk, $data){
global $conf;
- $contentType = $base['this']['contentType'];
+ $contentType = $lodspk['this']['contentType'];
$extension = Utils::getExtension($contentType);
header('Content-Type: '.$contentType);
if($extension != 'html'){
$data = Utils::serializeRdf($data, $extension);
}
- Utils::showView($base, $data, $viewFile);
+ Utils::showView($lodspk, $data, $viewFile);
}
public static function getResultsType($query){
@@ -248,10 +248,10 @@ class Utils{
public static function queryDir($modelDir, &$r, &$f){
global $conf;
global $uri;
- global $base;
+ global $lodspk;
global $endpoints;
global $results;
- $base['model']['directory'] = $modelDir;
+ $lodspk['model']['directory'] = $modelDir;
$originalDir = getcwd();
trigger_error("Entering $modelDir from ".getcwd(), E_USER_NOTICE);
@@ -277,7 +277,7 @@ class Utils{
}else{
$e = $endpoints[$modelDir];
}
- if($modelDir != $base['type']){
+ if($modelDir != $lodspk['type']){
if(!isset($r[$modelDir]) ){
$r[$modelDir] = array();
$f[$modelDir] = array();
@@ -290,13 +290,13 @@ class Utils{
}
}
closedir($handle);
- $originalDir = $base['model']['directory'];
+ $originalDir = $lodspk['model']['directory'];
if(isset($subDIrs)){
foreach($subDirs as $v){
if(!isset($r[$modelDir])){
$r[$modelDir] = array();
}
- if($modelDir != $base['type']){
+ if($modelDir != $lodspk['type']){
Utils::queryDir($v, $r[$modelDir]);
}else{
Utils::queryDir($v, $r);
@@ -310,10 +310,10 @@ class Utils{
public static function queryFile($modelFile, $e, &$rPointer, &$fPointer){
global $conf;
- global $base;
+ global $lodspk;
global $results;
global $first;
- $uri = $base['this']['value'];
+ $uri = $lodspk['this']['value'];
$data = array();
$strippedModelFile = str_replace('.query', '',$modelFile);
if(!is_dir($modelFile)){
@@ -324,25 +324,25 @@ class Utils{
));
//Haanga supports the dot (.) convention only for objects
- if(is_array($base)){
- $baseObj = Convert::array_to_object($base);
- $base = $baseObj;
+ if(is_array($lodspk)){
+ $lodspkObj = Convert::array_to_object($lodspk);
+ $lodspk = $lodspkObj;
}
$r2 = Convert::array_copy($results);
$models = Convert::array_to_object($r2);
$f = Convert::array_to_object($first);
- $vars = compact('uri', 'base', 'models', 'f');
+ $vars = compact('uri', 'lodspk', 'models', 'f');
$fnc = Haanga::compile(file_get_contents($modelFile));
$query = $fnc($vars, TRUE);
- if(is_object($base)){
- $baseObj = Convert::object_to_array($base);
- $base = $baseObj;
+ if(is_object($lodspk)){
+ $lodspkObj = Convert::object_to_array($lodspk);
+ $lodspk = $lodspkObj;
}
- if($base['transform_select_query']==true){
+ if($lodspk['transform_select_query']==true){
include_once($conf['home'].'lib/arc2/ARC2.php');
$parser = ARC2::getSPARQLParser();
$parser->parse($query);
@@ -404,7 +404,7 @@ class Utils{
}
trigger_error("Running query on endpoint", E_USER_NOTICE);
$aux = $e->query($query, Utils::getResultsType($query));
- if($modelFile != $base['type']){
+ if($modelFile != $lodspk['type']){
if(!isset($rPointer[$strippedModelFile])){
$rPointer[$strippedModelFile] = array();
$first[$strippedModelFile] = array();
@@ -431,7 +431,7 @@ class Utils{
}
}else{
trigger_error("$modelFile is a directory, will process it later", E_USER_NOTICE);
- if($modelFile != $base['type']){
+ if($modelFile != $lodspk['type']){
if(!isset($rPointer[$strippedModelFile])){
$rPointer[$strippedModelFile] = array();
}
@@ -480,31 +480,33 @@ class Utils{
}
- public static function showView($baseData, $data, $view){
+ public static function showView($lodspkData, $data, $view){
global $conf;
global $uri;
global $extension;
- $base = $conf['view']['standard'];
- $base = $baseData;
+ $lodspk = $conf['view']['standard'];
+ $lodspk = $lodspkData;
- if(isset($baseData['params'])){
- $base['this']['params'] = $baseData['params'];
+ if(isset($lodspkData['params'])){
+ $lodspk['this']['params'] = $lodspkData['params'];
}
require_once('lib/Haanga/lib/Haanga.php');
Haanga::configure(array(
- 'template_dir' => $base['view']['directory'],
+ 'template_dir' => $lodspk['view']['directory'],
'cache_dir' => $conf['home'].'cache/',
));
$models = $data;
- $first = $base['first'];
- unset($base['first']);
- $vars = compact('uri','base', 'models', 'first');
+ $first = $lodspk['first'];
+ unset($lodspk['first']);
+ $lodspk = $lodspk;
+ //unset($lodspk);
+ $vars = compact('uri','lodspk', 'models', 'first');
if($conf['debug']){
var_dump($vars);
}
if(is_string($data)){
echo($data);
- }elseif(is_file($base['view']['directory'].$view)){
+ }elseif(is_file($lodspk['view']['directory'].$view)){
Haanga::Load($view, $vars);
}else{
$fnc = Haanga::compile($view);
diff --git a/models/service.instances/html.queries/main.query b/models/service.instances/html.queries/main.query
index c5a35102..5ff6cf27 100644
--- a/models/service.instances/html.queries/main.query
+++ b/models/service.instances/html.queries/main.query
@@ -1,6 +1,6 @@
-{%for h in base.header %}
+{%for h in lodspk.header %}
PREFIX {{h.prefix}}: <{{h.ns}}>
{%endfor%}
SELECT DISTINCT ?resource WHERE {
- ?resource a {{base.args.arg0}}
+ ?resource a {{lodspk.args.arg0}}
}
diff --git a/modules/classModule.php b/modules/classModule.php
index 0c6bb8fe..ad820392 100644
--- a/modules/classModule.php
+++ b/modules/classModule.php
@@ -9,7 +9,7 @@ class ClassModule extends abstractModule{
global $uri;
global $acceptContentType;
global $endpoints;
- global $base;
+ global $lodspk;
require_once('classes/MetaDb.php');
$metaDb = new MetaDb($conf['metadata']['db']['location']);
@@ -37,7 +37,7 @@ class ClassModule extends abstractModule{
global $uri;
global $acceptContentType;
global $endpoints;
- global $base;
+ global $lodspk;
global $results;
global $first;
list($res, $page, $format) = $pair;
@@ -62,21 +62,21 @@ class ClassModule extends abstractModule{
$t=Queries::getClass($uri, $endpoints['local']);
list($modelFile, $viewFile) = $this::getModelandView($t, $extension);
- $base = $conf['view']['standard'];
+ $lodspk = $conf['view']['standard'];
if($viewFile == null){
- $base['transform_select_query'] = true;
+ $lodspk['transform_select_query'] = true;
}
- $base['type'] = $modelFile;
- $base['this']['value'] = $uri;
- $base['this']['curie'] = Utils::uri2curie($uri);
- $base['thislocal']['value'] = $localUri;
- $base['thislocal']['curie'] = Utils::uri2curie($localUri);
+ $lodspk['type'] = $modelFile;
+ $lodspk['this']['value'] = $uri;
+ $lodspk['this']['curie'] = Utils::uri2curie($uri);
+ $lodspk['thislocal']['value'] = $localUri;
+ $lodspk['thislocal']['curie'] = Utils::uri2curie($localUri);
- $base['this']['extension'] = $extension;
- $base['this']['contentType'] = $acceptContentType;
- $base['model']['directory'] = $conf['model']['directory'];
- $base['view']['directory'] = $conf['view']['directory'];
- $base['ns'] = $conf['ns'];
+ $lodspk['this']['extension'] = $extension;
+ $lodspk['this']['contentType'] = $acceptContentType;
+ $lodspk['model']['directory'] = $conf['model']['directory'];
+ $lodspk['view']['directory'] = $conf['view']['directory'];
+ $lodspk['ns'] = $conf['ns'];
chdir($conf['home'].$conf['model']['directory']);
@@ -84,14 +84,14 @@ class ClassModule extends abstractModule{
Utils::queryFile($modelFile, $endpoints['local'], $results, $first);
$results = Utils::internalize($results);
- $base['first'] = Utils::getFirsts($results);
+ $lodspk['first'] = Utils::getFirsts($results);
chdir($conf['home']);
if(is_array($results)){
$resultsObj = Convert::array_to_object($results);
}else{
$resultsObj = $results;
}
- Utils::processDocument($viewFile, $base, $resultsObj);
+ Utils::processDocument($viewFile, $lodspk, $resultsObj);
}
@@ -99,7 +99,7 @@ class ClassModule extends abstractModule{
global $conf;
global $results;
global $rPointer;
- global $base;
+ global $lodspk;
//Defining default views and models
$curieType="";
$modelFile = 'class.rdfs:Resource/html.queries';
@@ -123,15 +123,13 @@ class ClassModule extends abstractModule{
$modelFile = $conf['class']['prefix'].$v.'/'.$extension.'.queries';
break;
}elseif($extension != 'html' &&
- file_exists($conf['view']['directory'].$conf['class']['prefix'].$v.'/html.template') &&
- file_exists($conf['model']['directory'].$conf['class']['prefix'].$v.'/html.queries') && $v != null){
+ file_exists($conf['model']['directory'].$conf['class']['prefix'].$v.'/html.queries')){
$modelFile = $conf['class']['prefix'].$v.'/html.queries';
$viewFile = null;//$conf['class']['prefix'].$v.'/html.queries';
trigger_error("LODSPeaKr can't find the proper query. Using HTML query instead.", E_USER_NOTICE);
break;
}
}
-
if($viewFile == null && $extension == 'html'){
$viewFile = 'class.rdfs:Resource/html.template';
}
diff --git a/modules/serviceModule.php b/modules/serviceModule.php
index 8385d24f..af4284b0 100644
--- a/modules/serviceModule.php
+++ b/modules/serviceModule.php
@@ -36,7 +36,7 @@ class ServiceModule extends abstractModule{
global $uri;
global $acceptContentType;
global $endpoints;
- global $base;
+ global $lodspk;
require_once($conf['home'].$conf['service']['class']);
$context = array();
$context['contentType'] = $acceptContentType;
diff --git a/modules/staticModule.php b/modules/staticModule.php
index 3d7b0534..6f59daa9 100644
--- a/modules/staticModule.php
+++ b/modules/staticModule.php
@@ -9,7 +9,7 @@ class StaticModule extends abstractModule{
global $uri;
global $acceptContentType;
global $endpoints;
- global $base;
+ global $lodspk;
$q = preg_replace('|^'.$conf['basedir'].'|', '', $localUri);
if(sizeof($q)>0 && file_exists($conf['home'].$conf['static']['directory'].$q)){
return $q;
@@ -23,7 +23,7 @@ class StaticModule extends abstractModule{
global $uri;
global $acceptContentType;
global $endpoints;
- global $base;
+ global $lodspk;
header("Content-type: ");
echo file_get_contents($conf['static']['directory'].$file);
}
diff --git a/modules/uriModule.php b/modules/uriModule.php
index 492306c7..8002866a 100644
--- a/modules/uriModule.php
+++ b/modules/uriModule.php
@@ -9,7 +9,7 @@ class UriModule extends abstractModule{
global $uri;
global $acceptContentType;
global $endpoints;
- global $base;
+ global $lodspk;
require_once('classes/MetaDb.php');
$metaDb = new MetaDb($conf['metadata']['db']['location']);
@@ -44,7 +44,7 @@ class UriModule extends abstractModule{
global $uri;
global $acceptContentType;
global $endpoints;
- global $base;
+ global $lodspk;
global $results;
global $first;
list($res, $page, $format) = $pair;
@@ -74,17 +74,17 @@ class UriModule extends abstractModule{
return;
}
- $base = $conf['view']['standard'];
- $base['type'] = $modelFile;
- $base['this']['value'] = $uri;
- $base['this']['curie'] = Utils::uri2curie($uri);
- $base['thislocal']['value'] = $localUri;
- $base['thislocal']['curie'] = Utils::uri2curie($localUri);
+ $lodspk = $conf['view']['standard'];
+ $lodspk['type'] = $modelFile;
+ $lodspk['this']['value'] = $uri;
+ $lodspk['this']['curie'] = Utils::uri2curie($uri);
+ $lodspk['thislocal']['value'] = $localUri;
+ $lodspk['thislocal']['curie'] = Utils::uri2curie($localUri);
- $base['this']['contentType'] = $acceptContentType;
- $base['model']['directory'] = $conf['model']['directory'];
- $base['view']['directory'] = $conf['view']['directory'];
- $base['ns'] = $conf['ns'];
+ $lodspk['this']['contentType'] = $acceptContentType;
+ $lodspk['model']['directory'] = $conf['model']['directory'];
+ $lodspk['view']['directory'] = $conf['view']['directory'];
+ $lodspk['ns'] = $conf['ns'];
chdir($conf['home'].$conf['model']['directory']);
@@ -92,14 +92,14 @@ class UriModule extends abstractModule{
Utils::queryFile($modelFile, $endpoints['local'], $results, $first);
$results = Utils::internalize($results);
- $base['first'] = Utils::getFirsts($results);
+ $lodspk['first'] = Utils::getFirsts($results);
chdir($conf['home']);
if(is_array($results)){
$resultsObj = Convert::array_to_object($results);
}else{
$resultsObj = $results;
}
- Utils::processDocument($viewFile, $base, $resultsObj);
+ Utils::processDocument($viewFile, $lodspk, $resultsObj);
}
diff --git a/utils/ldspkr.sh b/utils/lodspk.sh
similarity index 100%
rename from utils/ldspkr.sh
rename to utils/lodspk.sh
diff --git a/utils/modules/create-class.sh b/utils/modules/create-class.sh
index c6af75b9..94d38494 100755
--- a/utils/modules/create-class.sh
+++ b/utils/modules/create-class.sh
@@ -23,17 +23,17 @@ viewHtml=$(cat <<VIEW
<html xmlns="http://www.w3.org/1999/xhtml" {% for i, ns in base.ns %}xmlns:{{i}}="{{ns}}"
{%endfor%}version="XHTML+RDFa 1.0" xml:lang="en">
<head>
- <title>Page about {{base.this.value}}</title>
- <link href="{{base.baseUrl}}/lodspeakr/css/basic.css" rel="stylesheet" type="text/css" media="screen" />
- <link rel="alternate" type="application/rdf+xml" title="RDF/XML Version" href="{{base.this.value}}.rdf" />
- <link rel="alternate" type="text/turtle" title="Turtle Version" href="{{base.this.value}}.ttl" />
- <link rel="alternate" type="text/plain" title="N-Triples Version" href="{{base.this.value}}.nt" />
- <link rel="alternate" type="application/json" title="RDFJSON Version" href="{{base.this.value}}.json" />
+ <title>Page about {{lodspk.this.value}}</title>
+ <link href="{{lodspk.baseUrl}}/lodspeakr/css/basic.css" rel="stylesheet" type="text/css" media="screen" />
+ <link rel="alternate" type="application/rdf+xml" title="RDF/XML Version" href="{{lodspk.this.value}}.rdf" />
+ <link rel="alternate" type="text/turtle" title="Turtle Version" href="{{lodspk.this.value}}.ttl" />
+ <link rel="alternate" type="text/plain" title="N-Triples Version" href="{{lodspk.this.value}}.nt" />
+ <link rel="alternate" type="application/json" title="RDFJSON Version" href="{{lodspk.this.value}}.json" />
</head>
- <body about="{{base.this.value}}">
- <h1>Page about <a href='{{base.this.value}}'>{{base.this.curie}}</a></h1>
+ <body about="{{lodspk.this.value}}">
+ <h1>Page about <a href='{{lodspk.this.value}}'>{{lodspk.this.curie}}</a></h1>
<div>
- <h2>Information from {{base.this.curie}}</h2>
+ <h2>Information from {{lodspk.this.curie}}</h2>
<table>
{% for row in models.main %}
@@ -53,7 +53,7 @@ viewHtml=$(cat <<VIEW
</table>
<br/><br/>
- <h2>Information pointing to {{base.this.curie}}</h2>
+ <h2>Information pointing to {{lodspk.this.curie}}</h2>
<table>
{% for row in models.main %}
{% if row.s2%}
diff --git a/utils/modules/create-service.sh b/utils/modules/create-service.sh
index 616cd52d..764f878a 100755
--- a/utils/modules/create-service.sh
+++ b/utils/modules/create-service.sh
@@ -9,7 +9,7 @@ modelHtml=$(cat <<QUERY
PREFIX {{h.prefix}}: <{{h.ns}}>
{%endfor%}
SELECT DISTINCT ?resource WHERE {
- {%if base.args.arg0 %}GRAPH <{{base.args.arg0}}>{ {%endif%}
+ {%if base.args.arg0 %}GRAPH <{{lodspk.args.arg0}}>{ {%endif%}
[] a ?resource .
{%if base.args.arg0 %} } {%endif%}
}
@@ -23,13 +23,13 @@ viewHtml=$(cat <<VIEW
{%endfor%}version="XHTML+RDFa 1.0" xml:lang="en">
<head>
<title>My new Service</title>
- <link href="{{base.baseUrl}}/lodspeakr/css/basic.css" rel="stylesheet" type="text/css" media="screen" />
+ <link href="{{lodspk.baseUrl}}/lodspeakr/css/basic.css" rel="stylesheet" type="text/css" media="screen" />
</head>
<body>
<h1>Classes available</h1>
<ul>
{% for row in models.main %}
- <li><a href="{{base.baseUrl}}special/instances/{{ row.resource.curie }}">{{row.resource.curie}}</a></li>
+ <li><a href="{{lodspk.baseUrl}}special/instances/{{ row.resource.curie }}">{{row.resource.curie}}</a></li>
{% endfor %}
</ul>
</body>
diff --git a/utils/modules/create-uri.sh b/utils/modules/create-uri.sh
index be85df92..bfee9fb2 100755
--- a/utils/modules/create-uri.sh
+++ b/utils/modules/create-uri.sh
@@ -23,17 +23,17 @@ viewHtml=$(cat <<VIEW
<html xmlns="http://www.w3.org/1999/xhtml" {% for i, ns in base.ns %}xmlns:{{i}}="{{ns}}"
{%endfor%}version="XHTML+RDFa 1.0" xml:lang="en">
<head>
- <title>Page about {{base.this.value}}</title>
- <link href="{{base.baseUrl}}/lodspeakr/css/basic.css" rel="stylesheet" type="text/css" media="screen" />
- <link rel="alternate" type="application/rdf+xml" title="RDF/XML Version" href="{{base.this.value}}.rdf" />
- <link rel="alternate" type="text/turtle" title="Turtle Version" href="{{base.this.value}}.ttl" />
- <link rel="alternate" type="text/plain" title="N-Triples Version" href="{{base.this.value}}.nt" />
- <link rel="alternate" type="application/json" title="RDFJSON Version" href="{{base.this.value}}.json" />
+ <title>Page about {{lodspk.this.value}}</title>
+ <link href="{{lodspk.baseUrl}}/lodspeakr/css/basic.css" rel="stylesheet" type="text/css" media="screen" />
+ <link rel="alternate" type="application/rdf+xml" title="RDF/XML Version" href="{{lodspk.this.value}}.rdf" />
+ <link rel="alternate" type="text/turtle" title="Turtle Version" href="{{lodspk.this.value}}.ttl" />
+ <link rel="alternate" type="text/plain" title="N-Triples Version" href="{{lodspk.this.value}}.nt" />
+ <link rel="alternate" type="application/json" title="RDFJSON Version" href="{{lodspk.this.value}}.json" />
</head>
- <body about="{{base.this.value}}">
- <h1>Page about <a href='{{base.this.value}}'>{{base.this.curie}}</a></h1>
+ <body about="{{lodspk.this.value}}">
+ <h1>Page about <a href='{{lodspk.this.value}}'>{{lodspk.this.curie}}</a></h1>
<div>
- <h2>Information from {{base.this.curie}}</h2>
+ <h2>Information from {{lodspk.this.curie}}</h2>
<table>
{% for row in models.main %}
@@ -53,7 +53,7 @@ viewHtml=$(cat <<VIEW
</table>
<br/><br/>
- <h2>Information pointing to {{base.this.curie}}</h2>
+ <h2>Information pointing to {{lodspk.this.curie}}</h2>
<table>
{% for row in models.main %}
{% if row.s2%}
diff --git a/views/class.rdfs:Resource/html.template b/views/class.rdfs:Resource/html.template
index 1bff5b29..847e3b91 100644
--- a/views/class.rdfs:Resource/html.template
+++ b/views/class.rdfs:Resource/html.template
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN"
"http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">
- <html xmlns="http://www.w3.org/1999/xhtml" {% for i, ns in base.ns %}xmlns:{{i}}="{{ns}}"
+ <html xmlns="http://www.w3.org/1999/xhtml" {% for i, ns in lodspk.ns %}xmlns:{{i}}="{{ns}}"
{%endfor%}version="XHTML+RDFa 1.0" xml:lang="en">
<head>
- <title>Page about {{base.this.value}}</title>
- <link href="{{base.baseUrl}}css/basic.css" rel="stylesheet" type="text/css" media="screen" />
- <link rel="alternate" type="application/rdf+xml" title="RDF/XML Version" href="{{base.this.value}}.rdf" />
- <link rel="alternate" type="text/turtle" title="Turtle Version" href="{{base.this.value}}.ttl" />
- <link rel="alternate" type="text/plain" title="N-Triples Version" href="{{base.this.value}}.nt" />
- <link rel="alternate" type="application/json" title="RDFJSON Version" href="{{base.this.value}}.json" />
+ <title>Page about {{lodspk.this.value}}</title>
+ <link href="{{lodspk.baseUrl}}css/basic.css" rel="stylesheet" type="text/css" media="screen" />
+ <link rel="alternate" type="application/rdf+xml" title="RDF/XML Version" href="{{lodspk.this.value}}.rdf" />
+ <link rel="alternate" type="text/turtle" title="Turtle Version" href="{{lodspk.this.value}}.ttl" />
+ <link rel="alternate" type="text/plain" title="N-Triples Version" href="{{lodspk.this.value}}.nt" />
+ <link rel="alternate" type="application/json" title="RDFJSON Version" href="{{lodspk.this.value}}.json" />
</head>
- <body about="{{base.this.value}}">
- <h1>Page about <a href='{{base.this.value}}'>{{base.this.curie}}</a></h1>
+ <body about="{{lodspk.this.value}}">
+ <h1>Page about <a href='{{lodspk.this.value}}'>{{lodspk.this.curie}}</a></h1>
<div>
- <h2>Information from {{base.this.curie}}</h2>
+ <h2>Information from {{lodspk.this.curie}}</h2>
<table>
{% for row in models.main %}
@@ -34,7 +34,7 @@
</table>
<br/><br/>
- <h2>Information pointing to {{base.this.curie}}</h2>
+ <h2>Information pointing to {{lodspk.this.curie}}</h2>
<table>
{% for row in models.main %}
{% if row.s2%}
diff --git a/views/class.rdfs:Resource/json.template b/views/class.rdfs:Resource/json.template
index ca994557..39e1ca7c 100644
--- a/views/class.rdfs:Resource/json.template
+++ b/views/class.rdfs:Resource/json.template
@@ -1 +1 @@
-{{r|safe}}
+{{models.main|safe}}
diff --git a/views/class.rdfs:Resource/nt.template b/views/class.rdfs:Resource/nt.template
index ca994557..39e1ca7c 100644
--- a/views/class.rdfs:Resource/nt.template
+++ b/views/class.rdfs:Resource/nt.template
@@ -1 +1 @@
-{{r|safe}}
+{{models.main|safe}}
diff --git a/views/class.rdfs:Resource/rdf.template b/views/class.rdfs:Resource/rdf.template
index f6451d60..39e1ca7c 100644
--- a/views/class.rdfs:Resource/rdf.template
+++ b/views/class.rdfs:Resource/rdf.template
@@ -1 +1 @@
-{{r.main|safe}}
+{{models.main|safe}}
diff --git a/views/class.rdfs:Resource/ttl.template b/views/class.rdfs:Resource/ttl.template
index ca994557..39e1ca7c 100644
--- a/views/class.rdfs:Resource/ttl.template
+++ b/views/class.rdfs:Resource/ttl.template
@@ -1 +1 @@
-{{r|safe}}
+{{models.main|safe}}
diff --git a/views/header.inc b/views/header.inc
index 7bb8c2e4..2c90255a 100644
--- a/views/header.inc
+++ b/views/header.inc
@@ -1,5 +1,5 @@
-<h4>Endpoint: {{base.endpoint.local}}</h4>
+<h4>Endpoint: {{lodspk.endpoint.local}}</h4>
<div style='float:center'>
-<a href='{{base.home}}'>Home</a> | <a href='{{base.home}}classes'>Classes</a> | <a href='{{base.home}}namedGraphs'>Named Graphs</a>
+<a href='{{lodspk.home}}'>Home</a> | <a href='{{lodspk.home}}classes'>Classes</a> | <a href='{{lodspk.home}}namedGraphs'>Named Graphs</a>
</div>
diff --git a/views/service.classes/html.template b/views/service.classes/html.template
index e65319da..3c75a1c8 100644
--- a/views/service.classes/html.template
+++ b/views/service.classes/html.template
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN"
"http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">
- <html xmlns="http://www.w3.org/1999/xhtml" {% for i, ns in base.ns %}xmlns:{{i}}="{{ns}}"
+ <html xmlns="http://www.w3.org/1999/xhtml" {% for i, ns in lodspk.ns %}xmlns:{{i}}="{{ns}}"
{%endfor%}version="XHTML+RDFa 1.0" xml:lang="en">
<head>
<title>My new Service</title>
@@ -12,7 +12,7 @@
{%include "../header.inc"%}
<ul>
{% for row in models.main %}
- <li><a href="{{base.baseUrl}}instances/{{ row.resource.curie }}">{{row.resource.curie}}</a></li>
+ <li><a href="{{lodspk.baseUrl}}instances/{{ row.resource.curie }}">{{row.resource.curie}}</a></li>
{% endfor %}
</ul>
</body>
diff --git a/views/service.instances/html.template b/views/service.instances/html.template
index b1345c9e..c4b5de63 100644
--- a/views/service.instances/html.template
+++ b/views/service.instances/html.template
@@ -4,11 +4,11 @@
<html xmlns="http://www.w3.org/1999/xhtml" {% for i, ns in base.ns %}xmlns:{{i}}="{{ns}}"
{%endfor%}version="XHTML+RDFa 1.0" xml:lang="en">
<head>
- <title>Instances of {{base.args.arg0}}</title>
- <link href="css/basic.css" rel="stylesheet" type="text/css" media="screen" />
+ <title>Instances of {{lodspk.args.arg0}}</title>
+ <link href="../css/basic.css" rel="stylesheet" type="text/css" media="screen" />
</head>
<body>
- <h1>Instances of class {{base.args.arg0}}</h1>
+ <h1>Instances of class {{lodspk.args.arg0}}</h1>
{%include "../header.inc"%}
<ul>
{% for row in models.main %}
--
GitLab