diff --git a/classes/Utils.php b/classes/Utils.php
index 2cd85bc6f90a57f67ced7b817d380df0d4b4a452..3baefa1a0b392797f39d7b73c008afa85968a362 100644
--- a/classes/Utils.php
+++ b/classes/Utils.php
@@ -329,9 +329,9 @@ class Utils{
$base = $baseObj;
}
$r2 = Convert::array_copy($results);
- $r = Convert::array_to_object($r2);
+ $models = Convert::array_to_object($r2);
$f = Convert::array_to_object($first);
- $vars = compact('uri', 'base', 'r', 'f');
+ $vars = compact('uri', 'base', 'models', 'f');
$fnc = Haanga::compile(file_get_contents($modelFile));
$query = $fnc($vars, TRUE);
@@ -495,10 +495,10 @@ class Utils{
'template_dir' => $base['view']['directory'],
'cache_dir' => $conf['home'].'cache/',
));
- $r = $data;
+ $models = $data;
$first = $base['first'];
unset($base['first']);
- $vars = compact('uri','base', 'r', 'first');
+ $vars = compact('uri','base', 'models', 'first');
if($conf['debug']){
var_dump($vars);
}
diff --git a/utils/modules/create-class.sh b/utils/modules/create-class.sh
index a39ae2664e46b909042ac444880ecc8580794eca..c6af75b985d729afadae0480b3918bd3fd9c6145 100755
--- a/utils/modules/create-class.sh
+++ b/utils/modules/create-class.sh
@@ -35,7 +35,7 @@ viewHtml=$(cat <<VIEW
<div>
<h2>Information from {{base.this.curie}}</h2>
<table>
- {% for row in r.main %}
+ {% for row in models.main %}
{% if row.s1%}
<tr>
@@ -55,7 +55,7 @@ viewHtml=$(cat <<VIEW
<br/><br/>
<h2>Information pointing to {{base.this.curie}}</h2>
<table>
- {% for row in r.main %}
+ {% for row in models.main %}
{% if row.s2%}
<tr>
<td><a href='{{row.s2.value}}'>{{row.s2.curie}}</a></td>
@@ -76,7 +76,7 @@ DESCRIBE ?resource WHERE {
QUERY)
viewRdf=$(cat <<VIEW
-{{r.main|safe}}
+{{models.main|safe}}
VIEW)
modelTtl=$modelRdf
diff --git a/utils/modules/create-service.sh b/utils/modules/create-service.sh
index 29ff6e9c413de8660e205017a1b227b00497fbf1..616cd52d42343ca6470e115d6af79d37b0024da1 100755
--- a/utils/modules/create-service.sh
+++ b/utils/modules/create-service.sh
@@ -28,7 +28,7 @@ viewHtml=$(cat <<VIEW
<body>
<h1>Classes available</h1>
<ul>
- {% for row in r.main %}
+ {% for row in models.main %}
<li><a href="{{base.baseUrl}}special/instances/{{ row.resource.curie }}">{{row.resource.curie}}</a></li>
{% endfor %}
</ul>
diff --git a/utils/modules/create-uri.sh b/utils/modules/create-uri.sh
index 8562599817abccfb3d50a3ac03c6f37c99066946..be85df92ac0dc8f76638fbdd9aaffa32d76843f0 100755
--- a/utils/modules/create-uri.sh
+++ b/utils/modules/create-uri.sh
@@ -35,7 +35,7 @@ viewHtml=$(cat <<VIEW
<div>
<h2>Information from {{base.this.curie}}</h2>
<table>
- {% for row in r.main %}
+ {% for row in models.main %}
{% if row.s1%}
<tr>
@@ -55,7 +55,7 @@ viewHtml=$(cat <<VIEW
<br/><br/>
<h2>Information pointing to {{base.this.curie}}</h2>
<table>
- {% for row in r.main %}
+ {% for row in models.main %}
{% if row.s2%}
<tr>
<td><a href='{{row.s2.value}}'>{{row.s2.curie}}</a></td>
diff --git a/views/class.rdfs:Resource/html.template b/views/class.rdfs:Resource/html.template
index 2cd8b212289059e162fb8c58b6c688b7739f9368..8567fdd6b371584da901614261bc6c6891a01c13 100644
--- a/views/class.rdfs:Resource/html.template
+++ b/views/class.rdfs:Resource/html.template
@@ -16,7 +16,7 @@
<div>
<h2>Information from {{base.this.curie}}</h2>
<table>
- {% for row in r.main %}
+ {% for row in models.main %}
{% if row.s1%}
<tr>
@@ -36,7 +36,7 @@
<br/><br/>
<h2>Information pointing to {{base.this.curie}}</h2>
<table>
- {% for row in r.main %}
+ {% for row in models.main %}
{% if row.s2%}
<tr>
<td><a href='{{row.s2.value}}'>{{row.s2.curie}}</a></td>
diff --git a/views/service.classes/html.template b/views/service.classes/html.template
index bdda75d1c01e1d837ca57dbb8ea2cdd2b9c84595..779c41b69c0d9f5ae394f5f874d1899a3e4d7d4d 100644
--- a/views/service.classes/html.template
+++ b/views/service.classes/html.template
@@ -11,7 +11,7 @@
<h1>Classes available</h1>
{%include "../header.inc"%}
<ul>
- {% for row in r.main %}
+ {% for row in models.main %}
<li><a href="{{base.baseUrl}}instances/{{ row.resource.curie }}">{{row.resource.curie}}</a></li>
{% endfor %}
</ul>
diff --git a/views/service.instances/html.template b/views/service.instances/html.template
index 6f0a319a3b59c753cc6ec2ebb2a9943011ce7e70..74bebad2fd73d190069a0f54602f1694e09d46b3 100644
--- a/views/service.instances/html.template
+++ b/views/service.instances/html.template
@@ -11,7 +11,7 @@
<h1>Instances of class {{base.args.arg0}}</h1>
{%include "../header.inc"%}
<ul>
- {% for row in r.main %}
+ {% for row in models.main %}
<li><a href="{{ row.resource.value }}">{{row.resource.curie}}</a></li>
{% endfor %}
</ul>
diff --git a/views/service.namedGraphs/html.template b/views/service.namedGraphs/html.template
index 70eaa0b4c3d3a1b03ca12fa1efd09855ca88c7b6..ee2c29999c5d9a94305db2a44597fc2513df1542 100644
--- a/views/service.namedGraphs/html.template
+++ b/views/service.namedGraphs/html.template
@@ -11,7 +11,7 @@
<h1>Named graphs available</h1>
{%include "../header.inc"%}
<ul>
- {% for row in r.main %}
+ {% for row in models.main %}
<li>{{row.g.value}}</li>
{% endfor %}
</ul>