update Tiger extract scripts for 2012 edition

[nominatim.git] / utils / imports.php

diff --git a/utils/imports.php b/utils/imports.php
index db0f7dbce286b3b3f839eb57601713059d05af85..6450b3f1c86fa6ee728171ece65ab3bd3e67a4b7 100755 (executable)
--- a/utils/imports.php
+++ b/utils/imports.php
@@ -11,7 +11,7 @@
                array('verbose', 'v', 0, 1, 0, 0, 'bool', 'Verbose output'),
 
                array('parse-tiger', '', 0, 1, 1, 1, 'realpath', 'Convert tiger edge files to nominatim sql import'),
-               array('parse-tiger-2011', '', 0, 1, 1, 1, 'realpath', 'Convert tiger edge files to nominatim sql import (source: edges directory of tiger data)'),
+               array('parse-tiger-2011', '', 0, 1, 1, 1, 'realpath', 'Convert tiger edge files to nominatim sql import - datafiles from 2011 or later (source: edges directory of tiger data)'),
        );
        getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 
@@ -19,7 +19,7 @@
 
        if (isset($aCMDResult['parse-tiger']))
        {
-        $bDidSomething = true;
+               $bDidSomething = true;
                foreach(glob($aCMDResult['parse-tiger'].'/??_*', GLOB_ONLYDIR) as $sStateFolder)
                {
                        preg_match('#([0-9]{2})_(.*)#',basename($sStateFolder), $aMatch);
@@ -97,8 +97,8 @@
                mkdir($sTempDir);
 
 
-        $bDidSomething = true;
-               foreach(glob($aCMDResult['parse-tiger-2011'].'/tl_2011_?????_edges.zip', 0) as $sImportFile)
+               $bDidSomething = true;
+               foreach(glob($aCMDResult['parse-tiger-2011'].'/tl_20??_?????_edges.zip', 0) as $sImportFile)
                {
                        set_time_limit(30);
                        preg_match('#([0-9]{5})_(.*)#',basename($sImportFile), $aMatch);