Merge pull request #220 from chughts/docfix

Fix to Document Conversion

Author: chughts

README.md

@@ -7,6 +7,10 @@ Node-RED Watson Nodes for IBM Bluemix
 
 <a href="https://cla-assistant.io/watson-developer-cloud/node-red-node-watson"><img src="https://cla-assistant.io/readme/badge/watson-developer-cloud/node-red-node-watson" alt="CLA assistant" /></a>
 
+### New in version 0.4.29
+-  Fix to Document Conversion Node to preserve full msg object
+-  Fix to Language Translator Node train mode documentation
+
 ### New in version 0.4.28
 -  New V1 Experimental Discovery Node
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-node-watson",
-  "version": "0.4.28",
+  "version": "0.4.29",
   "description": "A collection of Node-RED nodes for IBM Watson services",
   "dependencies": {
     "alchemy-api": "^1.3.0",

services/document_conversion/v1.js

@@ -80,13 +80,21 @@ module.exports = function(RED) {
         if (err) {
           node.error(err);
         } else {
-          node.send({
-            'payload': response
-          });
+          msg.payload = response;
+          node.send(msg);
         }
       });
     };
 
+    this.verifyCredentials = function(msg) {
+      if (node && node.username && node.password) {
+        return true;
+      }
+      node.status({fill:'red', shape:'ring', text:'missing credentials'});
+      node.error('Missing Watson Document Conversion API service credentials', msg);
+      return false;
+    };
+
     this.doCall = function(msg) {
       temp.open({
         //suffix: '.docx'
@@ -132,7 +140,9 @@ module.exports = function(RED) {
     };
 
     this.on('input', function(msg) {
-      this.doCall(msg);
+      if (this.verifyCredentials(msg)) {
+        this.doCall(msg);
+      }
     });
   }
   RED.nodes.registerType('convert', ConvertNode);

services/language_translator/v2.html

@@ -146,11 +146,14 @@
     <p></p>
     <p><b>Training Mode</b>.</p>
     <p>This mode enables you to add your own customized model to the Watson Language Translator service. </p>
-    <p>In the Dropbox node, you must specify one ore more of the following file options to customize the training:</p>
+    <p>In <code>msg.payload</code>, (this can be through box, dropbox or a file-inject node.
+       you must specify one of the following file options to customize the training:</p>
     <p>forced_glossary - A UTF-8 encoded TMX file that contains pairs of matching terms in the source and target language that are seen as absolute by the system. This file completely overwrites the original domain data.</p>
     <p>parallel_corpus - A UTF-8 encoded TMX file that contains matching phrases in the source and target language that serve as examples for Watson. Parallel corpora differ from glossaries because they do not overwrite the original domain data.</p>
     <p>monolingual_corpus - A UTF-8 encoded plain text file that contains a body of text in the target language that is related to what you are translating. A monolingual corpus helps improve literal translations to be more fluent and human.</p>
     <p>The Language Translator Node will return the ID of the created customized model.</p>
+    <p<b>Note:</b>As the input file is expected on msg.payload, only one file can be specified. This is
+    an enforced restriction by this Node. The service API allows more than one file to be specified.</p>
     <p></p>
     <p><b>Get Status Mode</b>.</p>
     <p>This mode allows you to get the status of a model sent to training by providing its ID.</p>
@@ -511,7 +514,7 @@
 
       // Flush out the List before repopulating it.
       $('select#node-input-srclang').empty();
-      
+
       input_lang_unique.forEach(function(lang){
         var selectedText = '';
         if (tor.srclang_selected === lang) {

services/language_translator_identify/v2.html

@@ -35,7 +35,7 @@
 </script>
 
 <script type="text/x-red" data-help-name="watson-language-translator-identify">
-    <p>Packaged in with release 0.4.26 of node-red-node-watson</p>
+    <p>Packaged in with release 0.4.29 of node-red-node-watson</p>
     <p>The Watson Language Translator service can be used to identify languages used in a text input. <p>
     <p>Node input : </p>
     <ul>