Rely on exceptions

pear · Mar 25, 2012 · 2d12294 · 2d12294
1 parent 19771c8
commit 2d12294
Showing 1 changed file with 1 addition and 36 deletions.
diff --git a/RDF/Parser.php b/RDF/Parser.php
@@ -598,9 +598,7 @@ function _resolve_id($id, &$buffer)
         $id_buffer = '';
 
         $result = $this->is_valid_id($id);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
+
         if ($result) {
             $id_buffer = "#$id";
         }
@@ -693,9 +691,6 @@ function _report_statement($subject_type, $subject, $predicate, $ordinal,
             $xml_lang,
             $datatype
         );
-        if (PEAR::isError($result)) {
-            return $result;
-        }
 
         if ($bag_id) {
             if ($statements == '') {
@@ -1067,9 +1062,6 @@ function _handle_resource_element($namespace_uri, $local_name, $attributes, $par
             $this->rdf_parser['top']['subject'] = $id_buffer;
         } else if ($node_id) {
             $result = $this->is_valid_id($node_id);
-            if (PEAR::isError($result)) {
-                return $result;
-            }
             $this->rdf_parser['top']['subject_type'] = RDF_SUBJECT_TYPE_BNODE;
             $this->rdf_parser['top']['subject'] = $node_id;
         }
@@ -1251,9 +1243,6 @@ function _handle_property_element(&$namespace_uri, &$local_name, &$attributes)
 
         if ($node_id) {
             $result = $this->is_valid_id($node_id);
-            if (PEAR::isError($result)) {
-                return $result;
-            }
 
             if ($resource) {
                 throw new RDF_Exception('nodeID and resource are mutually exclusive', RDF_ERROR);
@@ -1694,17 +1683,11 @@ function _start_element_handler($parser, $name, $attributes)
         case RDF_IN_RDF:
             $this->rdf_parser['top']['state'] = RDF_IN_DESCRIPTION;
             $result = $this->_handle_resource_element($namespace_uri, $local_name, $attributes, '');
-            if (PEAR::isError($result)) {
-                return $result;
-            }
             break;
         case RDF_IN_DESCRIPTION:
         case RDF_IN_PROPERTY_PARSE_TYPE_RESOURCE:
             $this->rdf_parser['top']['state'] = RDF_IN_PROPERTY_UNKNOWN_OBJECT;
             $result = $this->_handle_property_element($namespace_uri, $local_name, $attributes);
-            if (PEAR::isError($result)) {
-                return $result;
-            }
             break;
         case RDF_IN_PROPERTY_PARSE_TYPE_COLLECTION:
             $this->_handle_collection_element($namespace_uri, $local_name, $attributes);
@@ -1721,9 +1704,6 @@ function _start_element_handler($parser, $name, $attributes)
                 $attributes,
                 $this->rdf_parser['top']['parent']
             );
-            if (PEAR::isError($result)) {
-                return $result;
-            }
             break;
         case RDF_IN_PROPERTY_LITERAL:
             $this->_report_warning('no markup allowed in literals');
@@ -1907,14 +1887,8 @@ function add_statement_to_model(&$user_data, $subject_type, $subject,
         } else {
             $objsub =& RDF_Resource::factory($subject);
         }
-        if (PEAR::isError($objsub)) {
-            return $objsub;
-        }
         // create predicate
         $objpred =& RDF_Resource::factory($predicate);
-        if (PEAR::isError($objpred)) {
-            return $objpred;
-        }
         // create object
         if (($object_type == RDF_OBJECT_TYPE_RESOURCE)
             || ($object_type == RDF_OBJECT_TYPE_BNODE)
@@ -1924,14 +1898,8 @@ function add_statement_to_model(&$user_data, $subject_type, $subject,
             } else {
                 $objobj =& RDF_Resource::factory($object);
             }
-            if (PEAR::isError($objobj)) {
-                return $objobj;
-            }
         } else {
             $objobj =& RDF_Literal::factory($object);
-            if (PEAR::isError($objobj)) {
-                return $objobj;
-            }
             if ($datatype != '') {
                 $objobj->setDatatype($datatype);
             } elseif ($xml_lang != "") {
@@ -1940,9 +1908,6 @@ function add_statement_to_model(&$user_data, $subject_type, $subject,
         }
         // create statement
         $statement =& RDF_Statement::factory($objsub, $objpred, $objobj);
-        if (PEAR::isError($statement)) {
-            return $statement;
-        }
         // add statement to model
         return $this->model->add($statement);
     }