Merge pull request #102 from DanCunnington/issue_66_dynamic_cluster_name

cluster name passed into msg.payload and debug removed in setup function

Author: chughts

services/retrieve_and_rank/v1.html

@@ -78,7 +78,7 @@
 
 <script type="text/x-red" data-help-name="watson-retrieve-rank-create-cluster">
 <p>The IBM Watson™ Retrieve and Rank service combines two information retrieval components in a single service: the power of Apache Solr and a sophisticated machine learning capability. This combination provides users with more relevant results by automatically reranking them by using these machine learning algorithms.</p>
-    <p>The create cluster node provisions a Solr cluster. You can specify the <b>size</b> of the cluster in the node configuration panel. For a small free cluster for testing choose the “Free” option. For more information about cluster sizing, see <a href="http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/retrieve-rank/solr_ops.shtml#sizing">Sizing your Retrieve and Rank cluster</a>. A <b>cluster name</b> can also be specified in the node configuration panel.</p>
+    <p>The create cluster node provisions a Solr cluster. You can specify the <b>size</b> of the cluster in the node configuration panel. For a small free cluster for testing choose the “Free” option. For more information about cluster sizing, see <a href="http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/retrieve-rank/solr_ops.shtml#sizing">Sizing your Retrieve and Rank cluster</a>. A <b>cluster name</b> can be specified in the node configuration panel or passed in on <code>msg.payload</code>. The cluster name specified in the node configuration panel takes priority.</p>
     <p>The cluster will then be created. This takes a short while to complete. When the cluster is available, the status underneath the node will change to <b>“Cluster available”</b>.</p>
     <p>For more information about the Retrieve and Rank service, read the <a href="https://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/retrieve-rank.html">documentation</a>.</p>
 </script>

services/retrieve_and_rank/v1.js

@@ -155,8 +155,12 @@ module.exports = function (RED) {
     this.on('input', function(msg) {
       setupRankRetrieveNode(msg, config, this, function (retrieve_and_rank) {
 
+        //Cluster name can be passed into msg.payload, but the cluster name
+        //specified in the config takes priority
+        var clustername;
+        (config.clustername !== '') ? clustername = config.clustername : clustername = msg.payload;
         var params = {
-          cluster_name: config.clustername,
+          cluster_name: clustername,
           cluster_size: config.clustersize !== 'free' ? config.clustersize : null,
         }
 
@@ -480,7 +484,6 @@ module.exports = function (RED) {
 
     //Check credentials
     this.credentials = RED.nodes.getNode(config.servicecreds);
-    console.log(config);
     username = username || this.credentials.username;
     password = password || this.credentials.password;