From: himetani_cafe <fumifumi@yasunaga-lab.bio.kyutech.ac.jp>
Date: Wed, 3 Feb 2016 22:07:44 +0000 (+0900)
Subject: [Manual test] /api/v1/execution eos.toExecString()
X-Git-Tag: v0.3.0p0038~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a6fbc1477de18a8bc6a726c17a55fe6b75fb480b;p=eos%2Fzephyr.git

[Manual test] /api/v1/execution eos.toExecString()
---

diff --git a/server/api/v1/execution/index.js b/server/api/v1/execution/index.js
index b49e712..a425741 100644
--- a/server/api/v1/execution/index.js
+++ b/server/api/v1/execution/index.js
@@ -23,21 +23,25 @@ router.post('/', function(req, res) {
         var workspace = data.workspace;
 
         eos.validate(command,options, workspace)
-        .then(function(r) {
+                .catch(function(r) {
             var info = {
-                status: 'success',
+                status: 'error',
+                message: r.message
             };
-            console.log('validate success!');
+            console.log(r.message);
             res.send(info);
         })
-        .catch(function(r) {
+        .then(function() {
+            return eos.toExecString(command, options, workspace);
+        })
+        .then(function(execStr) {
+            console.log(execStr);
             var info = {
-                status: 'error',
-                message: r.message
+                status: 'success',
             };
-            console.log(r.message);
             res.send(info);
-        });
+        })
+
     });
 });