X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/80cf5df1cd5c249a547f877c73fd6feba9b763b0..ccdce35322a605e6665adbb32a804ef7476ac6fd:/lib/log.php

diff --git a/lib/log.php b/lib/log.php
index e3126c0e..d81ef46d 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,15 +17,9 @@
 
 		if (CONST_Log_DB)
 		{
-	                // Log
-			if ($sType == 'search')
-			{
-		                $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 = '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($_SERVER['HTTP_USER_AGENT']).','.getDBQuoted(join(',',$aLanguageList)).','.getDBQuoted($_GET['format']).')';
+			$sSQL .= ','.getDBQuoted($hLog[1]).','.getDBQuoted($_SERVER['HTTP_USER_AGENT']).','.getDBQuoted(join(',',$aLanguageList)).','.getDBQuoted($_GET['format']).','.getDBQuoted($hLog[3]).')';
 			$oDB->query($sSQL);
 		}
 
@@ -40,7 +37,7 @@
                                 $_GET['lon'].','.
                                 $_GET['zoom'].','.
                                 '"'.addslashes($_SERVER['HTTP_USER_AGENT']).'",'.
-                                '"'.addslashes($_GET['format']).'"'."\n",
+                                '"'.addslashes($sOutputFormat).'"'."\n",
                         FILE_APPEND);
                 }
 		}
@@ -50,18 +47,12 @@
 
 	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)
 		{
-			$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]);
@@ -79,7 +70,7 @@
                                 '"'.addslashes($hLog[1]).'",'.
                                 '"'.addslashes($hLog[3]).'",'.
                                 '"'.addslashes($_SERVER['HTTP_USER_AGENT']).'",'.
-                                '"'.addslashes($_GET['format']).'",'.
+                                '"'.addslashes((isset($_GET['format']))?$_GET['format']:'').'",'.
                                 $iNumResults."\n",
                         FILE_APPEND);
 		}