X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/051998dd80b0def50058266b7adbdf2e971032eb..5464dec0570c2451d8607bc739c6f2b6f298bb75:/website/polygons.php diff --git a/website/polygons.php b/website/polygons.php index 3c98bdbc..1e0f5f7e 100755 --- a/website/polygons.php +++ b/website/polygons.php @@ -2,40 +2,40 @@ require_once(dirname(dirname(__FILE__)).'/settings/settings.php'); require_once(CONST_BasePath.'/lib/init-website.php'); require_once(CONST_BasePath.'/lib/log.php'); + require_once(CONST_BasePath.'/lib/output.php'); + ini_set('memory_limit', '200M'); + + $oParams = new ParameterParser(); $sOutputFormat = 'html'; - ini_set('memory_limit', '200M'); + $iDays = $oParams->getInt('days', 1); + $bReduced = $oParams->getBool('reduced', false); + $sClass = $oParams->getString('class', false); $oDB =& getDB(); - if (!isset($_GET['days'])) $_GET['days'] = 1; - $bReduced = false; - if (isset($_GET['reduced'])) $bReduced = true; - $sClass = false; - if (isset($_GET['class'])) $sClass = $_GET['class']; + + $iTotalBroken = (int) chksql($oDB->getOne('select count(*) from import_polygon_error')); $aPolygons = array(); - while(!sizeof($aPolygons)) + while($iTotalBroken && !sizeof($aPolygons)) { $sSQL = 'select osm_type as "type",osm_id as "id",class as "key",type as "value",name->\'name\' as "name",'; $sSQL .= 'country_code as "country",errormessage as "error message",updated'; $sSQL .= " from import_polygon_error"; - if ($_GET['days']) - { - $sSQL .= " where updated > 'now'::timestamp - '".(int)$_GET['days']." day'::interval"; - $_GET['days']++; - } - if ($bReduced) - { - $sSQL .= " and errormessage like 'Area reduced%'"; - } - if ($sClass) - { - $sSQL .= " and class = '".pg_escape_string($sClass)."'"; - } + $sSQL .= " where updated > 'now'::timestamp - '".$iDays." day'::interval"; + $iDays++; + + if ($bReduced) $sSQL .= " and errormessage like 'Area reduced%'"; + if ($sClass) $sSQL .= " and class = '".pg_escape_string($sClass)."'"; $sSQL .= " order by updated desc limit 1000"; - $aPolygons = $oDB->getAll($sSQL); + $aPolygons = chksql($oDB->getAll($sSQL)); + } + + if (CONST_Debug) + { + var_dump($aPolygons); + exit; } -//var_dump($aPolygons); ?> @@ -84,6 +84,8 @@ table td { Total number of broken polygons: $iTotalBroken

"; + if (!$aPolygons) exit; echo ""; echo ""; //var_dump($aPolygons[0]); @@ -117,8 +119,7 @@ table td { } break; case 'id': - $sOSMType = ($aRow['type'] == 'N'?'node':($aRow['type'] == 'W'?'way':($aRow['type'] == 'R'?'relation':''))); - echo ''; + echo ''; break; default: echo ""; @@ -137,10 +138,6 @@ table td { echo ""; } echo "
'.$aRow['id'].''.osmLink($aRow).'".($sVal?$sVal:' ')."
"; - - - -// include(CONST_BasePath.'/lib/template/details-'.$sOutputFormat.'.php'); ?>