From 7b95edc085f3c0d5cead241300dee9919363724c Mon Sep 17 00:00:00 2001
From: Alvaro Graves <alvaro@graves.cl>
Date: Mon, 30 Jan 2012 04:35:57 -0800
Subject: [PATCH] Fixing "first" values for services
Removing no html queries from models/type.rdfs:Resource/
---
classes/modules/serviceModule.php | 8 +--
.../json.queries/main.query | 3 --
.../type.rdfs:Resource/nt.queries/main.query | 3 --
.../type.rdfs:Resource/rdf.queries/main.query | 3 --
.../type.rdfs:Resource/ttl.queries/main.query | 3 --
views/type.rdfs:Resource/json.template | 1 -
views/type.rdfs:Resource/nt.template | 1 -
views/type.rdfs:Resource/rdf.template | 1 -
views/type.rdfs:Resource/ttl.template | 1 -
views/uri.local:alvaro/html.template | 50 -------------------
10 files changed, 5 insertions(+), 69 deletions(-)
delete mode 100644 models/type.rdfs:Resource/json.queries/main.query
delete mode 100644 models/type.rdfs:Resource/nt.queries/main.query
delete mode 100644 models/type.rdfs:Resource/rdf.queries/main.query
delete mode 100644 models/type.rdfs:Resource/ttl.queries/main.query
delete mode 100644 views/type.rdfs:Resource/json.template
delete mode 100644 views/type.rdfs:Resource/nt.template
delete mode 100644 views/type.rdfs:Resource/rdf.template
delete mode 100644 views/type.rdfs:Resource/ttl.template
delete mode 100644 views/uri.local:alvaro/html.template
diff --git a/classes/modules/serviceModule.php b/classes/modules/serviceModule.php
index ea798b93..c862b27f 100644
--- a/classes/modules/serviceModule.php
+++ b/classes/modules/serviceModule.php
@@ -35,6 +35,7 @@ public function execute($service){
global $acceptContentType;
global $endpoints;
global $lodspk;
+ global $first;
$context = array();
$context['contentType'] = $acceptContentType;
$context['endpoints'] = $endpoints;
@@ -93,12 +94,13 @@ public function execute($service){
$lodspk['transform_select_query'] = true;
}
- chdir($conf['model']['directory']);
- $first = array();
+ chdir($conf['home'].$conf['model']['directory']);
+
Utils::queryFile($modelFile, $endpoints['local'], $results, $first);
- chdir($conf['home']);
$results = Utils::internalize($results);
+ $lodspk['first'] = Utils::getFirsts($results);
+ chdir($conf['home']);
if(is_array($results)){
$results = Convert::array_to_object($results);
}
diff --git a/models/type.rdfs:Resource/json.queries/main.query b/models/type.rdfs:Resource/json.queries/main.query
deleted file mode 100644
index fbb7078a..00000000
--- a/models/type.rdfs:Resource/json.queries/main.query
+++ /dev/null
@@ -1,3 +0,0 @@
-DESCRIBE ?resource WHERE {
- [] a ?resource .
-}
diff --git a/models/type.rdfs:Resource/nt.queries/main.query b/models/type.rdfs:Resource/nt.queries/main.query
deleted file mode 100644
index fbb7078a..00000000
--- a/models/type.rdfs:Resource/nt.queries/main.query
+++ /dev/null
@@ -1,3 +0,0 @@
-DESCRIBE ?resource WHERE {
- [] a ?resource .
-}
diff --git a/models/type.rdfs:Resource/rdf.queries/main.query b/models/type.rdfs:Resource/rdf.queries/main.query
deleted file mode 100644
index fbb7078a..00000000
--- a/models/type.rdfs:Resource/rdf.queries/main.query
+++ /dev/null
@@ -1,3 +0,0 @@
-DESCRIBE ?resource WHERE {
- [] a ?resource .
-}
diff --git a/models/type.rdfs:Resource/ttl.queries/main.query b/models/type.rdfs:Resource/ttl.queries/main.query
deleted file mode 100644
index fbb7078a..00000000
--- a/models/type.rdfs:Resource/ttl.queries/main.query
+++ /dev/null
@@ -1,3 +0,0 @@
-DESCRIBE ?resource WHERE {
- [] a ?resource .
-}
diff --git a/views/type.rdfs:Resource/json.template b/views/type.rdfs:Resource/json.template
deleted file mode 100644
index 39e1ca7c..00000000
--- a/views/type.rdfs:Resource/json.template
+++ /dev/null
@@ -1 +0,0 @@
-{{models.main|safe}}
diff --git a/views/type.rdfs:Resource/nt.template b/views/type.rdfs:Resource/nt.template
deleted file mode 100644
index 39e1ca7c..00000000
--- a/views/type.rdfs:Resource/nt.template
+++ /dev/null
@@ -1 +0,0 @@
-{{models.main|safe}}
diff --git a/views/type.rdfs:Resource/rdf.template b/views/type.rdfs:Resource/rdf.template
deleted file mode 100644
index 39e1ca7c..00000000
--- a/views/type.rdfs:Resource/rdf.template
+++ /dev/null
@@ -1 +0,0 @@
-{{models.main|safe}}
diff --git a/views/type.rdfs:Resource/ttl.template b/views/type.rdfs:Resource/ttl.template
deleted file mode 100644
index 39e1ca7c..00000000
--- a/views/type.rdfs:Resource/ttl.template
+++ /dev/null
@@ -1 +0,0 @@
-{{models.main|safe}}
diff --git a/views/uri.local:alvaro/html.template b/views/uri.local:alvaro/html.template
deleted file mode 100644
index 367b355a..00000000
--- a/views/uri.local:alvaro/html.template
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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}}"
- {%endfor%}version="XHTML+RDFa 1.0" xml:lang="en">
- <head>
- <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="{{lodspk.this.value}}">
- <h1>Page about <a href='{{lodspk.this.value}}'>{{lodspk.this.curie}}</a></h1>
- <div>
- <h2>Information from {{lodspk.this.curie}}</h2>
- <table>
- {% for row in models.main %}
-
- {% if row.s1%}
- <tr>
- <td><a href='{{row.s1.value}}'>{{row.s1.curie}}</a></td>
-
- {% if row.p1.uri == 1 %}
- <td><a rel='{{row.s1.curie}}' href='{{row.p1.value}}'>{{row.p1.curie}}</a></td>
- {% else %}
- <td><span property='{{row.s1.curie}}'>{{row.p1.value}}</span></td>
- {% endif %}
-
- </tr>
- {% endif %}
- {% endfor %}
- </table>
-
- <br/><br/>
- <h2>Information pointing to {{lodspk.this.curie}}</h2>
- <table>
- {% for row in models.main %}
- {% if row.s2%}
- <tr>
- <td><a href='{{row.s2.value}}'>{{row.s2.curie}}</a></td>
- <td><a rev='[{{row.p2.curie}}]' href='{{row.s2.value}}'>{{row.p2.curie}}</a></td>
- </tr>
- {%endif %}
- {% endfor %}
- </table>
- </div>
- </body>
-</html>
--
GitLab