diff options
Diffstat (limited to 'file.c')
| -rw-r--r-- | file.c | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -864,6 +864,7 @@ int parse_csv_file(const char *filename, int timef, int depthf, int tempf, int p struct tm *timep = NULL; char curdate[DATESTR]; char curtime[TIMESTR]; + int previous; if (timef >= MAXCOLS || depthf >= MAXCOLS || tempf >= MAXCOLS || po2f >= MAXCOLS || cnsf >= MAXCOLS || ndlf >= MAXCOLS || cnsf >= MAXCOLS || stopdepthf >= MAXCOLS || pressuref >= MAXCOLS) return report_error(translate("gettextFromC", "Maximum number of supported columns on CSV import is %d"), MAXCOLS); @@ -877,7 +878,14 @@ int parse_csv_file(const char *filename, int timef, int depthf, int tempf, int p if (try_to_xslt_open_csv(filename, &mem, csvtemplate)) return -1; + previous = dive_table.nr; ret = parse_xml_buffer(filename, mem.buffer, mem.size, &dive_table, (const char **)params); + + // mark imported dives as imported from CSV + for (int i = previous; i < dive_table.nr; i++) + if (same_string(get_dive(i)->dc.model, "")) + get_dive(i)->dc.model = copy_string("Imported from CSV"); + free(mem.buffer); return ret; } |