Updated person name parser for updated result object.

Author: fabiankessler

src/org/nameapi/client/services/parser/ParsingStatus.php

@@ -2,49 +2,19 @@
 
 namespace org\nameapi\client\services\parser\personnameparser;
 
-use org\nameapi\client\services\parser\ParsingStatus;
-
-require_once(__DIR__.'/../ParsingStatus.php');
 require_once(__DIR__.'/ParsedPersonMatch.php');
 
 
 class PersonNameParserResult {
 
-    /**
-     * @var ParsingStatus
-     */
-    private $parsingStatus = null;
-
-    /**
-     * @var string $errorMessage
-     */
-    private $errorMessage = null;
-
     /**
      * @var ParsedPersonMatch[] $matches
      */
     private $matches = null;
 
-    public function __construct(ParsingStatus $parsingStatus, $errorMessage, $matches) {
-        $this->parsingStatus = $parsingStatus;
-        $this->errorMessage  = $errorMessage;
-        $this->matches       = $matches;
-    }
-
-    /**
-     * Tells whether parsing was successful or not.
-     * @return ParsingStatus
-     */
-    public function getParsingStatus() {
-        return $this->parsingStatus;
-    }
-
-    /**
-     * Returns a string error message if getParsingStatus() is FAILURE, and null otherwise.
-     * @return string
-     */
-    public function getErrorMessage() {
-        return $this->errorMessage;
+    public function __construct($matches) {
+        if (sizeof($matches)==0) throw new \Exception("At least one match is required!");
+        $this->matches = $matches;
     }
 
     /**
@@ -56,11 +26,10 @@ public function getMatches() {
     }
 
     /**
-     * Returns the best match, or null if none.
+     * Returns the best match.
      * @return ParsedPersonMatch
      */
     public function getBestMatch() {
-        if (!$this->matches) return null;
         return $this->matches[0];
     }
 

src/org/nameapi/client/services/parser/personnameparser/PersonNameParserResult.php

@@ -6,7 +6,6 @@
 use org\nameapi\ontology\input\entities\person\NaturalInputPerson;
 use org\nameapi\ontology\input\entities\person\PersonType;
 
-use org\nameapi\client\services\parser\ParsingStatus;
 use org\nameapi\client\services\parser\OutputTermType;
 use org\nameapi\client\services\parser\Term;
 use org\nameapi\client\services\parser\OutputPersonName;
@@ -43,26 +42,21 @@ public function __construct(Context $context) {
     public function parse(NaturalInputPerson $person) {
         $parameters = new wsdl\ParseArguments($this->context, $person);
         $result = $this->soapPersonNameParser->parse($parameters);
-        $parsingStatus = new ParsingStatus($result->parsingStatus);
-        $errorMessage = ((string)$parsingStatus==='FAILURE') ? $result->errorMessage : null;
-        $matches = null;
-        if ($parsingStatus->isSuccess()) {
-            $matches = array(); //ParsedPersonMatch
-            foreach ($result->parsedPersonMatches as $match) {
-                $names = array();
-                foreach ($match->parsedPerson->names as $name) {
-                    $terms = array();
-                    foreach ($name->terms as $term) {
-                        array_push($terms, new Term($term->string, new OutputTermType($term->termType)));
-                    }
-                    array_push($names, new OutputPersonName($terms));
+        $matches = array(); //ParsedPersonMatch
+        foreach ($result->parsedPersonMatches as $match) {
+            $names = array();
+            foreach ($match->parsedPerson->names as $name) {
+                $terms = array();
+                foreach ($name->terms as $term) {
+                    array_push($terms, new Term($term->string, new OutputTermType($term->termType)));
                 }
-                $parsedPerson = new ParsedPerson(new PersonType($match->parsedPerson->personType), $names);
-                $parsedPersonMatch = new ParsedPersonMatch($parsedPerson, $match->likeliness, $match->confidence);
-                array_push($matches, $parsedPersonMatch);
+                array_push($names, new OutputPersonName($terms));
             }
+            $parsedPerson = new ParsedPerson(new PersonType($match->parsedPerson->personType), $names);
+            $parsedPersonMatch = new ParsedPersonMatch($parsedPerson, $match->likeliness, $match->confidence);
+            array_push($matches, $parsedPersonMatch);
         }
-        return new PersonNameParserResult($parsingStatus, $errorMessage, $matches);
+        return new PersonNameParserResult($matches);
     }
 
 }

src/org/nameapi/client/services/parser/personnameparser/PersonNameParserService.php

@@ -18,7 +18,10 @@ public function testParse() {
                 ->build())
             ->build();
         $parseResult = $personNameParser->parse($inputPerson);
-        $this->assertEquals('SUCCESS', (string)$parseResult->getParsingStatus());
+        $bestMatch = $parseResult->getBestMatch();
+        $name = $bestMatch->getParsedPerson()->getFirstName();
+        $this->assertEquals('John', $name->getFirst('GIVENNAME')->getString());
+        $this->assertEquals('Doe',  $name->getFirst('SURNAME')->getString());
     }
 
 }