X-Git-Url: http://git.roojs.org/?p=pear;a=blobdiff_plain;f=HTML%2FFlexyFramework%2FGenerator.php;fp=HTML%2FFlexyFramework%2FGenerator.php;h=dc165ea32ae46fa43b9f04a7ad323083aa2637e1;hp=b2cebc86da6e90f5fcebd80ac9e88529e5d49f0a;hb=12209321a45d17cd27b8530f38d5114304132f62;hpb=58735f31feb3edf2ca071d9ddaac1a250e108372 diff --git a/HTML/FlexyFramework/Generator.php b/HTML/FlexyFramework/Generator.php index b2cebc86..dc165ea3 100644 --- a/HTML/FlexyFramework/Generator.php +++ b/HTML/FlexyFramework/Generator.php @@ -196,19 +196,29 @@ class HTML_FlexyFramework_Generator extends DB_DataObject_Generator rename($iniCacheTmp, $iniCache); } else { touch($iniCache); + unlink($iniCacheTmp); } } - /* + // readers..??? not needed??? (historical) if (file_exists($iniCacheTmp.'.reader') && filesize($iniCacheTmp.'.reader')) { - if (file_exists($iniCache.'.reader')) { - unlink($iniCache.'.reader'); + + + if (file_exists($iniCache.'.reader') ) { + if ($replace[$iniCache] != md5_file($iniCacheTmp.'.reader')) { + unlink($iniCache.'.reader'); + rename($iniCacheTmp.'.reader', $iniCache.'.reader'); + } else { + // do not need to touch.. + unlink($iniCacheTmp.'.reader'); + } + } else { + rename($iniCacheTmp.'.reader', $iniCache.'.reader'); } - $ff->debug("Writing merged reader file : $iniCache.reader\n"); - rename($iniCacheTmp.'.reader', $iniCache.'.reader'); - } - */ + + } + // merge and set links.. test for generated links file.. $linksCacheTmp = preg_replace('/\.ini/', '.links.ini', $iniCacheTmp );