hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

test for existance of country grid in cmake already

Browse Source 
Given that the file potentially gets installed, it needs to be
present during build time already. Checking during the import
is too late.
This commit is contained in:
Sarah Hoffmann
2021-02-10 10:40:36 +01:00
parent 745ae02f47
commit 99dcd10d3f
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@@ -97,6 +97,17 @@ endif()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
if (BUILD_IMPORTER) if (BUILD_IMPORTER)
find_file(COUNTRY_GRID_FILE country_osm_grid.sql.gz
PATHS ${PROJECT_SOURCE_DIR}/data
NO_DEFAULT_PATH
DOC "Location of the country grid file."
)
if (NOT COUNTRY_GRID_FILE)
message(FATAL_ERROR "\nYou need to download the country_osm_grid first:\n"
" wget -O ${PROJECT_SOURCE_DIR}/data/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz")
endif()
set(CUSTOMSCRIPTS set(CUSTOMSCRIPTS
check_import_finished.php check_import_finished.php
country_languages.php country_languages.php
@@ -221,7 +232,7 @@ if (BUILD_IMPORTER)
install(DIRECTORY lib-sql DESTINATION ${NOMINATIM_LIBDIR}) install(DIRECTORY lib-sql DESTINATION ${NOMINATIM_LIBDIR})
install(FILES data/country_name.sql install(FILES data/country_name.sql
data/country_osm_grid.sql.gz ${COUNTRY_GRID_FILE}
data/words.sql data/words.sql
DESTINATION ${NOMINATIM_DATADIR}) DESTINATION ${NOMINATIM_DATADIR})
endif() endif()

5
lib-php/setup/SetupClass.php
View File

@@ -166,11 +166,6 @@ class SetupFunctions
// Try accessing the C module, so we know early if something is wrong // Try accessing the C module, so we know early if something is wrong
$this->checkModulePresence(); // raises exception on failure $this->checkModulePresence(); // raises exception on failure
if (!file_exists(CONST_DataDir.'/country_osm_grid.sql.gz')) {
echo 'Error: you need to download the country_osm_grid first:';
echo "\n wget -O ".CONST_DataDir."/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz\n";
exit(1);
}
$this->pgsqlRunScriptFile(CONST_DataDir.'/country_name.sql'); $this->pgsqlRunScriptFile(CONST_DataDir.'/country_name.sql');
$this->pgsqlRunScriptFile(CONST_DataDir.'/country_osm_grid.sql.gz'); $this->pgsqlRunScriptFile(CONST_DataDir.'/country_osm_grid.sql.gz');