diff --git a/classes/Convert.php b/classes/Convert.php index 1b333735978c90a2e2ce5f6c667ca977cb569311..2656f18dea890efeae5ed99bf41e1102c5a27b55 100644 --- a/classes/Convert.php +++ b/classes/Convert.php @@ -1,20 +1,22 @@ <? -//Taken from http://www.php.net/manual/en/language.types.object.php#102735 +//Based (but corrected) from http://www.php.net/manual/en/language.types.object.php#102735 final class Convert { # Convert a stdClass to an Array. static public function object_to_array(stdClass $Class){ # Typecast to (array) automatically converts stdClass -> array. - $Class = (array)$Class; + $newClass = array(); # Iterate through the former properties looking for any stdClass properties. # Recursively apply (array). foreach($Class as $key => $value){ if(is_object($value)&&get_class($value)==='stdClass'){ - $Class[$key] = self::object_to_array($value); + $newClass[$key] = self::object_to_array($value); + }else{ + $newClass[$key] = $value; } } - return $Class; + return $newClass; } # Convert an Array to stdClass. diff --git a/classes/Utils.php b/classes/Utils.php index 23a158a05ecad963515689d633e1ad269a22e2c1..c57a667558e33f3fb174dbd799d02bc3e8f55ee8 100644 --- a/classes/Utils.php +++ b/classes/Utils.php @@ -138,26 +138,26 @@ class Utils{ return $ct; } - + private static function serializeRdf($data, $extension){ global $conf; - require('lib/arc2/ARC2.php'); - $parser = ARC2::getRDFParser(); - $parser->parse($conf['basedir'], $data); - $triples = $parser->getTriples(); - $ser; - switch ($extension){ - case 'ttl': - $ser = ARC2::getTurtleSerializer(); - break; - case 'nt': - $ser = ARC2::getNTriplesSerializer(); - break; - case 'rdf': - $ser = ARC2::getRDFXMLSerializer(); - break; - } - $doc = $ser->getSerializedTriples($triples); + require('lib/arc2/ARC2.php'); + $parser = ARC2::getRDFParser(); + $parser->parse($conf['basedir'], $data); + $triples = $parser->getTriples(); + $ser; + switch ($extension){ + case 'ttl': + $ser = ARC2::getTurtleSerializer(); + break; + case 'nt': + $ser = ARC2::getNTriplesSerializer(); + break; + case 'rdf': + $ser = ARC2::getRDFXMLSerializer(); + break; + } + $doc = $ser->getSerializedTriples($triples); return $doc; } @@ -165,7 +165,7 @@ class Utils{ global $conf; $contentType = $base['this']['contentType']; $extension = Utils::getExtension($contentType); - + header('Content-Type: '.$contentType); if(!is_object($data)){ $data = Utils::serializeRdf($data, $extension); @@ -267,7 +267,7 @@ class Utils{ $baseObj = Convert::array_to_object($base); $base = $baseObj; } - $r2 = Convert::array_copy($results); + $r2 = Convert::array_copy($results); $r = Convert::array_to_object($r2); $vars = compact('uri', 'base', 'r'); $fnc = Haanga::compile(file_get_contents($modelFile)); @@ -317,7 +317,7 @@ class Utils{ } require_once('lib/Haanga/lib/Haanga.php'); Haanga::configure(array( - 'template_dir' => $base['view']['directory'], + 'template_dir' => $conf['home'].$base['view']['directory'], 'cache_dir' => $conf['home'].'cache/', )); if(is_object($data)){ diff --git a/index.php b/index.php index 409db8bd96123b0529d92eb4160798627bf77433..9898a8ecc0c2b9667b55f16980afe84e9887fac7 100755 --- a/index.php +++ b/index.php @@ -1,6 +1,6 @@ <? -//error_reporting(E_ERROR); +error_reporting(E_ERROR); if(!file_exists('settings.inc.php')){ echo 'Need to configure lodspeakr first. Please run "install.sh" first'; diff --git a/utils/changeNamespaceSparql.php b/utils/changeNamespaceSparql.php index 463549b71cdb88d2248da884f640c8106a5d4139..419f74c576084072fd57623edfbf6be48117e822 100644 --- a/utils/changeNamespaceSparql.php +++ b/utils/changeNamespaceSparql.php @@ -28,7 +28,7 @@ Since it is very simple, it may be prone to errors, but so far it is usable. -/* +*/ //The remote namespace $remote = 'http://originalNamespace.com/data/'; @@ -43,6 +43,7 @@ $newget = array(); foreach($_GET as $k => $v){ $newget[$k] = preg_replace("|$local|", $remote, $v); } +$url .= '?'; $r = file_get_contents($url.http_build_query($newget));