rename variable
This commit is contained in:
parent
0a0e4af8b3
commit
a454e215eb
|
|
@ -4,7 +4,6 @@
|
||||||
|
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
|
|
||||||
|
|
||||||
namespace usql {
|
namespace usql {
|
||||||
|
|
||||||
CsvReader::CsvReader(bool skip_hdr, char field_sep, char quote_ch, char line_sep, char line_sep2) {
|
CsvReader::CsvReader(bool skip_hdr, char field_sep, char quote_ch, char line_sep, char line_sep2) {
|
||||||
|
|
@ -34,11 +33,11 @@ int CsvReader::parseCSV(const std::string &filename, std::vector<ColDefNode> &co
|
||||||
std::vector<std::string> line;
|
std::vector<std::string> line;
|
||||||
line.reserve(32);
|
line.reserve(32);
|
||||||
|
|
||||||
std::fstream newfile;
|
std::fstream data_file;
|
||||||
newfile.open(filename, std::ios::in);
|
data_file.open(filename, std::ios::in);
|
||||||
/// if (newfile.is_open()){ //checking whether the file is open
|
/// if (newfile.is_open()){ //checking whether the file is open
|
||||||
|
|
||||||
while (getline(newfile, csvSource)) {
|
while (getline(data_file, csvSource)) {
|
||||||
if (skip_header && !header_skiped) {
|
if (skip_header && !header_skiped) {
|
||||||
header_skiped = true;
|
header_skiped = true;
|
||||||
continue;
|
continue;
|
||||||
|
|
@ -70,11 +69,11 @@ int CsvReader::parseCSV(const std::string &filename, std::vector<ColDefNode> &co
|
||||||
field.clear();
|
field.clear();
|
||||||
line.clear();
|
line.clear();
|
||||||
// DEBUG
|
// DEBUG
|
||||||
// if (row_cnt > 10000) break;
|
// if (row_cnt > 50000) break;
|
||||||
//
|
//
|
||||||
}
|
}
|
||||||
|
|
||||||
newfile.close();
|
data_file.close();
|
||||||
|
|
||||||
return row_cnt;
|
return row_cnt;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue