Merge pull request #11 from kmpm/feature-commadecimal

Support for decimal comma

index.html

@@ -33,6 +33,11 @@ <h3>Settings</h3>
              <label><input class="settingsElement" type="radio" name="delimiter" id='delimiterComma'  value="comma" /> Comma</label>
              <label><input class="settingsElement" type="radio" name="delimiter" id='delimiterTab'    value="tab" /> Tab</label>
             </p>
+          <p>Decimal Sign:
+
+             <label><input class="settingsElement" type="radio" name="decimal" id='decimalDot'   value="dot" checked/> Dot</label>
+             <label><input class="settingsElement" type="radio" name="decimal" id='decimalComma'  value="comma" /> Comma</label>
+            </p>
           <p><label><input class="settingsElement" type="checkbox" name="" value="" id="headersProvidedCB" checked /> First row is the header</label></p>
           <div class="settingsGroup">
             <p>Transform: <label><input class="settingsElement" type="radio" name="headerModifications" value="downcase" id='headersDowncase' /> downcase</label>

js/CSVParser.js

@@ -7,6 +7,8 @@
 //  CSV Parsing Function from Ben Nadel, http://www.bennadel.com/blog/1504-Ask-Ben-Parsing-CSV-Strings-With-Javascript-Exec-Regular-Expression-Command.htm
 
 
+var isDecimal_re     = /^\s*(\+|-)?((\d+([,\.]\d+)?)|([,\.]\d+))\s*$/;
+
 var CSVParser = {
 
   //---------------------------------------
@@ -26,7 +28,7 @@ var CSVParser = {
   //---------------------------------------
   //var parseOutput = CSVParser.parse(this.inputText, this.headersProvided, this.delimiter, this.downcaseHeaders, this.upcaseHeaders);
 
-  parse: function (input, headersIncluded, delimiterType, downcaseHeaders, upcaseHeaders) {
+  parse: function (input, headersIncluded, delimiterType, downcaseHeaders, upcaseHeaders, decimalSign) {
 
     var dataArray = [];
 
@@ -127,6 +129,10 @@ var CSVParser = {
       var numInts = 0;
       for (var r=0; r < numRowsToTest; r++) {
         if (dataArray[r]) {
+          //replace comma with dot if comma is decimal separator
+          if(decimalSign='comma' && isDecimal_re.test(dataArray[r][i])){
+            dataArray[r][i] = dataArray[r][i].replace(",", ".");
+          }
           if (CSVParser.isNumber(dataArray[r][i])) {
             numInts++
             if (String(dataArray[r][i]).indexOf(".") > 0) {

js/Controller.js

@@ -67,6 +67,7 @@ $(document).ready(function(){
     }
 
     d.delimiter = $('input[name=delimiter]:checked').val();
+    d.decimal = $('input[name=decimal]:checked').val();
 
     d.useUnderscores = true;