X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/ab6a99677293c9ddb96a717f03b8a009e98ab955..3ce0917874b55d8013d8bb37113e42dfb0c8b452:/lib/log.php

diff --git a/lib/log.php b/lib/log.php
index 12e2953c..86d78cd2 100644
--- a/lib/log.php
+++ b/lib/log.php
@@ -2,46 +2,73 @@
 
 	function logStart(&$oDB, $sType = '', $sQuery = '', $aLanguageList = array())
 	{
-		$aStartTime = explode('.',microtime(true));
-		if (!$aStartTime[1]) $aStartTime[1] = '0';
+		$fStartTime = microtime(true);
+		$aStartTime = explode('.', $fStartTime);
+		if (!isset($aStartTime[1])) $aStartTime[1] = '0';
+
+		$sOutputFormat = '';
+		if (isset($_GET['format'])) $sOutputFormat = $_GET['format'];
+
+		if ($sType == 'reverse')
+		{
+			$sOutQuery = (isset($_GET['lat'])?$_GET['lat']:'').'/';
+			if (isset($_GET['lon'])) $sOutQuery .= $_GET['lon'];
+			if (isset($_GET['zoom'])) $sOutQuery .= '/'.$_GET['zoom'];
+		}
+		else
+			$sOutQuery = $sQuery;
 
 		$hLog = array(
 				date('Y-m-d H:i:s',$aStartTime[0]).'.'.$aStartTime[1],
 				$_SERVER["REMOTE_ADDR"],
 				$_SERVER['QUERY_STRING'],
-				$sQuery
-			);
+				$sOutQuery,
+				$sType,
+				$fStartTime
+				);
 
-                // Log
-		if ($sType == 'search')
+		if (CONST_Log_DB)
 		{
-	                $oDB->query('insert into query_log values ('.getDBQuoted($hLog[0]).','.getDBQuoted($hLog[3]).','.getDBQuoted($hLog[1]).')');
+			if (isset($_GET['email']))
+				$sUserAgent = $_GET['email'];
+			elseif (isset($_SERVER['HTTP_REFERER']))
+				$sUserAgent = $_SERVER['HTTP_REFERER'];
+			elseif (isset($_SERVER['HTTP_USER_AGENT']))
+				$sUserAgent = $_SERVER['HTTP_USER_AGENT'];
+			else
+				$sUserAgent = '';
+			$sSQL = 'insert into new_query_log (type,starttime,query,ipaddress,useragent,language,format,searchterm)';
+			$sSQL .= ' values ('.getDBQuoted($sType).','.getDBQuoted($hLog[0]).','.getDBQuoted($hLog[2]);
+			$sSQL .= ','.getDBQuoted($hLog[1]).','.getDBQuoted($sUserAgent).','.getDBQuoted(join(',',$aLanguageList)).','.getDBQuoted($sOutputFormat).','.getDBQuoted($hLog[3]).')';
+			$oDB->query($sSQL);
 		}
 
-		$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']).')';
-		$oDB->query($sSQL);
-
-
 		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];
-
-		$sSQL = 'update query_log set endtime = '.getDBQuoted($sEndTime).', results = '.$iNumResults;
-		$sSQL .= ' where starttime = '.getDBQuoted($hLog[0]);
-		$sSQL .= ' and ipaddress = '.getDBQuoted($hLog[1]);
-		$sSQL .= ' and query = '.getDBQuoted($hLog[3]);
-                $oDB->query($sSQL);
-
-		$sSQL = 'update new_query_log set endtime = '.getDBQuoted($sEndTime).', results = '.$iNumResults;
-		$sSQL .= ' where starttime = '.getDBQuoted($hLog[0]);
-		$sSQL .= ' and ipaddress = '.getDBQuoted($hLog[1]);
-		$sSQL .= ' and query = '.getDBQuoted($hLog[2]);
-		$oDB->query($sSQL);
+		$fEndTime = microtime(true);
+
+		if (CONST_Log_DB)
+		{
+			$aEndTime = explode('.', $fEndTime);
+			if (!$aEndTime[1]) $aEndTime[1] = '0';
+			$sEndTime = date('Y-m-d H:i:s',$aEndTime[0]).'.'.$aEndTime[1];
+
+			$sSQL = 'update new_query_log set endtime = '.getDBQuoted($sEndTime).', results = '.$iNumResults;
+			$sSQL .= ' where starttime = '.getDBQuoted($hLog[0]);
+			$sSQL .= ' and ipaddress = '.getDBQuoted($hLog[1]);
+			$sSQL .= ' and query = '.getDBQuoted($hLog[2]);
+			$oDB->query($sSQL);
+		}
+
+		if (CONST_Log_File)
+		{
+			$aOutdata = sprintf("[%s] %.4f %d %s \"%s\"\n",
+			                    $hLog[0], $fEndTime-$hLog[5], $iNumResults,
+			                    $hLog[4], $hLog[2]);
+			file_put_contents(CONST_Log_File, $aOutdata, FILE_APPEND);
+		}
+
 	}