From ddcc6d8e918ed645a8c3b09faa2c3bb8756af300 Mon Sep 17 00:00:00 2001
From: alvaro <alvaro@alia.(none)>
Date: Thu, 5 Jul 2012 12:50:11 -0700
Subject: [PATCH] Added lodspk.local.value and lodspk.local.curie
Applied changes to template
---
classes/modules/serviceModule.php | 3 ++-
classes/modules/sparqlFilterModule.php | 3 ++-
classes/modules/staticModule.php | 3 ++-
classes/modules/typeModule.php | 3 ++-
.../originalComponents/services/classes/html.template | 8 ++++----
.../originalComponents/services/instances/html.template | 8 ++++----
.../originalComponents/services/namedGraphs/html.template | 8 ++++----
.../originalComponents/types/rdfs:Resource/html.template | 8 ++++----
utils/modules/service-view.inc | 8 ++++----
utils/modules/type-view.inc | 8 ++++----
10 files changed, 32 insertions(+), 28 deletions(-)
diff --git a/classes/modules/serviceModule.php b/classes/modules/serviceModule.php
index 99aa3147..642edc46 100644
--- a/classes/modules/serviceModule.php
+++ b/classes/modules/serviceModule.php
@@ -111,7 +111,8 @@ class ServiceModule extends abstractModule{
$lodspk['ns'] = $conf['ns'];
$lodspk['this']['value'] = $uri;
$lodspk['this']['curie'] = Utils::uri2curie($uri);
- $lodspk['this']['local'] = $localUri;
+ $lodspk['local']['value'] = $localUri;
+ $lodspk['local']['curie'] = Utils::uri2curie($localUri);
$lodspk['contentType'] = $acceptContentType;
$lodspk['endpoint'] = $conf['endpoint'];
diff --git a/classes/modules/sparqlFilterModule.php b/classes/modules/sparqlFilterModule.php
index d532377b..99f89f6f 100644
--- a/classes/modules/sparqlFilterModule.php
+++ b/classes/modules/sparqlFilterModule.php
@@ -107,7 +107,8 @@ public function execute($pair){
$lodspk['add_mirrored_uris'] = true;
$lodspk['this']['value'] = $uri;
$lodspk['this']['curie'] = Utils::uri2curie($uri);
- $lodspk['this']['local'] = $localUri;
+ $lodspk['local']['value'] = $localUri;
+ $lodspk['local']['curie'] = Utils::uri2curie($localUri);
$lodspk['this']['extension'] = $extension;
//chdir($conf['home'].$conf['model']['directory']);
diff --git a/classes/modules/staticModule.php b/classes/modules/staticModule.php
index c1c24130..2e8c71b6 100644
--- a/classes/modules/staticModule.php
+++ b/classes/modules/staticModule.php
@@ -40,7 +40,8 @@ class StaticModule extends abstractModule{
$lodspk['ns'] = $conf['ns'];
$lodspk['this']['value'] = $localUri;
$lodspk['this']['curie'] = Utils::uri2curie($localUri);
- $lodspk['this']['local'] = $localUri;
+ $lodspk['local']['value'] = $localUri;
+ $lodspk['local']['curie'] = Utils::uri2curie($localUri);
$lodspk['contentType'] = $acceptContentType;
$lodspk['endpoint'] = $conf['endpoint'];
$lodspk['type'] = $modelFile;
diff --git a/classes/modules/typeModule.php b/classes/modules/typeModule.php
index 5bf22e26..e1994c02 100644
--- a/classes/modules/typeModule.php
+++ b/classes/modules/typeModule.php
@@ -82,7 +82,8 @@ class TypeModule extends abstractModule{
$lodspk['add_mirrored_uris'] = true;
$lodspk['this']['value'] = $uri;
$lodspk['this']['curie'] = Utils::uri2curie($uri);
- $lodspk['this']['local'] = $localUri;
+ $lodspk['local']['value'] = $localUri;
+ $lodspk['local']['curie'] = Utils::uri2curie($localUri);
$lodspk['this']['extension'] = $extension;
//chdir($conf['home'].$conf['model']['directory']);
diff --git a/doc/examples/originalComponents/services/classes/html.template b/doc/examples/originalComponents/services/classes/html.template
index 40a25f47..329366f0 100644
--- a/doc/examples/originalComponents/services/classes/html.template
+++ b/doc/examples/originalComponents/services/classes/html.template
@@ -7,10 +7,10 @@
<meta name="description" content="">
<meta name="author" content="">
<link href="{{lodspk.home}}css/bootstrap.min.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" />
+ <link rel="alternate" type="application/rdf+xml" title="RDF/XML Version" href="{{lodspk.local.value}}.rdf" />
+ <link rel="alternate" type="text/turtle" title="Turtle Version" href="{{lodspk.local.value}}.ttl" />
+ <link rel="alternate" type="text/plain" title="N-Triples Version" href="{{lodspk.local.value}}.nt" />
+ <link rel="alternate" type="application/json" title="RDFJSON Version" href="{{lodspk.local.value}}.json" />
<style>
body {
padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
diff --git a/doc/examples/originalComponents/services/instances/html.template b/doc/examples/originalComponents/services/instances/html.template
index c0ec21f7..473e22eb 100644
--- a/doc/examples/originalComponents/services/instances/html.template
+++ b/doc/examples/originalComponents/services/instances/html.template
@@ -6,10 +6,10 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">
- <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" />
+ <link rel="alternate" type="application/rdf+xml" title="RDF/XML Version" href="{{lodspk.local.value}}.rdf" />
+ <link rel="alternate" type="text/turtle" title="Turtle Version" href="{{lodspk.local.value}}.ttl" />
+ <link rel="alternate" type="text/plain" title="N-Triples Version" href="{{lodspk.local.value}}.nt" />
+ <link rel="alternate" type="application/json" title="RDFJSON Version" href="{{lodspk.local.value}}.json" />
<link href="{{lodspk.home}}css/bootstrap.min.css" rel="stylesheet" type="text/css" media="screen" />
<style>
body {
diff --git a/doc/examples/originalComponents/services/namedGraphs/html.template b/doc/examples/originalComponents/services/namedGraphs/html.template
index 3deff84e..b1302cc5 100644
--- a/doc/examples/originalComponents/services/namedGraphs/html.template
+++ b/doc/examples/originalComponents/services/namedGraphs/html.template
@@ -6,10 +6,10 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">
- <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" />
+ <link rel="alternate" type="application/rdf+xml" title="RDF/XML Version" href="{{lodspk.local.value}}.rdf" />
+ <link rel="alternate" type="text/turtle" title="Turtle Version" href="{{lodspk.local.value}}.ttl" />
+ <link rel="alternate" type="text/plain" title="N-Triples Version" href="{{lodspk.local.value}}.nt" />
+ <link rel="alternate" type="application/json" title="RDFJSON Version" href="{{lodspk.local.value}}.json" />
<link href="{{lodspk.home}}css/bootstrap.min.css" rel="stylesheet" type="text/css" media="screen" />
<style>
body {
diff --git a/doc/examples/originalComponents/types/rdfs:Resource/html.template b/doc/examples/originalComponents/types/rdfs:Resource/html.template
index 78b80109..49d83f5d 100644
--- a/doc/examples/originalComponents/types/rdfs:Resource/html.template
+++ b/doc/examples/originalComponents/types/rdfs:Resource/html.template
@@ -7,10 +7,10 @@
<meta name="description" content="">
<meta name="author" content="">
<link href="{{lodspk.home}}css/bootstrap.min.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" />
+ <link rel="alternate" type="application/rdf+xml" title="RDF/XML Version" href="{{lodspk.local.value}}.rdf" />
+ <link rel="alternate" type="text/turtle" title="Turtle Version" href="{{lodspk.local.value}}.ttl" />
+ <link rel="alternate" type="text/plain" title="N-Triples Version" href="{{lodspk.local.value}}.nt" />
+ <link rel="alternate" type="application/json" title="RDFJSON Version" href="{{lodspk.local.value}}.json" />
<style>
body {
padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
diff --git a/utils/modules/service-view.inc b/utils/modules/service-view.inc
index 89e4d58a..0c253d02 100644
--- a/utils/modules/service-view.inc
+++ b/utils/modules/service-view.inc
@@ -6,10 +6,10 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">
- <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" />
+ <link rel="alternate" type="application/rdf+xml" title="RDF/XML Version" href="{{lodspk.local.value}}.rdf" />
+ <link rel="alternate" type="text/turtle" title="Turtle Version" href="{{lodspk.local.value}}.ttl" />
+ <link rel="alternate" type="text/plain" title="N-Triples Version" href="{{lodspk.local.value}}.nt" />
+ <link rel="alternate" type="application/json" title="RDFJSON Version" href="{{lodspk.local.value}}.json" />
<link href="css/bootstrap.min.css" rel="stylesheet" type="text/css" media="screen" />
<style>
body {
diff --git a/utils/modules/type-view.inc b/utils/modules/type-view.inc
index 3cde7289..0ddb4ff5 100644
--- a/utils/modules/type-view.inc
+++ b/utils/modules/type-view.inc
@@ -6,10 +6,10 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">
- <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" />
+ <link rel="alternate" type="application/rdf+xml" title="RDF/XML Version" href="{{lodspk.local.value}}.rdf" />
+ <link rel="alternate" type="text/turtle" title="Turtle Version" href="{{lodspk.local.value}}.ttl" />
+ <link rel="alternate" type="text/plain" title="N-Triples Version" href="{{lodspk.local.value}}.nt" />
+ <link rel="alternate" type="application/json" title="RDFJSON Version" href="{{lodspk.local.value}}.json" />
<link href="{{lodspk.home}}css/bootstrap.min.css" rel="stylesheet" type="text/css" media="screen" />
<style>
body {
--
GitLab