X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/10620c71bb7999ed89ca45e545d9ce611a5e1476..bde251f2a244b87334528f0b01281f8bd96d1ebf:/lib/log.php

diff --git a/lib/log.php b/lib/log.php
index 8b5f00fd..5b847a41 100644
--- a/lib/log.php
+++ b/lib/log.php
@@ -5,6 +5,9 @@
 		$aStartTime = explode('.',microtime(true));
 		if (!$aStartTime[1]) $aStartTime[1] = '0';
 
+		$sOutputFormat = '';
+		if (isset($_GET['format'])) $sOutputFormat = $_GET['format'];
+
 		$hLog = array(
 				date('Y-m-d H:i:s',$aStartTime[0]).'.'.$aStartTime[1],
 				$_SERVER["REMOTE_ADDR"],
@@ -14,22 +17,24 @@
 
 		if (CONST_Log_DB)
 		{
-	                // Log
+			// Log
 			if ($sType == 'search')
 			{
-		                $oDB->query('insert into query_log values ('.getDBQuoted($hLog[0]).','.getDBQuoted($hLog[3]).','.getDBQuoted($hLog[1]).')');
+				$oDB->query('insert into query_log values ('.getDBQuoted($hLog[0]).','.getDBQuoted($hLog[3]).','.getDBQuoted($hLog[1]).')');
 			}
 
 			$sSQL = 'insert into new_query_log (type,starttime,query,ipaddress,useragent,language,format)';
 			$sSQL .= ' values ('.getDBQuoted($sType).','.getDBQuoted($hLog[0]).','.getDBQuoted($hLog[2]);
-			$sSQL .= ','.getDBQuoted($hLog[1]).','.getDBQuoted($_SERVER['HTTP_USER_AGENT']).','.getDBQuoted(join(',',$aLanguageList)).','.getDBQuoted($_GET['format']).')';
+			$sSQL .= ','.getDBQuoted($hLog[1]).','.getDBQuoted($_SERVER['HTTP_USER_AGENT']).','.getDBQuoted(join(',',$aLanguageList)).','.getDBQuoted($sOutputFormat).')';
 			$oDB->query($sSQL);
 		}
 
+		if (CONST_Log_File && CONST_Log_File_ReverseLog != '')
+		{
                 if ($sType == 'reverse')
                 {
                         $aStartTime = explode('.',$hLog[0]);
-                        file_put_contents('/data/mapquest/opentile_http/logs/nominatimreverse',
+                        file_put_contents(CONST_Log_File_ReverseLog,
                                 $aStartTime[0].','.$aStartTime[1].','.
                                 php_uname('n').','.
                                 '"'.addslashes(isset($_SERVER['HTTP_REFERER'])?$_SERVER['HTTP_REFERER']:'').'",'.
@@ -38,19 +43,19 @@
                                 $_GET['lon'].','.
                                 $_GET['zoom'].','.
                                 '"'.addslashes($_SERVER['HTTP_USER_AGENT']).'",'.
-                                '"'.addslashes($_GET['format']).'"'."\n",
+                                '"'.addslashes($sOutputFormat).'"'."\n",
                         FILE_APPEND);
                 }
-
+		}
 
 		return $hLog;
 	}
 
 	function logEnd(&$oDB, $hLog, $iNumResults)
 	{
-                $aEndTime = explode('.',microtime(true));
-                if (!$aEndTime[1]) $aEndTime[1] = '0';
-                $sEndTime = date('Y-m-d H:i:s',$aEndTime[0]).'.'.$aEndTime[1];
+		$aEndTime = explode('.',microtime(true));
+		if (!$aEndTime[1]) $aEndTime[1] = '0';
+		$sEndTime = date('Y-m-d H:i:s',$aEndTime[0]).'.'.$aEndTime[1];
 
 		if (CONST_Log_DB)
 		{
@@ -67,16 +72,19 @@
 			$oDB->query($sSQL);
 		}
 
+		if (CONST_Log_File && CONST_Log_File_SearchLog != '')
+		{
                 $aStartTime = explode('.',$hLog[0]);
-                file_put_contents('/data/mapquest/opentile_http/logs/nominatimsearch',
+                file_put_contents(CONST_Log_File_SearchLog,
                                 $aStartTime[0].','.$aStartTime[1].','.
                                 php_uname('n').','.
                                 '"'.addslashes(isset($_SERVER['HTTP_REFERER'])?$_SERVER['HTTP_REFERER']:'').'",'.
                                 '"'.addslashes($hLog[1]).'",'.
                                 '"'.addslashes($hLog[3]).'",'.
                                 '"'.addslashes($_SERVER['HTTP_USER_AGENT']).'",'.
-                                '"'.addslashes($_GET['format']).'",'.
+                                '"'.addslashes((isset($_GET['format']))?$_GET['format']:'').'",'.
                                 $iNumResults."\n",
                         FILE_APPEND);
+		}
 
 	}