X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=ExcelToJson.php;h=e981d32901cb7910e25123b2dcd4a4f95dc6b694;hp=b7b0525e498efb7fff16ae22ed0d5ae7666f9665;hb=443623f47935eb52acd65a3ff0d84eab1fd5a98b;hpb=31bcfef7a4b610803704b136f9acfd7c529d7083 diff --git a/ExcelToJson.php b/ExcelToJson.php index b7b0525e..e981d329 100644 --- a/ExcelToJson.php +++ b/ExcelToJson.php @@ -12,7 +12,7 @@ class Pman_Core_ExcelToJson extends Pman_Roo return parent::getAuth(); } - function post() + function post($v) { $this->transObj = DB_DataObject::Factory('invhist_transfer'); @@ -29,10 +29,10 @@ class Pman_Core_ExcelToJson extends Pman_Roo require_once 'File/Convert.php'; $fc = new File_Convert($img->getStoreName(), $img->mimetype ); - $csv = $fc->convert('text/csv'); - $ret = $this->importCsv($csv); + $csv = $fc->convert('text/csv'); + $ret = $this->importCsv($csv); - print_R($ret);exit; + $this->jdata($ret['data'], false, isset($ret['extra']) ? $ret['extra'] : array() ); @@ -54,7 +54,7 @@ class Pman_Core_ExcelToJson extends Pman_Roo $extra = array(); while(false !== ($n = fgetcsv($fh,10000, ',', '"'))) { - var_dump($n); + if(!strlen(trim(implode('', $n)))){ // blank line; if ($header) { @@ -91,8 +91,7 @@ class Pman_Core_ExcelToJson extends Pman_Roo } fclose($fh); - $ret = array('extra' => $extra, 'data' => $rows); - echo 'about to return?';print_R($ret);exit; + return array('extra' => $extra, 'data' => $rows);; }