Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / lib.php

diff --git a/lib/lib.php b/lib/lib.php
index c4fbca308636e60e0cd0e59a27fc63eb517b7597..7760f695304748fe80d9a549c5d76fedbdf5066a 100644 (file)
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -1,5 +1,46 @@
 <?php
 
 <?php
 

+function loadSettings($sProjectDir)
+{
+    @define('CONST_InstallDir', $sProjectDir);
+    // Temporary hack to set the direcory via environment instead of
+    // the installed scripts. Neither setting is part of the official
+    // set of settings.
+    defined('CONST_DataDir') or define('CONST_DataDir', $_SERVER['NOMINATIM_DATADIR']);
+    defined('CONST_BinDir') or define('CONST_BinDir', $_SERVER['NOMINATIM_BINDIR']);
+}
+
+function getSetting($sConfName, $sDefault = null)
+{
+    $sValue = $_SERVER['NOMINATIM_'.$sConfName];
+
+    if ($sDefault !== null && !$sValue) {
+        return $sDefault;
+    }
+
+    return $sValue;
+}
+
+function getSettingBool($sConfName)
+{
+    $sVal = strtolower(getSetting($sConfName));
+
+    return strcmp($sVal, 'yes') == 0
+           || strcmp($sVal, 'true') == 0
+           || strcmp($sVal, '1') == 0;
+}
+
+function getSettingConfig($sConfName, $sSystemConfig)
+{
+    $sValue = $_SERVER['NOMINATIM_'.$sConfName];
+
+    if (!$sValue) {
+        return CONST_DataDir.'/settings/'.$sSystemConfig;
+    }
+
+    return $sValue;
+}
+

 function fail($sError, $sUserError = false)
 {
     if (!$sUserError) $sUserError = $sError;
 function fail($sError, $sUserError = false)
 {
     if (!$sUserError) $sUserError = $sError;


@@ -55,7 +96,7 @@ function byImportance($a, $b)
     if ($a['importance'] != $b['importance'])
         return ($a['importance'] > $b['importance']?-1:1);
 
     if ($a['importance'] != $b['importance'])
         return ($a['importance'] > $b['importance']?-1:1);
 

-    return ($a['foundorder'] < $b['foundorder']?-1:1);
+    return $a['foundorder'] <=> $b['foundorder'];

 }
 
 
 }
 
 


@@ -89,6 +130,24 @@ function addQuotes($s)
     return "'".$s."'";
 }
 
     return "'".$s."'";
 }
 

+function fwriteConstDef($rFile, $sConstName, $value)
+{
+    $sEscapedValue;
+
+    if (is_bool($value)) {
+        $sEscapedValue = $value ? 'true' : 'false';
+    } elseif (is_numeric($value)) {
+        $sEscapedValue = strval($value);
+    } elseif (!$value) {
+        $sEscapedValue = 'false';
+    } else {
+        $sEscapedValue = addQuotes(str_replace("'", "\\'", (string)$value));
+    }
+
+    fwrite($rFile, "@define('CONST_$sConstName', $sEscapedValue);\n");
+}
+
+

 function parseLatLon($sQuery)
 {
     $sFound    = null;
 function parseLatLon($sQuery)
 {
     $sFound    = null;