From 8e0ffde3e0a403d289b91ad720444fd94f3ae210 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Sun, 8 Oct 2017 17:00:59 +0200 Subject: [PATCH] fix CodeSniffer violations --- lib/Geocode.php | 9 ++--- lib/SearchDescription.php | 85 ++++++++------------------------------- phpcs.xml | 4 +- utils/setup.php | 1 - utils/update.php | 18 ++++++--- 5 files changed, 34 insertions(+), 83 deletions(-) diff --git a/lib/Geocode.php b/lib/Geocode.php index 2f265111..58bc3bfc 100644 --- a/lib/Geocode.php +++ b/lib/Geocode.php @@ -368,7 +368,7 @@ class Geocode $this->aAddressRankList = array(); $this->aStructuredQuery = array(); - $this->sAllowedTypesSQLList = False; + $this->sAllowedTypesSQLList = false; $this->loadStructuredAddressElement($sAmenity, 'amenity', 26, 30, false); $this->loadStructuredAddressElement($sStreet, 'street', 26, 30, false); @@ -413,8 +413,7 @@ class Geocode if (sizeof($aPlaceIDs) == 0) return array(); $sLanguagePrefArraySQL = getArraySQL( - array_map("getDBQuoted", - $this->aLangPrefOrder) + array_map("getDBQuoted", $this->aLangPrefOrder) ); // Get the details for display (is this a redundant extra step?) @@ -789,7 +788,6 @@ class Geocode $aNewWordsetSearches[] = $oSearch; } } - } } } @@ -892,8 +890,7 @@ class Geocode $sNormQuery = $this->normTerm($this->sQuery); $sLanguagePrefArraySQL = getArraySQL( - array_map("getDBQuoted", - $this->aLangPrefOrder) + array_map("getDBQuoted", $this->aLangPrefOrder) ); $sCountryCodesSQL = false; if ($this->aCountryCodes) { diff --git a/lib/SearchDescription.php b/lib/SearchDescription.php index b7b4498d..d84c8bf8 100644 --- a/lib/SearchDescription.php +++ b/lib/SearchDescription.php @@ -1,46 +1,8 @@ getConstants(); - - Operator::$aConstantNames = array(); - foreach ($aConstants as $sName => $iValue) { - Operator::$aConstantNames[$iValue] = $sName; - } - } +require_once(CONST_BasePath.'/lib/SpecialSearchOperator.php'); - return Operator::$aConstantNames[$iOperator]; - } -} +namespace Nominatim; /** * Description of a single interpretation of a search query. @@ -79,6 +41,7 @@ class SearchDescription /// Index of phrase currently processed private $iNamePhrase = -1; + public function getRank() { return $this->iSearchRank; @@ -95,9 +58,6 @@ class SearchDescription return $this->sPostcode; } - /** - * Set the geographic search radius. - */ public function setNear(&$oNearPoint) { $this->oNearPoint = $oNearPoint; @@ -110,26 +70,17 @@ class SearchDescription $this->sType = $sType; } - /** - * Check if name or address for the search are specified. - */ public function isNamedSearch() { return sizeof($this->aName) > 0 || sizeof($this->aAddress) > 0; } - /** - * Check if only a country is requested. - */ public function isCountrySearch() { return $this->sCountryCode && sizeof($this->aName) == 0 && !$this->iOperator && !$this->oNearPoint; } - /** - * Check if a search near a geographic location is requested. - */ public function isNearSearch() { return (bool) $this->oNearPoint; @@ -179,13 +130,6 @@ class SearchDescription return $this->iOperator != Operator::NONE; } - /** - * Extract special terms from the query, amend the search - * and return the shortended query. - * - * Only the first special term found will be used but all will - * be removed from the query. - */ public function extractKeyValuePairs($sQuery) { // Search for terms of kind [=]. @@ -225,6 +169,7 @@ class SearchDescription /////////// Search building functions + public function extendWithFullTerm($aSearchTerm, $bWordInQuery, $bHasPartial, $sPhraseType, $bFirstToken, $bFirstPhrase, $bLastToken, &$iGlobalRank) { $aNewSearches = array(); @@ -335,8 +280,7 @@ class SearchDescription $oSearch->iSearchRank++; $oSearch->aAddress[$iWordID] = $iWordID; $aNewSearches[] = $oSearch; - } - else { + } else { $this->aFullNameAddress[$iWordID] = $iWordID; } } else { @@ -393,7 +337,7 @@ class SearchDescription $aNewSearches[] = $oSearch; } } - } + } } if ((!$this->sPostcode && !$this->aAddress && !$this->aAddressNonSearch) @@ -421,6 +365,7 @@ class SearchDescription /////////// Query functions + public function queryCountry(&$oDB, $sViewboxSQL) { $sSQL = 'SELECT place_id FROM placex '; @@ -490,7 +435,7 @@ class SearchDescription public function queryPostcode(&$oDB, $sCountryList, $iLimit) { - $sSQL = 'SELECT p.place_id FROM location_postcode p '; + $sSQL = 'SELECT p.place_id FROM location_postcode p '; if (sizeof($this->aAddress)) { $sSQL .= ', search_name s '; @@ -592,7 +537,7 @@ class SearchDescription } if ($sViewboxSmall) { - $aTerms[] = 'centroid && '.$sViewboxSmall; + $aTerms[] = 'centroid && '.$sViewboxSmall; } if ($this->oNearPoint) { @@ -895,7 +840,8 @@ class SearchDescription /////////// Sort functions - static function bySearchRank($a, $b) + + public static function bySearchRank($a, $b) { if ($a->iSearchRank == $b->iSearchRank) { return $a->iOperator + strlen($a->sHouseNumber) @@ -907,9 +853,12 @@ class SearchDescription //////////// Debugging functions - function dumpAsHtmlTableRow(&$aWordIDs) + + public function dumpAsHtmlTableRow(&$aWordIDs) { - $kf = function($k) use (&$aWordIDs) { return $aWordIDs[$k]; }; + $kf = function ($k) use (&$aWordIDs) { + return $aWordIDs[$k]; + }; echo ""; echo "$this->iSearchRank"; @@ -934,4 +883,4 @@ class SearchDescription echo ""; } -}; +} diff --git a/phpcs.xml b/phpcs.xml index 9f705d83..2f4bc118 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -10,8 +10,8 @@ - - + + diff --git a/utils/setup.php b/utils/setup.php index 86630196..89177914 100755 --- a/utils/setup.php +++ b/utils/setup.php @@ -540,7 +540,6 @@ if ($aCMDResult['calculate-postcodes'] || $aCMDResult['all']) { $sSQL .= " FROM us_postcode WHERE postcode NOT IN"; $sSQL .= " (SELECT postcode FROM location_postcode"; $sSQL .= " WHERE country_code = 'us')"; - } else { $sSQL .= "TRUNCATE TABLE us_postcode"; } diff --git a/utils/update.php b/utils/update.php index ca700f0b..d729519a 100755 --- a/utils/update.php +++ b/utils/update.php @@ -77,8 +77,7 @@ if ($aResult['init-updates']) { if ($sDatabaseDate === false) { fail("Cannot determine date of database."); } - $sWindBack = strftime('%Y-%m-%dT%H:%M:%SZ', - strtotime($sDatabaseDate) - (3*60*60)); + $sWindBack = strftime('%Y-%m-%dT%H:%M:%SZ', strtotime($sDatabaseDate) - (3*60*60)); // get the appropriate state id $aOutput = 0; @@ -288,7 +287,7 @@ if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) { if ($iResult == 3) { echo 'No new updates. Sleeping for '.CONST_Replication_Recheck_Interval." sec.\n"; sleep(CONST_Replication_Recheck_Interval); - } else if ($iResult != 0) { + } elseif ($iResult != 0) { echo 'ERROR: updates failed.'; exit($iResult); } else { @@ -325,7 +324,11 @@ if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) { // write the update logs $iFileSize = filesize($sImportFile); - $sSQL = "INSERT INTO import_osmosis_log (batchend, batchseq, batchsize, starttime, endtime, event) values ('$sBatchEnd',$iEndSequence,$iFileSize,'".date('Y-m-d H:i:s', $fCMDStartTime)."','".date('Y-m-d H:i:s')."','import')"; + $sSQL = 'INSERT INTO import_osmosis_log'; + $sSQL .= '(batchend, batchseq, batchsize, starttime, endtime, event)'; + $sSQL .= " values ('$sBatchEnd',$iEndSequence,$iFileSize,'"; + $sSQL .= date('Y-m-d H:i:s', $fCMDStartTime)."','"; + $sSQL .= date('Y-m-d H:i:s')."','import')"; var_Dump($sSQL); chksql($oDB->query($sSQL)); @@ -348,7 +351,11 @@ if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) { exit($iErrorLevel); } - $sSQL = "INSERT INTO import_osmosis_log (batchend, batchseq, batchsize, starttime, endtime, event) values ('$sBatchEnd',$iEndSequence,$iFileSize,'".date('Y-m-d H:i:s', $fCMDStartTime)."','".date('Y-m-d H:i:s')."','index')"; + $sSQL = 'INSERT INTO import_osmosis_log'; + $sSQL .= '(batchend, batchseq, batchsize, starttime, endtime, event)'; + $sSQL .= " values ('$sBatchEnd',$iEndSequence,$iFileSize,'"; + $sSQL .= date('Y-m-d H:i:s', $fCMDStartTime)."','"; + $sSQL .= date('Y-m-d H:i:s')."','index')"; var_Dump($sSQL); $oDB->query($sSQL); echo date('Y-m-d H:i:s')." Completed index step for $sBatchEnd in ".round((time()-$fCMDStartTime)/60, 2)." minutes\n"; @@ -362,4 +369,3 @@ if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) { if (!$aResult['import-osmosis-all']) exit(0); } } - -- 2.39.5