boilerplate for PHP code of tokenizer

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

diff --git a/lib-php/Geocode.php b/lib-php/Geocode.php
index 20cb0bd438c8e81bb436279bfffc0938c978bd4d..d9c1b3c08a11823656e54053c734fe72093ba7b9 100644 (file)
--- a/lib-php/Geocode.php
+++ b/lib-php/Geocode.php
@@ -8,6 +8,7 @@ require_once(CONST_LibDir.'/ReverseGeocode.php');
 require_once(CONST_LibDir.'/SearchDescription.php');
 require_once(CONST_LibDir.'/SearchContext.php');
 require_once(CONST_LibDir.'/TokenList.php');
 require_once(CONST_LibDir.'/SearchDescription.php');
 require_once(CONST_LibDir.'/SearchContext.php');
 require_once(CONST_LibDir.'/TokenList.php');

+require_once(CONST_TokenizerDir.'/tokenizer.php');

 
 class Geocode
 {
 
 class Geocode
 {


@@ -323,7 +324,7 @@ class Geocode
         return false;
     }
 
         return false;
     }
 

-    public function getGroupedSearches($aSearches, $aPhrases, $oValidTokens, $bIsStructured)
+    public function getGroupedSearches($aSearches, $aPhrases, $oValidTokens)

     {
         /*
              Calculate all searches using oValidTokens i.e.
     {
         /*
              Calculate all searches using oValidTokens i.e.


@@ -338,7 +339,7 @@ class Geocode
          */
         foreach ($aPhrases as $iPhrase => $oPhrase) {
             $aNewPhraseSearches = array();
          */
         foreach ($aPhrases as $iPhrase => $oPhrase) {
             $aNewPhraseSearches = array();

-            $sPhraseType = $bIsStructured ? $oPhrase->getPhraseType() : '';
+            $sPhraseType = $oPhrase->getPhraseType();

 
             foreach ($oPhrase->getWordSets() as $aWordset) {
                 $aWordsetSearches = $aSearches;
 
             foreach ($oPhrase->getWordSets() as $aWordset) {
                 $aWordsetSearches = $aSearches;


@@ -381,7 +382,7 @@ class Geocode
                                 $aNewSearches = $oCurrentSearch->extendWithPartialTerm(
                                     $sToken,
                                     $oSearchTerm,
                                 $aNewSearches = $oCurrentSearch->extendWithPartialTerm(
                                     $sToken,
                                     $oSearchTerm,

-                                    $bIsStructured,
+                                    (bool) $sPhraseType,

                                     $iPhrase,
                                     $oValidTokens->get(' '.$sToken)
                                 );
                                     $iPhrase,
                                     $oValidTokens->get(' '.$sToken)
                                 );


@@ -600,10 +601,8 @@ class Geocode
             // Commas are used to reduce the search space by indicating where phrases split
             if ($this->aStructuredQuery) {
                 $aInPhrases = $this->aStructuredQuery;
             // Commas are used to reduce the search space by indicating where phrases split
             if ($this->aStructuredQuery) {
                 $aInPhrases = $this->aStructuredQuery;

-                $bStructuredPhrases = true;

             } else {
                 $aInPhrases = explode(',', $sQuery);
             } else {
                 $aInPhrases = explode(',', $sQuery);

-                $bStructuredPhrases = false;

             }
 
             Debug::printDebugArray('Search context', $oCtx);
             }
 
             Debug::printDebugArray('Search context', $oCtx);


@@ -677,7 +676,7 @@ class Geocode
 
                 Debug::newSection('Search candidates');
 
 
                 Debug::newSection('Search candidates');
 

-                $aGroupedSearches = $this->getGroupedSearches($aSearches, $aPhrases, $oValidTokens, $bStructuredPhrases);
+                $aGroupedSearches = $this->getGroupedSearches($aSearches, $aPhrases, $oValidTokens);

 
                 if (!$this->aStructuredQuery) {
                     // Reverse phrase array and also reverse the order of the wordsets in
 
                 if (!$this->aStructuredQuery) {
                     // Reverse phrase array and also reverse the order of the wordsets in


@@ -688,7 +687,7 @@ class Geocode
                     if (count($aPhrases) > 1) {
                         $aPhrases[count($aPhrases)-1]->invertWordSets();
                     }
                     if (count($aPhrases) > 1) {
                         $aPhrases[count($aPhrases)-1]->invertWordSets();
                     }

-                    $aReverseGroupedSearches = $this->getGroupedSearches($aSearches, $aPhrases, $oValidTokens, false);
+                    $aReverseGroupedSearches = $this->getGroupedSearches($aSearches, $aPhrases, $oValidTokens);

 
                     foreach ($aGroupedSearches as $aSearches) {
                         foreach ($aSearches as $aSearch) {
 
                     foreach ($aGroupedSearches as $aSearches) {
                         foreach ($aSearches as $aSearch) {


@@ -831,7 +830,6 @@ class Geocode
                     foreach ($aResults as $oResult) {
                         if (($this->iMaxAddressRank == 30 &&
                              ($oResult->iTable == Result::TABLE_OSMLINE
                     foreach ($aResults as $oResult) {
                         if (($this->iMaxAddressRank == 30 &&
                              ($oResult->iTable == Result::TABLE_OSMLINE

-                              || $oResult->iTable == Result::TABLE_AUX

                               || $oResult->iTable == Result::TABLE_TIGER))
                             || in_array($oResult->iId, $aFilteredIDs)
                         ) {
                               || $oResult->iTable == Result::TABLE_TIGER))
                             || in_array($oResult->iId, $aFilteredIDs)
                         ) {