Merge branch 'master' of git.osdn.net:/gitroot/eos/zephyr

[eos/zephyr.git] / server / class / Eos.js

diff --git a/server/class/Eos.js b/server/class/Eos.js
old mode 100644 (file)
new mode 100755 (executable)
index e3fb940..6254e40
--- a/server/class/Eos.js
+++ b/server/class/Eos.js
@@ -1,4 +1,12 @@
+<<<<<<< HEAD
+/**
+ *
+ * Class variables
+ */
+
+=======
 /** * * Class variables */
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
 // include all Eos command's info.
 // For seaching with O(n), the object key name is command name.
 var db = require('./DB.js').instance;
@@ -178,7 +186,10 @@ function validate(command, options, workspaceId) {
 function toExecString(command, options, workspaceId) {
     var ocf = ocfReference[command]; // Array
     var finalOptions = {};
+<<<<<<< HEAD
+=======
     //var execStr = '/Users/hiratakengo/Eos/bin/X86MAC64/'+command + ' ';
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
     var execStr = command + ' ';
     var ocfObj = {};
     ocf.forEach(function(o) {
@@ -269,8 +280,14 @@ function toExecArray(command, options, workspaceId) {
                 var outRegExp = /out|append/;
                 o.arguments.forEach(function(arg, i) {
                     if(ocfObj[o.name].arg[i].formType === 'select') {
+<<<<<<< HEAD
+                        s.push(uuids[arg]);
+                        //s.push(arg);
+                        console.log('input:' + uuids[arg]);
+=======
                         //s.push(uuids[arg]);
                         s.push(arg);
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
                     } else {
                         s.push(arg);
                     }
@@ -302,12 +319,21 @@ function execute(command, optionsArray) {
         if(process.env.NODE_ENV === 'debug') {
             workspace = __dirname + '/../../user-specific-files/workspace.debug';
         } else {
+<<<<<<< HEAD
+            workspace = __dirname + '/../../user-specific-files/workspace';
+=======
             workspace = _dirname + '/../../user-specific-files/workspace';
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
         }
 
         var config = {
             cwd: workspace
         };
+<<<<<<< HEAD
+        var runner = spawn(command,optionsArray,config);
+        //var runner = spawn(command,optionsArray,'/');
+        console.log('spawn');
+=======
         //var runner = spawn('/Users/hiratakengo/Eos/bin/X86MAC64/'+command,optionsArray,config);
         var runner = spawn(command,optionsArray,config);
         //var runner = spawn(command,optionsArray);
@@ -323,6 +349,7 @@ function execute(command, optionsArray) {
        commandRet.stderr.on('data', function (data) {
          console.log('stderr: ' + data);
        });
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
 
         runner.on('close', function() {
             resolve();