Rename 'r' variable to 'models'

5def2d5f · Alvaro Graves · 414a7063 · 5def2d5f · 5def2d5f · 5def2d5f
Commit 5def2d5f authored 13 years ago by Alvaro Graves
--- 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); 	
 	}

--- 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

--- 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>

--- 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>

--- 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>

--- 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>

--- 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>

--- 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>