summaryrefslogtreecommitdiffstats
path: root/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/RdfXml.php
diff options
context:
space:
mode:
Diffstat (limited to 'core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/RdfXml.php')
-rw-r--r--core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/RdfXml.php19
1 files changed, 10 insertions, 9 deletions
diff --git a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/RdfXml.php b/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/RdfXml.php
index 06e27cf..b7d59fe 100644
--- a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/RdfXml.php
+++ b/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/RdfXml.php
@@ -5,7 +5,7 @@
*
* LICENSE
*
- * Copyright (c) 2010-2011 Nicholas J Humfrey
+ * Copyright (c) 2010-2013 Nicholas J Humfrey
* Copyright (c) 2004-2010 Benjamin Nowack (based on ARC2_RDFXMLParser.php)
*
* Redistribution and use in source and binary forms, with or without
@@ -32,9 +32,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*
* @package EasyRdf
- * @copyright Copyright (c) 2010 Nicholas J Humfrey
+ * @copyright Copyright (c) 2010-2013 Nicholas J Humfrey
* @license http://www.opensource.org/licenses/bsd-license.php
- * @version $Id$
*/
@@ -42,7 +41,7 @@
* A pure-php class to parse RDF/XML.
*
* @package EasyRdf
- * @copyright Copyright (c) 2009-2010 Nicholas J Humfrey
+ * @copyright Copyright (c) 2009-2013 Nicholas J Humfrey
* Copyright (c) 2004-2010 Benjamin Nowack (based on ARC2_RDFXMLParser.php)
* @license http://www.opensource.org/licenses/bsd-license.php
*/
@@ -217,7 +216,7 @@ class EasyRdf_Parser_RdfXml extends EasyRdf_Parser
case 6:
return $this->startState6($t, $a);
default:
- throw new EasyRdf_Exception(
+ throw new EasyRdf_Parser_Exception(
'startElementHandler() called at state ' . $this->state . ' in '.$t
);
}
@@ -240,7 +239,7 @@ class EasyRdf_Parser_RdfXml extends EasyRdf_Parser
case 6:
return $this->endState6($t);
default:
- throw new EasyRdf_Exception(
+ throw new EasyRdf_Parser_Exception(
'endElementHandler() called at state ' . $this->state . ' in '.$t
);
}
@@ -794,9 +793,11 @@ class EasyRdf_Parser_RdfXml extends EasyRdf_Parser
/* parse */
if (!xml_parse($this->xmlParser, $data, false)) {
- throw new EasyRdf_Exception(
- 'XML error: "' . xml_error_string(xml_get_error_code($this->xmlParser)) .
- '" at line ' . xml_get_current_line_number($this->xmlParser)
+ $message = xml_error_string(xml_get_error_code($this->xmlParser));
+ throw new EasyRdf_Parser_Exception(
+ 'XML error: "' . $message . '"',
+ xml_get_current_line_number($this->xmlParser),
+ xml_get_current_column_number($this->xmlParser)
);
}