Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib-php / TokenWord.php

diff --git a/lib-php/TokenWord.php b/lib-php/TokenWord.php
index b9e28d91db7dde65cc235affd505b7b54081ce95..59456e35aaef3d309b8d2da23aca21df2d546b9f 100644 (file)
--- a/lib-php/TokenWord.php
+++ b/lib-php/TokenWord.php
@@ -13,15 +13,12 @@ class Word
     private $iSearchNameCount;
     /// Number of terms in the word.
     private $iTermCount;
     private $iSearchNameCount;
     /// Number of terms in the word.
     private $iTermCount;

-    /// Match score.
-    private $iMatchScore;

 
 

-    public function __construct($iId, $iSearchNameCount, $iTermCount, $iMatchScore = 1)
+    public function __construct($iId, $iSearchNameCount, $iTermCount)

     {
         $this->iId = $iId;
         $this->iSearchNameCount = $iSearchNameCount;
         $this->iTermCount = $iTermCount;
     {
         $this->iId = $iId;
         $this->iSearchNameCount = $iSearchNameCount;
         $this->iTermCount = $iTermCount;

-        $this->iMatchScore = $iMatchScore;

     }
 
     public function getId()
     }
 
     public function getId()


@@ -66,13 +63,13 @@ class Word
             if ($this->iTermCount > 1
                 && ($oPosition->isPhrase('') || !$oPosition->isFirstPhrase())
             ) {
             if ($this->iTermCount > 1
                 && ($oPosition->isPhrase('') || !$oPosition->isFirstPhrase())
             ) {

-                $oNewSearch = $oSearch->clone($this->iMatchScore);
+                $oNewSearch = $oSearch->clone(1);

                 $oNewSearch->addAddressToken($this->iId);
 
                 return array($oNewSearch);
             }
         } elseif (!$oSearch->hasName(true)) {
                 $oNewSearch->addAddressToken($this->iId);
 
                 return array($oNewSearch);
             }
         } elseif (!$oSearch->hasName(true)) {

-            $oNewSearch = $oSearch->clone($this->iMatchScore);
+            $oNewSearch = $oSearch->clone(1);

             $oNewSearch->addNameToken(
                 $this->iId,
                 CONST_Search_NameOnlySearchFrequencyThreshold
             $oNewSearch->addNameToken(
                 $this->iId,
                 CONST_Search_NameOnlySearchFrequencyThreshold


@@ -93,8 +90,7 @@ class Word
                 'Type' => 'word',
                 'Info' => array(
                            'count' => $this->iSearchNameCount,
                 'Type' => 'word',
                 'Info' => array(
                            'count' => $this->iSearchNameCount,

-                           'terms' => $this->iTermCount,
-                           'score' => $this->iMatchScore
+                           'terms' => $this->iTermCount

                           )
                );
     }
                           )
                );
     }