safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

more tolerant regexp for parsing replication state directories

Browse Source 
Apache 2.4 has changed the date format, so that the current regexp
doesn't match anymore, so be more tolerant with the date format.
Also force less fancy output formatting without tables.
This commit is contained in:
Sarah Hoffmann
2014-11-27 22:23:04 +01:00
parent 59ea8d0830
commit 0bc81fe59c
1 changed files with 51 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
utils/setup.php
View File

@@ -564,10 +564,13 @@
// Search for the correct state file - uses file timestamps so need to sort by date descending // Search for the correct state file - uses file timestamps so need to sort by date descending
$sRepURL = CONST_Replication_Url."/"; $sRepURL = CONST_Replication_Url."/";
$sRep = file_get_contents($sRepURL."?C=M;O=D"); $sRep = file_get_contents($sRepURL."?C=M;O=D;F=1");
// download.geofabrik.de: <a href="000/">000/</a></td><td align="right">26-Feb-2013 11:53 </td> // download.geofabrik.de: <a href="000/">000/</a></td><td align="right">26-Feb-2013 11:53 </td>
// planet.openstreetmap.org: <a href="273/">273/</a> 22-Mar-2013 07:41 - // planet.openstreetmap.org: <a href="273/">273/</a> 2013-03-11 07:41 -
preg_match_all('#<a href="[0-9]{3}/">([0-9]{3}/)</a>.*(([0-9]{2})-([A-z]{3})-([0-9]{4}) ([0-9]{2}):([0-9]{2}))#', $sRep, $aRepMatches, PREG_SET_ORDER); preg_match_all('#<a href="[0-9]{3}/">([0-9]{3}/)</a>\s*([-0-9a-zA-Z]+ [0-9]{2}:[0-9]{2})#', $sRep, $aRepMatches, PREG_SET_ORDER);
var_dump($aRepMatches);
if ($aRepMatches)
{
$aPrevRepMatch = false; $aPrevRepMatch = false;
foreach($aRepMatches as $aRepMatch) foreach($aRepMatches as $aRepMatch)
{ {
@@ -577,8 +580,9 @@
if ($aPrevRepMatch) $aRepMatch = $aPrevRepMatch; if ($aPrevRepMatch) $aRepMatch = $aPrevRepMatch;
$sRepURL .= $aRepMatch[1]; $sRepURL .= $aRepMatch[1];
$sRep = file_get_contents($sRepURL."?C=M;O=D"); $sRep = file_get_contents($sRepURL."?C=M;O=D;F=1");
preg_match_all('#<a href="[0-9]{3}/">([0-9]{3}/)</a>.*(([0-9]{2})-([A-z]{3})-([0-9]{4}) ([0-9]{2}):([0-9]{2}))#', $sRep, $aRepMatches, PREG_SET_ORDER); preg_match_all('#<a href="[0-9]{3}/">([0-9]{3}/)</a>\s*([-0-9a-zA-Z]+ [0-9]{2}:[0-9]{2})#', $sRep, $aRepMatches, PREG_SET_ORDER);
var_dump($aRepMatches);
$aPrevRepMatch = false; $aPrevRepMatch = false;
foreach($aRepMatches as $aRepMatch) foreach($aRepMatches as $aRepMatch)
{ {
@@ -588,8 +592,9 @@
if ($aPrevRepMatch) $aRepMatch = $aPrevRepMatch; if ($aPrevRepMatch) $aRepMatch = $aPrevRepMatch;
$sRepURL .= $aRepMatch[1]; $sRepURL .= $aRepMatch[1];
$sRep = file_get_contents($sRepURL."?C=M;O=D"); $sRep = file_get_contents($sRepURL."?C=M;O=D;F=1");
preg_match_all('#<a href="[0-9]{3}.state.txt">([0-9]{3}).state.txt</a>.*(([0-9]{2})-([A-z]{3})-([0-9]{4}) ([0-9]{2}):([0-9]{2}))#', $sRep, $aRepMatches, PREG_SET_ORDER); preg_match_all('#<a href="[0-9]{3}.state.txt">([0-9]{3}).state.txt</a>\s*([-0-9a-zA-Z]+ [0-9]{2}:[0-9]{2})#', $sRep, $aRepMatches, PREG_SET_ORDER);
var_dump($aRepMatches);
$aPrevRepMatch = false; $aPrevRepMatch = false;
foreach($aRepMatches as $aRepMatch) foreach($aRepMatches as $aRepMatch)
{ {
@@ -608,6 +613,14 @@
$sSQL = "INSERT INTO import_status VALUES('".$aRepMatch[2]."')"; $sSQL = "INSERT INTO import_status VALUES('".$aRepMatch[2]."')";
pg_query($oDB->connection, $sSQL); pg_query($oDB->connection, $sSQL);
} }
else
{
if (!$aCMDResult['all'])
{
fail("Cannot read state file directory.");
}
}
}
} }
if ($aCMDResult['index'] || $aCMDResult['all']) if ($aCMDResult['index'] || $aCMDResult['all'])