From: Alan <alan@roojs.com>
Date: Thu, 20 Jan 2022 04:46:47 +0000 (+0800)
Subject: re-enable readers - used by meta somewhere I think
X-Git-Url: http://git.roojs.org/?p=pear;a=commitdiff_plain;h=12209321a45d17cd27b8530f38d5114304132f62

re-enable readers - used by meta somewhere I think
---

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 );
diff --git a/HTML/FlexyFramework2/Generator.php b/HTML/FlexyFramework2/Generator.php
index f864f451..adbdac45 100644
--- a/HTML/FlexyFramework2/Generator.php
+++ b/HTML/FlexyFramework2/Generator.php
@@ -205,16 +205,24 @@ class HTML_FlexyFramework2_Generator extends PDO_DataObject_Generator
                 touch($iniCache);
             }
         }
-        /* 
-        // readers..??? not needed??? (historical)
+         // 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..