Skip to content

Improve writeCsvLine #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 30, 2016
Merged

Improve writeCsvLine #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Improve writeCsvLine
  • Loading branch information
@vinivf
vinivf committed May 30, 2016
commit 668bf86bbc79d16d1ac1197fe6b74dbe5f6eca46
21 changes: 13 additions & 8 deletions xlsxwriter.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,13 @@ protected function initializeSheet($sheet_name)
$sheet->file_writer->write( '<sheetData>');
}

public function writeSheetHeader($sheet_name, array $header_types)
{
if (empty($sheet_name) || empty($header_types) || !empty($this->sheets[$sheet_name]))
public function writeSheetHeader($sheet_name, array $header_types, $format = 'xlsx') {
if (empty($sheet_name) || empty($header_types) || !empty($this->sheets[$sheet_name])) {
return;
}
if ($format == 'csv') {
$this->writeCSVLine($header_types, true);
}

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

public function writeSheetRow($sheet_name, array $row)
{
if (empty($sheet_name) || empty($row))
public function writeSheetRow($sheet_name, array $row, $format = 'xlsx') {
if (empty($sheet_name) || empty($row)) {
return;
}
if ($format == 'csv') {
$this->writeCSVLine($row);
}

self::initializeSheet($sheet_name);
$sheet = &$this->sheets[$sheet_name];
if (empty($sheet->cell_formats))
{
if (empty($sheet->cell_formats)) {
$sheet->cell_formats = array_fill(0, count($row), 'string');
}

Expand Down