Skip to content

Commit 5f97a57

Browse files
committed
CsvJoiner: Use line concept instead
1 parent a26f3f6 commit 5f97a57

1 file changed

Lines changed: 11 additions & 7 deletions

File tree

csv-joiner.html

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ <h3>Input A</h3>
1717
<input type="text" id="input_delimiter_first" size="3" placeholder="\t">
1818
</div>
1919
<div>
20-
<label for="input_has_header_row_first">First row is headers</label>
20+
<label for="input_has_header_row_first">First line is headers</label>
2121
<input type="checkbox" id="input_has_header_row_first">
2222
</div>
2323
<textarea id="input_area_first"></textarea>
@@ -29,7 +29,7 @@ <h3>Input B</h3>
2929
<input type="text" id="input_delimiter_second" size="3" placeholder="\t">
3030
</div>
3131
<div>
32-
<label for="input_has_header_row_second">First row is headers</label>
32+
<label for="input_has_header_row_second">First line is headers</label>
3333
<input type="checkbox" id="input_has_header_row_second">
3434
</div>
3535
<textarea id="input_area_second"></textarea>
@@ -81,7 +81,7 @@ <h3>Join criteria</h3>
8181
<select id="join_criteria_second_table_match_column"></select>
8282
</div>
8383
<div>
84-
<label for="show_line_numbers">Show row numbers</label>
84+
<label for="show_line_numbers">Show line numbers</label>
8585
<input type="checkbox" id="show_line_numbers">
8686
</div>
8787
</div>
@@ -434,17 +434,21 @@ <h3>Joined
434434
}
435435
else {
436436
for (let i = 0; i < datasetLongestRowLength; i++) {
437-
datasetHeadings.push("Column " + tableLabel + i);
437+
datasetHeadings.push("Column " + i);
438438
}
439-
firstRowIsHeaders = true;
440439
}
441440
if(showLineNumbers){
442-
datasetHeadings.push("Row#");
441+
datasetHeadings.push("Line#");
442+
var lineStartNumber = 1;
443+
if(firstRowIsHeaders){
444+
lineStartNumber = 2;
445+
}
443446
for (let i = 0; i < datasetValues.length; i++) {
444-
datasetValues[i].push(i);
447+
datasetValues[i].push(i+lineStartNumber);
445448
}
446449
datasetLongestRowLength += 1;
447450
}
451+
firstRowIsHeaders = true;
448452
var result = {
449453
hasHeadings: firstRowIsHeaders,
450454
headings: datasetHeadings,

0 commit comments

Comments
 (0)