Skip to content
Snippets Groups Projects
Commit 56fd61f8 authored by Stein Magne Bjorklund's avatar Stein Magne Bjorklund
Browse files

Autoload Haanga library

parent 9ac99112
No related branches found
No related tags found
No related merge requests found
This commit is part of merge request !16. Comments created here will be created in the context of that merge request.
...@@ -492,7 +492,6 @@ class Utils ...@@ -492,7 +492,6 @@ class Utils
$data = array(); $data = array();
$strippedModelFile = str_replace('endpoint.', '', str_replace('.query', '', $modelFile)); $strippedModelFile = str_replace('endpoint.', '', str_replace('.query', '', $modelFile));
if (!is_dir($modelFile)) { if (!is_dir($modelFile)) {
require_once __DIR__ . '/../vendor/ubbdst/haanga/lib/Haanga.php';
Haanga::configure(array( Haanga::configure(array(
'cache_dir' => $conf['home'] . 'cache/', 'cache_dir' => $conf['home'] . 'cache/',
'autoescape' => false, 'autoescape' => false,
...@@ -708,7 +707,6 @@ class Utils ...@@ -708,7 +707,6 @@ class Utils
if (isset($lodspk['queryTimes'])) { if (isset($lodspk['queryTimes'])) {
$lodspk['queryTimes'] = Convert::array_to_object($lodspk['queryTimes']); $lodspk['queryTimes'] = Convert::array_to_object($lodspk['queryTimes']);
} }
require_once __DIR__ . '/../vendor/ubbdst/haanga/lib/Haanga.php';
$viewAux = explode("/", $view); $viewAux = explode("/", $view);
$viewFile = array_pop($viewAux); $viewFile = array_pop($viewAux);
//$viewFile = $view; //$viewFile = $view;
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
namespace uib\ub\loadspeakr\modules; namespace uib\ub\loadspeakr\modules;
use Haanga;
use uib\ub\loadspeakr\Convert; use uib\ub\loadspeakr\Convert;
use uib\ub\loadspeakr\HTTPStatus; use uib\ub\loadspeakr\HTTPStatus;
use uib\ub\loadspeakr\Logging; use uib\ub\loadspeakr\Logging;
...@@ -46,7 +47,6 @@ class sparqlFilterModule extends abstractModule ...@@ -46,7 +47,6 @@ class sparqlFilterModule extends abstractModule
$uri = $res; $uri = $res;
$queries = $this->getQueries(); $queries = $this->getQueries();
$e = $endpoints['local']; $e = $endpoints['local'];
require_once __DIR__ . '/../../vendor/ubbdst/haanga/lib/Haanga.php';
Haanga::configure(array( Haanga::configure(array(
'cache_dir' => $conf['home'] . 'cache/', 'cache_dir' => $conf['home'] . 'cache/',
'autoescape' => false, 'autoescape' => false,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment