DataObjects/Core_domain.php

[Pman.Core] / UpdateDatabase.php

diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index 24a8b95..9176712 100644 (file)
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -131,8 +131,16 @@ class Pman_Core_UpdateDatabase extends Pman
     {
         PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, array($this, 'onPearError'));
    
+        $this->checkSystem();
+   
         $ff = HTML_FlexyFramework::get();
         
+        if(!empty($ff->Core_Notify)){
+            require_once 'Pman/Core/NotifySmtpCheck.php';
+            $x = new Pman_Core_NotifySmtpCheck();
+            $x->check();
+        }
+        
         $this->disabled = explode(',', $ff->disable);
         
         //$this->fixSequencesPgsql();exit;
@@ -390,11 +398,50 @@ class Pman_Core_UpdateDatabase extends Pman
                     continue;
                 }
                 
-                $cmd = "$mysql_cmd -f < " . escapeshellarg($fn) ;
+                $cmd = "$mysql_cmd -f < " . escapeshellarg($fn) ." 2>&1" ;
                 
                 echo basename($dir).'/'. basename($fn) .    '::' .  $cmd. ($this->cli ? "\n" : "<BR>\n");
                 
-                passthru($cmd);
+                
+                $fp = popen($cmd, "r"); 
+                while(!feof($fp)) 
+                { 
+                    // send the current file part to the browser 
+                    $line = trim(fgets($fp, 1024));
+                    if (empty($line)) {
+                        continue;
+                    }
+                    $matches = array();
+                    if (!preg_match('/^ERROR\s+([0-9]+)/', $line, $matches)) {
+                        echo " ---- {$line}\n"; flush();
+                        continue;
+                    }
+                    $continue =0;
+                    switch($matches[1]) {
+                        case 1017: // cause by renaming table -- old one does not exist..
+                        case 1050: // create tables triggers this..
+                        case 1060: //    Duplicate column name
+                        case 1061: // Duplicate key name - triggered by add index.. but could hide error. - unlikely though.
+                        case 1091: // drop index -- name does not exist.. might hide errors..
+                        
+                        case 1146: // drop a index on an unknown table.. - happens rarely...
+                        case 1054: // Unknown column -- triggered by CHANGE COLUMN - but may hide other errrors..
+                            $continue = 1;
+                            break;
+                        
+                    }
+                    if ($continue) {
+                        echo " ---- {$line}\n"; flush();
+                        continue;
+                    }
+                    // real errors...
+                    // 1051: // Unknown table -- normally drop = add iff exists..
+                    echo "File: $fn\n$line\n";
+                    exit;
+                    
+                    
+                } 
+                
             
                 
         }
@@ -770,6 +817,7 @@ class Pman_Core_UpdateDatabase extends Pman
             }
             if ($update) {
                 $cm->update($old);
+                echo "email: {$name} - checked\n";
                 continue; /// we do not import the body content of templates that exist...
             } else {
                 $cm->insert();
@@ -780,15 +828,17 @@ class Pman_Core_UpdateDatabase extends Pman
             
             $opts = array(
                 'update' => 1,
-                'file' => $mail_template_dir. $name .'.html'
+                'file' => $templateDir. $name .'.html'
             );
             
             if (!empty($data['master'])) {
-                $opts['master'] = $mail_template_dir . $master .'.html';
+                $opts['master'] = $templateDir . $master .'.html';
             }
             require_once 'Pman/Core/Import/Core_email.php';
             $x = new Pman_Core_Import_Core_email();
             $x->get('', $opts);
+            
+            echo "email: {$name} - CREATED\n";
         }
     }
     
@@ -954,4 +1004,63 @@ class Pman_Core_UpdateDatabase extends Pman
         }
         
     }
+    
+    
+    function checkSystem()
+    {
+        // most of these are from File_Convert...
+        
+        // these are required - and have simple dependancies.
+        require_once 'System.php';
+        $req = array( 
+            'convert',
+            'grep',
+            'pdfinfo',
+            'pdftoppm',
+            'rsvg-convert',  //librsvg2-bin
+            'strings',
+        );
+         
+         
+         
+        // these are prefered - but may have complicated depenacies
+        $pref= array(
+            'abiword',
+            'faad',
+            'ffmpeg',
+            'html2text', // not availabe in debian squeeze
+            'pdftocairo',  //poppler-utils - not available in debian squeeze.
+
+            'lame',
+            'ssconvert',
+            'unoconv',
+            'wkhtmltopdf',
+            'xvfb-run',
+        );
+        $res = array();
+        $fail = false;
+        foreach($req as $r) {
+            if (!System::which($r)) {
+                $res[] = $r;
+            }
+            $fail = true;
+        }
+        if ($res) {
+            $this->jerr("Missing these programs - need installing\n" . implode("\n",$res));
+        }
+        foreach($pref as $r) {
+            if (!System::which($r)) {
+                $res[] = $r;
+            }
+            $fail = true;
+        }
+        if ($res) {
+            echo "WARNING: Missing these programs - they may need installing\n". implode("\n",$res);
+            sleep(5);
+        }
+        
+        
+    }
+    
+    
 }
\ No newline at end of file