introduce accessor function for URL parameter

[nominatim.git] / website / polygons.php

diff --git a/website/polygons.php b/website/polygons.php
index 3c98bdbca86030651042b83bc34c4eb52dd8dc13..92dbf70daaef82f0c5e63035564b05942363ac81 100755 (executable)
--- a/website/polygons.php
+++ b/website/polygons.php
@@ -2,36 +2,28 @@
        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(dirname(dirname(__FILE__)).'/settings/settings.php');
        require_once(CONST_BasePath.'/lib/init-website.php');
        require_once(CONST_BasePath.'/lib/log.php');

-
-       $sOutputFormat = 'html';

        ini_set('memory_limit', '200M');
 
        $oDB =& getDB();
        ini_set('memory_limit', '200M');
 
        $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'];
+
+       $sOutputFormat = 'html';
+       $iDays = getParamInt('days', 1);
+       $bReduced = getParamBool('reduced', false);
+       $sClass = getParamString('class', false);
+
+       $iTotalBroken = (int) $oDB->getOne('select count(*) from import_polygon_error');

 
        $aPolygons = array();
 
        $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";
        {
                $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);
        }
                $sSQL .= " order by updated desc limit 1000";
                $aPolygons = $oDB->getAll($sSQL);
        }


@@ -84,6 +76,7 @@ table td {
 
 <?php
 
 
 <?php
 

+       echo "<p>Total number of broken polygons: $iTotalBroken</p>";

        echo "<table>";
        echo "<tr>";
 //var_dump($aPolygons[0]);
        echo "<table>";
        echo "<tr>";
 //var_dump($aPolygons[0]);