From 1441071a867c3d173647a6119b4b470828c46cdc Mon Sep 17 00:00:00 2001
From: Michael Aufreiter <ma@zive.at>
Date: Mon, 20 Jun 2011 12:30:27 +0200
Subject: [PATCH] Number format for CSV output is now adjustable through
 config.json.

---
 public/javascripts/views/sheet.js | 10 +++++-----
 server.js                         |  9 +++++++++
 templates/app.html                |  2 +-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/public/javascripts/views/sheet.js b/public/javascripts/views/sheet.js
index 81c34c4..e1e42cb 100644
--- a/public/javascripts/views/sheet.js
+++ b/public/javascripts/views/sheet.js
@@ -265,7 +265,7 @@ var Sheet = Backbone.View.extend({
   toCSV: function() {
     var that = this;
     function formatValue(text) {
-      return /[";\n]/.test(text)
+      return new RegExp("[\";"+config.csv_separator+"\\n]").test(text)
           ? "\"" + text.replace(/\"/g, "\"\"") + "\""
           : text;
     }
@@ -273,16 +273,16 @@ var Sheet = Backbone.View.extend({
     var res = "";
     // Headers
     properties = this.groupedItems.properties().map(function(p) { return formatValue(p.name); }).values();
-    res += properties.join(';')+"\n";
+    res += properties.join(config.csv_separator)+"\n";
     
     // Items
     this.groupedItems.items().each(function(item) {
       var values = that.groupedItems.properties().map(function(p) {
-        return formatValue(item.get(p.key));
+        return _.include(p.expectedTypes, "number") ? formatValue((item.get(p.key)+"").replace(".", ","))
+                                       : formatValue(item.get(p.key));
       }).values();
-      res += values.join(';')+"\n";
+      res += values.join(config.csv_separator)+"\n";
     });
-    
     return res;
   },
   
diff --git a/server.js b/server.js
index ff64436..f8735a7 100644
--- a/server.js
+++ b/server.js
@@ -284,12 +284,21 @@ function findDatasources(req, callback) {
 }
 
 
+function clientConfig() {
+  return {
+    "number_format": config.number_format,
+    "csv_separator": config.csv_separator
+  };
+}
+
+
 // Routes
 // -----------
 
 app.get('/', function(req, res) {
   html = fs.readFileSync(__dirname+ '/templates/app.html', 'utf-8');
   res.send(html.replace('{{{{seed}}}}', JSON.stringify(seed))
+               .replace('{{{{config}}}}', JSON.stringify(clientConfig()))
                .replace('{{{{session}}}}', JSON.stringify(req.session)));
 });
 
diff --git a/templates/app.html b/templates/app.html
index 8f712c6..61a79ab 100644
--- a/templates/app.html
+++ b/templates/app.html
@@ -7,6 +7,7 @@
     <script>
       var seed = {{{{seed}}}};
       var session = {{{{session}}}};
+      var config = {{{{config}}}};
     </script>
     
     <script type="text/x-ejs-template" name="header">
@@ -54,7 +55,6 @@
       <div class="user-name">
         <%= username %> / <b><%= project_name %></b>
       </div>
-      <!--<input type="text" id="project_name" name="project_name" value="foo"/>-->
     </script>
     
     <script type="text/x-ejs-template" name="browser">