summaryrefslogtreecommitdiffstats
path: root/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Redland.php
diff options
context:
space:
mode:
Diffstat (limited to 'core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Redland.php')
-rw-r--r--core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Redland.php17
1 files changed, 8 insertions, 9 deletions
diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Redland.php b/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Redland.php
index c21c02d..bdeb5a2 100644
--- a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Redland.php
+++ b/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Redland.php
@@ -5,7 +5,7 @@
*
* LICENSE
*
- * Copyright (c) 2009-2012 Nicholas J Humfrey. All rights reserved.
+ * Copyright (c) 2009-2013 Nicholas J Humfrey. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@@ -31,16 +31,15 @@
* POSSIBILITY OF SUCH DAMAGE.
*
* @package EasyRdf
- * @copyright Copyright (c) 2009-2012 Nicholas J Humfrey
+ * @copyright Copyright (c) 2009-2013 Nicholas J Humfrey
* @license http://www.opensource.org/licenses/bsd-license.php
- * @version $Id$
*/
/**
* Class to parse RDF using Redland (librdf) C library.
*
* @package EasyRdf
- * @copyright Copyright (c) 2009-2012 Nicholas J Humfrey
+ * @copyright Copyright (c) 2009-2013 Nicholas J Humfrey
* @license http://www.opensource.org/licenses/bsd-license.php
*/
class EasyRdf_Parser_Redland extends EasyRdf_Parser
@@ -121,7 +120,7 @@ class EasyRdf_Parser_Redland extends EasyRdf_Parser
* Convert a node into an associate array
* @ignore
*/
- protected function nodeToArray($node)
+ protected function nodeToRdfPhp($node)
{
$object = array();
$object['type'] = EasyRdf_Parser_Redland::nodeTypeString($node);
@@ -211,8 +210,8 @@ class EasyRdf_Parser_Redland extends EasyRdf_Parser
$stream = librdf_parser_parse_string_as_stream($parser, $data, $rdfUri);
if (!$stream) {
- throw new EasyRdf_Exception(
- "Failed to parse RDF stream for: $rdfUri"
+ throw new EasyRdf_Parser_Exception(
+ "Failed to parse RDF stream"
);
}
@@ -225,7 +224,7 @@ class EasyRdf_Parser_Redland extends EasyRdf_Parser
$predicate = EasyRdf_Parser_Redland::nodeUriString(
librdf_statement_get_predicate($statement)
);
- $object = EasyRdf_Parser_Redland::nodeToArray(
+ $object = EasyRdf_Parser_Redland::nodeToRdfPhp(
librdf_statement_get_object($statement)
);
@@ -235,7 +234,7 @@ class EasyRdf_Parser_Redland extends EasyRdf_Parser
$errorCount = $this->parserErrorCount($parser);
if ($errorCount) {
- throw new EasyRdf_Exception("$errorCount errors while parsing.");
+ throw new EasyRdf_Parser_Exception("$errorCount errors while parsing.");
}
librdf_free_uri($rdfUri);