griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: CSV import node ignores last character of some columns

Browse Source
This commit is contained in:
Hans Goudey
2025-02-17 20:14:42 -05:00
parent 17f3dc3bde
commit b62ba4af33
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/io/csv/importer/csv_reader.cc
View File

@@ -39,8 +39,7 @@ static Vector<StringRef> parse_column_names(const StringRef line)
delim_index = line.find_first_of(delim, delim_index + 1);
}
/* Handle last cell, --end because the end in StringRef is one_after_ern */
columns.append_as(cell_start, --end);
columns.append_as(cell_start, end);
return columns;
}
@@ -87,8 +86,7 @@ static bool get_column_types(const StringRef line, Vector<eCustomDataType> &colu
delim_index = line.find_first_of(delim, delim_index + 1);
}
/* Handle last cell, --end because the end in StringRef is one_after_ern */
std::optional<eCustomDataType> column_type = get_column_type(cell_start, --end);
std::optional<eCustomDataType> column_type = get_column_type(cell_start, end);
if (!column_type.has_value()) {
return false;
}
@@ -192,9 +190,7 @@ static void parse_csv_line(const Span<GMutableSpan> data,
delim_index = line.find_first_of(delim, delim_index + 1);
}
/* Handle last cell, --end because the end in StringRef is one_after_ern */
parse_csv_cell(
data, types, column_names, row_index, col_index, cell_start, --end, import_params);
parse_csv_cell(data, types, column_names, row_index, col_index, cell_start, end, import_params);
}
static void parse_csv_data(const Span<GMutableSpan> data,