UpdateDatabase.php
[Pman.Core] / UpdateDatabase.php
index 387549c..8cde738 100644 (file)
@@ -108,9 +108,11 @@ class Pman_Core_UpdateDatabase extends Pman
             require_once $fd;
             
             $cls = new ReflectionClass('Pman_'. $m . '_UpdateDatabase');
-            
-            $ret = array_merge($ret, $cls->getStaticPropertyValue('cli_opts'));
-            
+            $ar = $cls->getStaticProperties();
+            if (isset($ar['cli_opts'])) {
+                  
+                $ret = array_merge($ret, $cls->getStaticPropertyValue('cli_opts'));
+            }
             
         }
         
@@ -145,8 +147,7 @@ class Pman_Core_UpdateDatabase extends Pman
     
     function get($args, $opts=array())
     {
-        print_R($otps);
-        
+         
         PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, array($this, 'onPearError'));
    
         $this->checkSystem();
@@ -176,15 +177,15 @@ class Pman_Core_UpdateDatabase extends Pman
         //$this->fixSequencesPgsql();exit;
         $this->opts = $opts;
         
+        if (!empty($opts['debug'])) {
+             DB_DataObject::DebugLevel($opts['debug']);
+        }
+        
         // ask all the modules to verify the opts
         
         $this->checkOpts($opts);
         
-        if (!empty($opts['debug'])) {
-            echo "Setting debug Level : {$opts['debug']}\n";
-            DB_DataObject::DebugLevel($opts['debug']);
-        }
-        
+          
         
         // do this first, so the innodb change + utf8 fixes column max sizes
         
@@ -201,6 +202,8 @@ class Pman_Core_UpdateDatabase extends Pman
             return;
         }
         
+        
+
         $this->runUpdateModulesData();
         
         if (!empty($opts['add-company']) && !in_array('Core', $this->disabled)) {
@@ -211,7 +214,7 @@ class Pman_Core_UpdateDatabase extends Pman
         
         $this->runExtensions();
         
-        $this->generateDataobjectsCache();
+        $this->clearApacheDataobjectsCache();
         
          
     }
@@ -938,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();
@@ -1182,11 +1187,16 @@ 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);
+        
+        print_R($response);
+        exit;
         
     }