osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2024-11-27 00:49:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'customPHP1' of https://github.com/ThomasBarris/Nominatim into ThomasBarris-customPHP1

Browse Source
This commit is contained in:
Sarah Hoffmann 2018-08-23 20:41:44 +02:00
commit 57bf76a0e1
12 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -77,6 +77,16 @@ find_package(BZip2 REQUIRED)
find_package(LibXml2 REQUIRED)
include_directories(${LIBXML2_INCLUDE_DIR})
# Setting PHP binary variable as to command line (prevailing) or auto detect
if (NOT PHP_BIN)
find_program (PHP_BIN php)
endif()
# sanity check if PHP binary exists
if (NOT EXISTS ${PHP_BIN})
message(FATAL_ERROR "PHP binary not found install php or provide location by -DPHP_BIN=/path/php ")
endif()
message (STATUS "Setting PHP_BIN= " ${PHP_BIN})
#-----------------------------------------------------------------------------
#
# Setup settings and paths

2
utils/blocks.php
View File

@ -1,4 +1,4 @@
#!/usr/bin/php -Cq
#!@PHP_BIN@ -Cq
<?php
require_once(dirname(dirname(__FILE__)).'/settings/settings.php');

2
utils/country_languages.php
View File

@ -1,4 +1,4 @@
#!/usr/bin/php -Cq
#!@PHP_BIN@ -Cq
<?php
require_once(dirname(dirname(__FILE__)).'/settings/settings.php');

2
utils/export.php
View File

@ -1,4 +1,4 @@
#!/usr/bin/php -Cq
#!@PHP_BIN@ -Cq
<?php
// Script to extract structured city and street data
// from a running nominatim instance as CSV data

2
utils/importWikipedia.php
View File

@ -309,7 +309,7 @@ if (isset($aCMDResult['parse-wikipedia'])) {
$oDB =& getDB();
$sSQL = 'select page_title from content where page_namespace = 0 and page_id %10 = ';
$sSQL .= $aCMDResult['parse-wikipedia'];
$sSQL .= ' and (page_content ilike \'%{{Coord%\' or (page_content ilike \'%lat%\' and page_content ilike \'%lon%\'))'
$sSQL .= ' and (page_content ilike \'%{{Coord%\' or (page_content ilike \'%lat%\' and page_content ilike \'%lon%\'))';
$aArticleNames = $oDB->getCol($sSQL);
/* $aArticleNames = $oDB->getCol($sSQL = 'select page_title from content where page_namespace = 0
and (page_content ilike \'%{{Coord%\' or (page_content ilike \'%lat%\'

2
utils/imports.php
View File

@ -1,4 +1,4 @@
#!/usr/bin/php -Cq
#!@PHP_BIN@ -Cq
<?php
require_once(dirname(dirname(__FILE__)).'/settings/settings.php');

2
utils/query.php
View File

@ -1,4 +1,4 @@
#!/usr/bin/php -Cq
#!@PHP_BIN@ -Cq
<?php
require_once(dirname(dirname(__FILE__)).'/settings/settings.php');

2
utils/server_compare.php
View File

@ -1,4 +1,4 @@
#!/usr/bin/php -Cq
#!@PHP_BIN@ -Cq
<?php
$sFile = 'sample.log.txt'; // Apache log file

2
utils/setup.php
View File

@ -1,4 +1,4 @@
#!/usr/bin/php -Cq
#!@PHP_BIN@ -Cq
<?php
require_once(dirname(dirname(__FILE__)).'/settings/settings.php');

2
utils/specialphrases.php
View File

@ -1,4 +1,4 @@
#!/usr/bin/php -Cq
#!@PHP_BIN@ -Cq
<?php
require_once(dirname(dirname(__FILE__)).'/settings/settings.php');

4
utils/update.php
View File

@ -1,4 +1,4 @@
#!/usr/bin/php -Cq
#!@PHP_BIN@ -Cq
<?php
require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
@ -99,7 +99,7 @@ if ($aResult['init-updates']) {
fail('pyosmium-get-changes not found or not usable');
}
if (!$aResult['no-update-functions']) {
$sSetup = CONST_InstallPath.'/utils/setup.php';
$sSetup ='@PHP_BIN@ '. CONST_InstallPath.'/utils/setup.php';
$iRet = -1;
passthru($sSetup.' --create-functions --enable-diff-updates', $iRet);
if ($iRet != 0) {

2
utils/warm.php
View File

@ -1,4 +1,4 @@
#!/usr/bin/php -Cq
#!@PHP_BIN@ -Cq
<?php
require_once(dirname(dirname(__FILE__)).'/settings/settings.php');