From c91d36c54680170dd297cbc8cd3e69188e212ec7 Mon Sep 17 00:00:00 2001
From: alvaro <alvaro@alia.(none)>
Date: Mon, 5 Mar 2012 23:36:37 -0800
Subject: [PATCH] Forcing that SPARQL queries must end with .query extension
---
classes/Utils.php | 46 ++++++++++++++++++++++++----------------------
1 file changed, 24 insertions(+), 22 deletions(-)
diff --git a/classes/Utils.php b/classes/Utils.php
index 809c9963..7bb2c0d9 100644
--- a/classes/Utils.php
+++ b/classes/Utils.php
@@ -294,29 +294,31 @@ class Utils{
$subDirs[]=$modelFile;
}
}else{
- $e = null;
- if(!isset($endpoints[$strippedModelDir])){
- trigger_error("Creating endpoint for $strippedModelDir", E_USER_NOTICE);
- if(!isset($conf['endpoint'][$strippedModelDir])){
- trigger_error("Couldn't find $strippedModelDir as a list of available endpoints. Will continue using local", E_USER_WARNING);
- $e = $endpoints['local'];
- }else{
- $endpoints[$strippedModelDir] = new Endpoint($conf['endpoint'][$strippedModelDir], $conf['endpoint']['config']);
- $e = $endpoints[$strippedModelDir];
- }
- }else{
- $e = $endpoints[$strippedModelDir];
- }
- if($modelDir != $lodspk['type']){
- if(!isset($r[$strippedModelDir]) ){
- $r[$strippedModelDir] = array();
- $f[$strippedModelDir] = array();
- }
- Utils::queryFile($modelFile, $e, $r[$strippedModelDir], $f);
- }else{
- Utils::queryFile($modelFile, $e, $r, $f);
+ if(preg_match('/\.query$/', $modelFile)){
+ $e = null;
+ if(!isset($endpoints[$strippedModelDir])){
+ trigger_error("Creating endpoint for $strippedModelDir", E_USER_NOTICE);
+ if(!isset($conf['endpoint'][$strippedModelDir])){
+ trigger_error("Couldn't find $strippedModelDir as a list of available endpoints. Will continue using local", E_USER_WARNING);
+ $e = $endpoints['local'];
+ }else{
+ $endpoints[$strippedModelDir] = new Endpoint($conf['endpoint'][$strippedModelDir], $conf['endpoint']['config']);
+ $e = $endpoints[$strippedModelDir];
+ }
+ }else{
+ $e = $endpoints[$strippedModelDir];
+ }
+ if($modelDir != $lodspk['type']){
+ if(!isset($r[$strippedModelDir]) ){
+ $r[$strippedModelDir] = array();
+ $f[$strippedModelDir] = array();
+ }
+ Utils::queryFile($modelFile, $e, $r[$strippedModelDir], $f);
+ }else{
+ Utils::queryFile($modelFile, $e, $r, $f);
+ }
}
- }
+ }
}
}
closedir($handle);
--
GitLab