diff --git a/ancienne-version/app.js b/ancienne-version/app.js index 1b8aa5d..1f69d56 100644 --- a/ancienne-version/app.js +++ b/ancienne-version/app.js @@ -122,7 +122,7 @@ document.getElementById('b-json').onclick=function(){ var out={exporte:new Date().toISOString(),liste:'ma liste pour Romma',nombre:gardees().length,stations:gardees().map(function(s){return {id_romma:s.id_romma,nom:s.nom,commune:s.commune,departement:s.departement,pays:s.pays,altitude_m:s.altitude_m,lat:s.lat,lon:s.lon,statut:s.statut};})}; telecharge('ma-liste-romma-'+stamp()+'.json','application/json',JSON.stringify(out,null,1)); }; -function csvq(v){ v=v==null?'':String(v); return /[";\n,]/.test(v)?'"'+v.replace(/"/g,'""')+'"':v; } +function csvq(v){ v=v==null?'':String(v); if(/^[=+\-@\t\r]/.test(v)&&isNaN(Number(v))) v="'"+v; return /[";\n,]/.test(v)?'"'+v.replace(/"/g,'""')+'"':v; } document.getElementById('b-csv').onclick=function(){ var rows=[['id_romma','nom','commune','departement','pays','altitude_m','lat','lon','statut']].concat(gardees().map(function(s){return [s.id_romma,s.nom,s.commune,s.departement,s.pays,s.altitude_m,s.lat,s.lon,s.statut];})); telecharge('ma-liste-romma-'+stamp()+'.csv','text/csv;charset=utf-8',''+rows.map(function(r){return r.map(csvq).join(',');}).join('\r\n')); diff --git a/app.js b/app.js index 70e0392..163d0fc 100644 --- a/app.js +++ b/app.js @@ -58,7 +58,7 @@ document.getElementById('b-annuler').onclick=function(){ document.getElementById('b-elim').onclick=function(){ vueElim=!vueElim; rafraichir(); }; function gardees(){ return ST.filter(function(s){ return !supprimees[s.id_romma]; }); } document.getElementById('b-csv').onclick=function(){ - function q(v){ v=v==null?'':String(v); return /[",\n]/.test(v)?'"'+v.replace(/"/g,'""')+'"':v; } + function q(v){ v=v==null?'':String(v); if(/^[=+\-@\t\r]/.test(v)&&isNaN(Number(v))) v="'"+v; return /[",\n]/.test(v)?'"'+v.replace(/"/g,'""')+'"':v; } var rows=[['id_romma','nom','commune','departement','altitude_m','lat','lon']].concat(gardees().map(function(s){return [s.id_romma,s.nom,s.commune,s.departement||s.pays,s.altitude_m,s.lat,s.lon];})); var a=document.createElement('a'); a.href=URL.createObjectURL(new Blob(['\ufeff'+rows.map(function(r){return r.map(q).join(',');}).join('\r\n')],{type:'text/csv;charset=utf-8'})); diff --git a/stations-romma-complet.html b/stations-romma-complet.html index 6933d3c..4fa22b9 100644 --- a/stations-romma-complet.html +++ b/stations-romma-complet.html @@ -771,7 +771,7 @@ document.getElementById('b-annuler').onclick=function(){ document.getElementById('b-elim').onclick=function(){ vueElim=!vueElim; rafraichir(); }; function gardees(){ return ST.filter(function(s){ return !supprimees[s.id_romma]; }); } document.getElementById('b-csv').onclick=function(){ - function q(v){ v=v==null?'':String(v); return /[",\n]/.test(v)?'"'+v.replace(/"/g,'""')+'"':v; } + function q(v){ v=v==null?'':String(v); if(/^[=+\-@\t\r]/.test(v)&&isNaN(Number(v))) v="'"+v; return /[",\n]/.test(v)?'"'+v.replace(/"/g,'""')+'"':v; } var rows=[['id_romma','nom','commune','departement','altitude_m','lat','lon']].concat(gardees().map(function(s){return [s.id_romma,s.nom,s.commune,s.departement||s.pays,s.altitude_m,s.lat,s.lon];})); var a=document.createElement('a'); a.href=URL.createObjectURL(new Blob(['\ufeff'+rows.map(function(r){return r.map(q).join(',');}).join('\r\n')],{type:'text/csv;charset=utf-8'}));