if doing structured query limit the types of osm place returned

[nominatim.git] / lib / lib.php

diff --git a/lib/lib.php b/lib/lib.php
index 20f5af17787c7386cd98594f74c1e5c30198ead5..91fe21b2c79626b23f087387a1dfb95d0c2bca16 100644 (file)
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -919,9 +919,14 @@
 
        function getBucketMemcache()
        {
+               static $m;
+
                if (!CONST_ConnectionBucket_MemcacheServerAddress) return null;
-               $m = new Memcached();
-               $m->addServer(CONST_ConnectionBucket_MemcacheServerAddress, CONST_ConnectionBucket_MemcacheServerPort);
+               if (!isset($m))
+               {
+                       $m = new Memcached();
+                       $m->addServer(CONST_ConnectionBucket_MemcacheServerAddress, CONST_ConnectionBucket_MemcacheServerPort);
+               }
                return $m;
        }
 
@@ -994,6 +999,15 @@
                return $iMaxVal;
         }
 
+       function byLastBlockTime($a, $b)
+       {
+               if ($a['lastBlockTimestamp'] == $b['lastBlockTimestamp'])
+               {
+                       return 0;
+               }
+               return ($a['lastBlockTimestamp'] > $b['lastBlockTimestamp']) ? -1 : 1;
+       }
+
        function getBucketBlocks()
        {
                $m = getBucketMemcache();
@@ -1014,6 +1028,7 @@
                                'currentlyBlocked' => $iCurrentBucketSize + (CONST_ConnectionBucket_Cost_Reverse) >= CONST_ConnectionBucket_BlockLimit,
                                );
                }
+               uasort($aBlockedList, 'byLastBlockTime');
                return $aBlockedList;
        }