UpdateDatabase.php

[Pman.Core] / UpdateDatabase.php

diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index 5fb08cb..3207977 100644 (file)
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -178,10 +178,8 @@ class Pman_Core_UpdateDatabase extends Pman
         $this->opts = $opts;
         
         if (!empty($opts['debug'])) {
-            echo "Setting debug Level : {$opts['debug']}\n";
-            DB_DataObject::DebugLevel($opts['debug']);
+             DB_DataObject::DebugLevel($opts['debug']);
         }
-      
         
         // ask all the modules to verify the opts
         
@@ -204,6 +202,8 @@ class Pman_Core_UpdateDatabase extends Pman
             return;
         }
         
+        
+
         $this->runUpdateModulesData();
         
         if (!empty($opts['add-company']) && !in_array('Core', $this->disabled)) {
@@ -214,7 +214,7 @@ class Pman_Core_UpdateDatabase extends Pman
         
         $this->runExtensions();
         
-        $this->generateDataobjectsCache();
+        $this->clearApacheDataobjectsCache();
         
          
     }
@@ -941,6 +941,8 @@ class Pman_Core_UpdateDatabase extends Pman
             PDO_DataObject_Introspection::$cache = array();
         }
         HTML_FlexyFramework::get()->generateDataobjectsCache(true);
+        
+         
         $this->updateDataEnums();
         $this->updateDataGroups();
         $this->updateDataCompanies();
@@ -1185,11 +1187,22 @@ class Pman_Core_UpdateDatabase extends Pman
         
     }
     
-    function generateDataobjectsCache()
+    function clearApacheDataobjectsCache()
     {
+        
+        // this needs to clear it's own cache along with remote one..
+  
         $url = "http://localhost{$this->local_base_url}/Core/RefreshDatabaseCache";
-            
-        $this->curl($url);
+        
+        $response = $this->curl($url);
+        
+        $json = json_decode($response, true);
+        
+        if(empty($json['data']) || $json['data'] != 'DONE'){
+            echo $response. "\n";
+            echo "CURL clear cache failed\n";
+            exit;
+        }
         
     }