merge marking rare name with adding name token

Only name tokens can be rare, so this should be the same
function.

diff --git a/lib-php/SearchDescription.php b/lib-php/SearchDescription.php
index 01d06725e5250570d80c5b1836902c184a920d43..4d944bfb1ee498835c2d3178b2ea04d2439ab75d 100644 (file)
--- a/lib-php/SearchDescription.php
+++ b/lib-php/SearchDescription.php
@@ -223,11 +223,14 @@ class SearchDescription
      * Add the given full-word token to the list of terms to search for in the
      * name.
      *
      * Add the given full-word token to the list of terms to search for in the
      * name.
      *

-     * @param interger iId  ID of term to add.
+     * @param interger iId    ID of term to add.
+     * @param bool bRareName  True if the term is infrequent enough to not
+     *                        require other constraints for efficient search.

      */
      */

-    public function addNameToken($iId)
+    public function addNameToken($iId, $bRareName)

     {
         $this->aName[$iId] = $iId;
     {
         $this->aName[$iId] = $iId;

+        $this->bRareName = $bRareName;

     }
 
     /**
     }
 
     /**


@@ -250,11 +253,6 @@ class SearchDescription
         $this->iNamePhrase = $iPhraseNumber;
     }
 
         $this->iNamePhrase = $iPhraseNumber;
     }
 

-    public function markRareName()
-    {
-        $this->bRareName = true;
-    }
-

     /**
      * Set country restriction for the search.
      *
     /**
      * Set country restriction for the search.
      *

diff --git a/lib-php/TokenWord.php b/lib-php/TokenWord.php
index c9a439155b1ca33b72ba9c556ad6773cca238faf..59456e35aaef3d309b8d2da23aca21df2d546b9f 100644 (file)
--- a/lib-php/TokenWord.php
+++ b/lib-php/TokenWord.php
@@ -70,13 +70,12 @@ class Word
             }
         } elseif (!$oSearch->hasName(true)) {
             $oNewSearch = $oSearch->clone(1);
             }
         } elseif (!$oSearch->hasName(true)) {
             $oNewSearch = $oSearch->clone(1);

-            $oNewSearch->addNameToken($this->iId);
-            if (CONST_Search_NameOnlySearchFrequencyThreshold
+            $oNewSearch->addNameToken(
+                $this->iId,
+                CONST_Search_NameOnlySearchFrequencyThreshold

                 && $this->iSearchNameCount
                           < CONST_Search_NameOnlySearchFrequencyThreshold
                 && $this->iSearchNameCount
                           < CONST_Search_NameOnlySearchFrequencyThreshold

-            ) {
-                $oNewSearch->markRareName();
-            }
+            );

 
             return array($oNewSearch);
         }
 
             return array($oNewSearch);
         }