From: Edward <edward@roojs.com>
Date: Mon, 18 Mar 2013 03:11:27 +0000 (+0800)
Subject: ExcelToJson.php
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=7fc3d400d46a01193591dd7c867c1b23b1e4351a

ExcelToJson.php
---

diff --git a/ExcelToJson.php b/ExcelToJson.php
index bce3a6ea..aee5e287 100644
--- a/ExcelToJson.php
+++ b/ExcelToJson.php
@@ -50,15 +50,37 @@ class Pman_Core_ExcelToJson extends Pman_Roo
             if(!array_filter($n)){
                 $header = true;
             }
+            
             if(!$header){
                $rows[$n[0]] = $n[1];
                continue;
             }
-            foreach($n as $k) {
-                $cols[] = strtoupper(trim($k));
+            
+            if(!$cols){
+                $cols = array();
+                foreach($n as $k) {
+                    $cols[] = strtoupper(trim($k));
+                }
+
+                if (empty($cols)) {
+                    continue;
+                }
+                foreach($req as $r) {
+                    if (!in_array($r,$cols)) {
+                        $cols = false;
+                        break;
+                    }
+                }
+                continue;
+            }
+            
+            foreach($cols as $i=>$k) {
+                $row[$k] = $n[$i];
             }
+            $rows[] = $row;
+            
         }
-        exit;
+        
         if (empty($cols)) {
             $this->jerr("could not find a row with " . implode(' / ', $req));
         }