DataObjects/Core_event_audit.php

[Pman.Core] / UpdateDatabase.php

diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index b35489d..edb09c9 100644 (file)
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -8,9 +8,7 @@ class Pman_Core_UpdateDatabase extends Pman
     
     static $cli_desc = "Update SQL - Beta";
  
-class Pman_Core_RunGenerator extends Pman
-{     
-    
+ 
   
     var $cli = false;
     function getAuth() {
@@ -34,7 +32,10 @@ class Pman_Core_RunGenerator extends Pman
     function get()
     {
         $this->importSQL();
-        
+         
+    }
+    function output() {
+        return '';
     }
      /**
      * imports SQL files from all DataObjects directories....
@@ -43,52 +44,46 @@ class Pman_Core_RunGenerator extends Pman
      */
     function importSQL()
     {
-        $options = &PEAR::getStaticProperty('DB_DataObject','options');
         
         $ff = HTML_Flexyframework::get();
         
-        $url = parse_url($options['database']);
+        $url = parse_url($ff->DB_DataObject['database']);
         // hide stuff for web..
-        $cli = $options['cli'];
-        if (!$cli) {
-            $url['pass'] = '*****';
-            $url['user'] = '*****';
-            $url['host'] = '*****';
-        }
         
         require_once 'System.php';
         $cat = System::which('cat');
         $mysql = System::which('mysql');
-        print_r($options['mods'] );
-        foreach($this->modsql as $m => $fl)
-        {
-            if ($cli && isset($options['database_'. $m])) {
-                $url = parse_url($options['database_'.$m]);
-            }
-            
+        
+        $ar = $this->modulesList();
+        
+           
             $mysql_cmd = $mysql .
                 ' -h ' . $url['host'] .
                 ' -u' . escapeshellarg($url['user']) .
                 (!empty($url['pass']) ? ' -p' . escapeshellarg($url['pass'])  :  '') .
                 ' ' . basename($url['path']);
-           
-            echo $mysql_cmd . "\n" ;
+        echo $mysql_cmd . "\n" ;
+        
+        
+        
+        
+        foreach($ar as $m) {
             
-            if (!empty($options['mods'] ) && !in_array($m,  $options['mods'] )) {
-                continue;
-            }
+            $fd = $this->rootDir. "/Pman/$m/DataObjects";
             
-            foreach($fl as $f) {
-                $fn = $ff->page->rootDir. "/Pman/$m/DataObjects/$f";
-                if (preg_match('/migrate/i', $f)) { // skip migration scripts at present..
+            foreach(glob($fd.'/*.sql') as $fn) {
+                
+                 
+                if (preg_match('/migrate/i', basename($fn))) { // skip migration scripts at present..
                     continue;
                 }
                 
-                $cmd = $cat . ' ' . escapeshellarg($fn) . " | $mysql_cmd -f ";
-                echo $cmd. ($cli ? "\n" : "<BR>\n");
-                if ($cli) {
-                    passthru($cmd);
-                }
+                $cmd = "$mysql_cmd -f < " . escapeshellarg($fn) ;
+                
+                echo $cmd. ($this->cli ? "\n" : "<BR>\n");
+                
+                passthru($cmd);
+            
                 
             }
         }