Skip to content

Commit 05cf642

Browse files
committed
Merge pull request #6 from ebanx/feature/improve-write-to-csv
Improve writeCsvLine
2 parents c72c4af + 668bf86 commit 05cf642

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

xlsxwriter.class.php

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,13 @@ protected function initializeSheet($sheet_name)
137137
$sheet->file_writer->write( '<sheetData>');
138138
}
139139

140-
public function writeSheetHeader($sheet_name, array $header_types)
141-
{
142-
if (empty($sheet_name) || empty($header_types) || !empty($this->sheets[$sheet_name]))
140+
public function writeSheetHeader($sheet_name, array $header_types, $format = 'xlsx') {
141+
if (empty($sheet_name) || empty($header_types) || !empty($this->sheets[$sheet_name])) {
143142
return;
143+
}
144+
if ($format == 'csv') {
145+
$this->writeCSVLine($header_types, true);
146+
}
144147

145148
self::initializeSheet($sheet_name);
146149
$sheet = &$this->sheets[$sheet_name];
@@ -156,15 +159,17 @@ public function writeSheetHeader($sheet_name, array $header_types)
156159
$this->current_sheet = $sheet_name;
157160
}
158161

159-
public function writeSheetRow($sheet_name, array $row)
160-
{
161-
if (empty($sheet_name) || empty($row))
162+
public function writeSheetRow($sheet_name, array $row, $format = 'xlsx') {
163+
if (empty($sheet_name) || empty($row)) {
162164
return;
165+
}
166+
if ($format == 'csv') {
167+
$this->writeCSVLine($row);
168+
}
163169

164170
self::initializeSheet($sheet_name);
165171
$sheet = &$this->sheets[$sheet_name];
166-
if (empty($sheet->cell_formats))
167-
{
172+
if (empty($sheet->cell_formats)) {
168173
$sheet->cell_formats = array_fill(0, count($row), 'string');
169174
}
170175

0 commit comments

Comments
 (0)