diegoripley/tippecanoe
1
0
Fork 0
mirror of https://github.com/felt/tippecanoe.git synced 2026-10-02 08:25:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Joining basically works

Browse Source
This commit is contained in:
Eric Fischer
2017-10-10 16:12:40 -07:00
parent face450102
commit 86a4ce67a6
4 changed files with 164 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
csv.cpp
+4 -4
View File
@@ -48,7 +48,7 @@ std::string csv_dequote(std::string s) {
return out;
}
std::string getline(FILE *f) {
std::string csv_getline(FILE *f) {
std::string out;
int c;
while ((c = getc(f)) != EOF) {
@@ -60,7 +60,7 @@ std::string getline(FILE *f) {
return out;
}
void readcsv(char *fn, std::vector<std::string> &header, std::map<std::string, std::vector<std::string>> &mapping) {
void readcsv(const char *fn, std::vector<std::string> &header, std::map<std::string, std::vector<std::string>> &mapping) {
FILE *f = fopen(fn, "r");
if (f == NULL) {
perror(fn);
@@ -68,14 +68,14 @@ void readcsv(char *fn, std::vector<std::string> &header, std::map<std::string, s
}
std::string s;
if ((s = getline(f)).size() > 0) {
if ((s = csv_getline(f)).size() > 0) {
header = csv_split(s.c_str());
for (size_t i = 0; i < header.size(); i++) {
header[i] = csv_dequote(header[i]);
}
}
while ((s = getline(f)).size() > 0) {
while ((s = csv_getline(f)).size() > 0) {
std::vector<std::string> line = csv_split(s.c_str());
if (line.size() > 0) {
line[0] = csv_dequote(line[0]);