Agrego stringizeStats() para #23

codenautas · Nov 7, 2016 · d3e0a54 · d3e0a54
1 parent 4d2c532
commit d3e0a54
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 13 deletions.
diff --git a/bin/fast.js b/bin/fast.js
@@ -129,7 +129,7 @@ function doFast(params, inputBase, fastBufferingThreshold, outputStream) {
                 fastFinalize(info, outStream);
             }
             rl.preparedResult = preparedResult;
-            rl.stats = txtToSql.generateStats(info).stats;
+            rl.stats = txtToSql.finalizeStats(info).stats;
             outStream.end();
         });
         return streamToPromise(rl);

diff --git a/bin/txt-to-sql-run.js b/bin/txt-to-sql-run.js
@@ -156,8 +156,7 @@ Promises.start(function() {
                     return writeConfigYaml(createParams(params, result.preparedResult), inputBase+'.yaml');
                 }).then(function() {
                     process.stdout.write("Generated '"+inputBase+".sql'");
-                    // WARN: implicit string conversion of result.stats!
-                    process.stdout.write("\n"+result.stats);
+                    process.stdout.write("\n"+txtToSql.stringizeStats(result.stats));
                 });
             } else if (cmdParams.prepare) {
                 return doPrepare(params, inputYaml);

diff --git a/lib/txt-to-sql.js b/lib/txt-to-sql.js
@@ -662,11 +662,14 @@ function initializeStats(info) {
     return info;
 }
 
-function generateStats(info) {
-    info.stats = JSON.stringify(info.stats);
+function finalizeStats(info) {
     return info;
 }
 
+function stringizeStats(stats) {
+    return JSON.stringify(stats);
+}
+
 function generateScripts(info){
     return Promise.resolve(info)
     .then(initializeStats)
@@ -677,7 +680,7 @@ function generateScripts(info){
     .then(removeIgnoredLines)
     .then(generateInsertScript)
     .then(processOutputBuffer)
-    .then(generateStats)
+    .then(finalizeStats)
     .catch(catchErrors.bind(null, info));
 }
 
@@ -714,7 +717,8 @@ txtToSql.createInsertInto = createInsertInto;
 txtToSql.createInsertValues = createInsertValues;
 txtToSql.generatePrepareResult = generatePrepareResult;
 txtToSql.initializeStats = initializeStats;
-txtToSql.generateStats = generateStats;
+txtToSql.finalizeStats = finalizeStats;
+txtToSql.stringizeStats = stringizeStats;
 
 txtToSql.engines = engines;
 

diff --git a/src/txt-to-sql.jade b/src/txt-to-sql.jade
@@ -96,6 +96,7 @@ html(lang=lang)
             cn:'NotaciónCientífica'
           },
           step3:'Paso 3: ',
+          step4:'Estadísticas: ',
           download:'descargar',
       },
       en:{
@@ -127,6 +128,7 @@ html(lang=lang)
             cn:'CientificNotation'
           },
           step3:'Step 3: ',
+          step4:'Statistics: ',
           download:'download',
       }
     }[window.lang||'es'];
@@ -255,13 +257,13 @@ html(lang=lang)
                 elems.push(html.span('  warning(s): '+generated.warnings.join(', ')).create())
             }
             addStep(messages.step3, elems);
+            addStep(messages.step4, stringizeStats(generated.stats));
         }).catch(function(err){
             errMessage.textContent=err.message;
         });
     }
     function handlePrepare(event){
         var files = getID('inputFile').files;
-        //var files = event.target.files; // FileList object
         resetPage();
         Array.prototype.forEach.call(files, function(file){
             console.log('file: '+file.name)
@@ -324,6 +326,7 @@ html(lang=lang)
                                             butGenerate
                                         ]).create()]);
                errMessage.textContent=""; // if all goes ok, clear' em
+               delete getID('inputFile').files;
             }).catch(function(err){
                 errMessage.textContent=err.message+"\n"+err.stack;
             });

diff --git a/web/txt-to-sql.html b/web/txt-to-sql.html
@@ -41,6 +41,7 @@
         cn:'NotaciónCientífica'
       },
       step3:'Paso 3: ',
+      step4:'Estadísticas: ',
       download:'descargar',
   },
   en:{
@@ -72,6 +73,7 @@
         cn:'CientificNotation'
       },
       step3:'Step 3: ',
+      step4:'Statistics: ',
       download:'download',
   }
 }[window.lang||'es'];
@@ -200,13 +202,13 @@
             elems.push(html.span('  warning(s): '+generated.warnings.join(', ')).create())
         }
         addStep(messages.step3, elems);
+        addStep(messages.step4, stringizeStats(generated.stats));
     }).catch(function(err){
         errMessage.textContent=err.message;
     });
 }
 function handlePrepare(event){
     var files = getID('inputFile').files;
-    //var files = event.target.files; // FileList object
     resetPage();
     Array.prototype.forEach.call(files, function(file){
         console.log('file: '+file.name)
@@ -269,6 +271,7 @@
                                         butGenerate
                                     ]).create()]);
            errMessage.textContent=""; // if all goes ok, clear' em
+           delete getID('inputFile').files;
         }).catch(function(err){
             errMessage.textContent=err.message+"\n"+err.stack;
         });

diff --git a/web/txt-to-sql.js b/web/txt-to-sql.js
@@ -662,11 +662,14 @@ function initializeStats(info) {
     return info;
 }
 
-function generateStats(info) {
-    info.stats = JSON.stringify(info.stats);
+function finalizeStats(info) {
     return info;
 }
 
+function stringizeStats(stats) {
+    return JSON.stringify(stats);
+}
+
 function generateScripts(info){
     return Promise.resolve(info)
     .then(initializeStats)
@@ -677,7 +680,7 @@ function generateScripts(info){
     .then(removeIgnoredLines)
     .then(generateInsertScript)
     .then(processOutputBuffer)
-    .then(generateStats)
+    .then(finalizeStats)
     .catch(catchErrors.bind(null, info));
 }
 
@@ -714,7 +717,8 @@ txtToSql.createInsertInto = createInsertInto;
 txtToSql.createInsertValues = createInsertValues;
 txtToSql.generatePrepareResult = generatePrepareResult;
 txtToSql.initializeStats = initializeStats;
-txtToSql.generateStats = generateStats;
+txtToSql.finalizeStats = finalizeStats;
+txtToSql.stringizeStats = stringizeStats;
 
 txtToSql.engines = engines;