DataObjects/Core_watch.php

[Pman.Core] / SimpleExcel.php

diff --git a/SimpleExcel.php b/SimpleExcel.php
index f73f091..0aef6e1 100644 (file)
--- a/SimpleExcel.php
+++ b/SimpleExcel.php
@@ -71,7 +71,7 @@ class Pman_Core_SimpleExcel extends Pman
         $cfg['formats'] = isset($cfg['formats']) ? $cfg['formats'] : array();
         
         foreach($cfg['formats'] as $f=>$fcfg) {
-            $formats[$f] = (array) $fcfg;
+            
             $formats[$f] = & $workbook->addFormat();
             foreach((array)$fcfg as $k=>$v) {
                 $formats[$f]->{'set' . $k}($v);
@@ -122,11 +122,25 @@ class Pman_Core_SimpleExcel extends Pman
         // copy the config and alias so that book can be written to..
         $this->worksheet_cfg[$cfg['workbook']] = &$cfg;
         
-        $this->formats = $formats;
+        
+        //$this->formats = (array)$formats;
         
         if (isset($cfg['formats']) && empty($formats)) {
-            $this->formats = $cfg['formats'];
+            
+            foreach($cfg['formats'] as $f=>$fcfg) {
+                
+                $formats[$f] = & $workbook->addFormat();
+                foreach((array)$fcfg as $k=>$v) {
+                    $formats[$f]->{'set' . $k}($v);
+                }
+                 
+            }
+            
+            $this->formats = $formats;
         }
+        
+        
+        
         //var_dump($cfg['workbook']);
 
         $worksheet =  $workbook->addWorksheet($cfg['workbook']);
@@ -238,7 +252,7 @@ class Pman_Core_SimpleExcel extends Pman
     {
         $cfg        = $this->worksheet_cfg[$worksheet_name];
         $start_row  = $this->start_row;
-        $formats    = $this->formats;
+        $formats    = (array)$this->formats;
         $worksheet  = $this->worksheet;
         
         $hasRender   = false;
@@ -283,6 +297,9 @@ class Pman_Core_SimpleExcel extends Pman
             $v = @iconv('UTF-8', 'UTF-8//IGNORE', $v);
             
             $dataFormat = empty($col_cfg['dataFormat']) ? '' : $col_cfg['dataFormat'];
+             ;
+            
+            
             $format = isset($col_cfg['format'])  && isset($formats[$col_cfg['format']] )   ? $formats[$col_cfg['format']] : false;
           //  print_R(array($start_row+$r, $c, $v, $format));exit;
           // handle 0 prefixes..