From fb4d8a8f0c5bdf0e9444861848cc2cee9103177a Mon Sep 17 00:00:00 2001
From: Stein Magne Bjorklund <steinmb@smbjorklund.com>
Date: Fri, 17 Sep 2021 14:45:58 +0200
Subject: [PATCH] Autoload MetaDb.php
---
classes/modules/redirectModule.php | 2 +-
classes/modules/sparqlFilterModule.php | 1 -
classes/modules/typeModule.php | 1 -
classes/modules/uriModule.php | 2 +-
4 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/classes/modules/redirectModule.php b/classes/modules/redirectModule.php
index a72d6672..c0175dbb 100644
--- a/classes/modules/redirectModule.php
+++ b/classes/modules/redirectModule.php
@@ -1,6 +1,7 @@
<?php declare(strict_types=1);
namespace uib\ub\loadspeakr\modules;
+
use uib\ub\loadspeakr\MetaDb;
require_once('abstractModule.php');
@@ -16,7 +17,6 @@ class RedirectModule extends abstractModule
global $endpoints;
global $lodspk;
- require_once($conf['home'] . 'classes/MetaDb.php');
$metaDb = new MetaDb($conf['metadata']['db']['location']);
return true;
diff --git a/classes/modules/sparqlFilterModule.php b/classes/modules/sparqlFilterModule.php
index 657cca08..281188a7 100644
--- a/classes/modules/sparqlFilterModule.php
+++ b/classes/modules/sparqlFilterModule.php
@@ -25,7 +25,6 @@ class sparqlFilterModule extends abstractModule
global $results;
global $firstResults;
- require_once($conf['home'] . 'classes/MetaDb.php');
$metaDb = new MetaDb($conf['metadata']['db']['location']);
$pair = Queries::getMetadata($localUri, $acceptContentType, $metaDb);
diff --git a/classes/modules/typeModule.php b/classes/modules/typeModule.php
index 5ea51363..cc362a71 100644
--- a/classes/modules/typeModule.php
+++ b/classes/modules/typeModule.php
@@ -22,7 +22,6 @@ class TypeModule extends abstractModule
global $endpoints;
global $lodspk;
- require_once($conf['home'] . 'classes/MetaDb.php');
$metaDb = new MetaDb($conf['metadata']['db']['location']);
$pair = Queries::getMetadata($localUri, $acceptContentType, $metaDb);
diff --git a/classes/modules/uriModule.php b/classes/modules/uriModule.php
index e1f21c68..2508d7d9 100644
--- a/classes/modules/uriModule.php
+++ b/classes/modules/uriModule.php
@@ -25,7 +25,7 @@ class UriModule extends abstractModule
if (!empty($conf['disableComponents']) && $conf['disableComponents'] == true) {
return false;
}
- require_once('classes/MetaDb.php');
+
$metaDb = new MetaDb($conf['metadata']['db']['location']);
#LocalURI as is for looking up existing metadata. Fix fails if first paramater is changed to stripped localUri.
$pair = Queries::getMetadata($localUri, $acceptContentType, $metaDb);
--
GitLab