c/xlsxio
1
0
Fork 0
mirror of https://github.com/brechtsanders/xlsxio synced 2025-03-28 21:13:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

-

Browse Source
This commit is contained in:
Brecht Sanders 2024-05-25 18:04:42 +02:00
parent fd58301412
commit f008507901
3 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Changelog.txt
View File

@ -1,3 +1,8 @@
0.2.36
* fixed CMakeLists.txt to use EXPAT_INCLUDE_DIR instead of EXPAT_INCLUDE_DIRS (#108)
* added -u option to xlsxio_xlsx2csv to use sheet numbers instead of sheet names (#118)
0.2.35
2023-08-03 Brecht Sanders https://github.com/brechtsanders/

2
include/xlsxio_version.h
View File

@ -49,7 +49,7 @@ THE SOFTWARE.
/*! \brief minor version number */
#define XLSXIO_VERSION_MINOR 2
/*! \brief micro version number */
#define XLSXIO_VERSION_MICRO 35
#define XLSXIO_VERSION_MICRO 36
/*! @} */
/*! \cond PRIVATE */

31
src/xlsxio_xlsx2csv.c
View File

@ -31,8 +31,8 @@ struct xlsx_data {
xlsxioreader xlsxioread;
FILE* dst;
int nobom;
int numbers;
int file_count;
int sheetnumbers;
int sheetcount;
const char* newline;
char separator;
char quote;
@ -78,28 +78,17 @@ int xlsx_list_sheets_callback (const char* name, void* callbackdata)
char* filename;
struct xlsx_data* data = (struct xlsx_data*)callbackdata;
//determine output file
if ((filename = (char*)malloc(strlen(data->filename) + strlen(name) + 6)) == NULL ){
if ((filename = (char*)malloc(strlen(data->filename) + (data->sheetnumbers ? 16 : strlen(name)) + 6)) == NULL ){
fprintf(stderr, "Memory allocation error\n");
} else {
char str[16];
if (data->numbers)
{
//Vs writing the sheetname, this will write the number of the sheet !
snprintf(str, sizeof(str), "%d", data->file_count++);
}
data->sheetcount++;
//determine export filename
strcpy(filename, data->filename);
strcat(filename, ".");
if (data->numbers)
strcat(filename, str);
if (data->sheetnumbers)
itoa(data->sheetcount, filename + strlen(filename), 10);
else
strcat(filename, name);
strcat(filename, ".csv");
//display status
printf("Sheet found: %s, exporting to: %s\n", name, filename);
@ -130,7 +119,7 @@ void show_help ()
" -s separator\tspecify separator to use (default is comma)\n"
" -b \tdon't write UTF-8 BOM signature\n"
" -n \tuse UNIX style line breaks\n"
" -u \toutput sheet number instead of sheet name\n"
" -u \tuse sheet number in output file name (instead of sheet name)\n"
" xlsxfile \tpath to .xlsx file (multiple may be specified)\n"
"Description:\n"
"Converts all sheets in all specified .xlsx files to individual CSV (Comma Separated Values) files.\n"
@ -146,8 +135,8 @@ int main (int argc, char* argv[])
xlsxioreader xlsxioread;
struct xlsx_data sheetdata = {
.nobom = 0,
.numbers = 0,
.file_count = 1,
.sheetnumbers = 0,
.sheetcount = 0,
.newline = "\r\n",
.separator = ',',
.quote = '"',
@ -179,7 +168,7 @@ int main (int argc, char* argv[])
sheetdata.nobom = 1;
continue;
case 'u' :
sheetdata.numbers = 1;
sheetdata.sheetnumbers = 1;
continue;
case 'n' :
sheetdata.newline = "\n";