Fixed some issues found during unit testing

ixml.js
- line 293 changed const to let ran into reassignment error with const

- changed iXmlNodeSqlParmOpen set io attribute, incorrectly set name attribute before

xmlToJson
- When converting <sql> xmlOut stmt: property would return ']]>' from CDATA output

- Example: "stmt":"SELECT '' AS BLANK, STATE FROM QIWS.QCUSTCDT]]>"

- Not sure if every version of XMLSERVICE adds CDATA to returned statement.

- Added a check to see if the matched success string contains CDATA and replaced extra characters.

iConn.setTimeout()
- could not be set, if condition checked flag instead of seconds

iSql.rowCount()
- added check to allow optional options object

iSql.count()
- called iXmlNodeSqlRowCount instead of iXmlNodeSqlCount

iProd.getProductInfo
- Fixed issue that occured when calling with (productId, cb) signature

- the callback function definition was being appended to the options
  causing the pgm call to fail

Author: abmusse

lib/iprod.js

@@ -168,20 +168,25 @@ class iProd {
     ];
     if(!cb) {  // If we do not get the third param,
       if(option) {  // If we get two params,
-        if(xt.getClass(option) == "Function")   // If it is a function, 
+        if(xt.getClass(option) == "Function"){   // If it is a function, 
           cb = option;						// then it is the callback.
+          option = "0000";
+        }  
       }
       else {					// If we have only one param,
         option = "0000";	// then use *BASE as default.
       }
 
     }
-    if(option < 0 || option > 99)
-      option = "0000";
-    else if(option < 10)
-      option = "000" + option;
-    else option = "00" + option;
-    
+    if(Number.isInteger(option)) {
+      if(option < 0 || option > 99)
+        option = "0000";
+      else if(option < 10)
+        option = "000" + option;
+      else
+        option = "00" + option;
+    }
+
     let ProdInfo = [
       [prodID, "7A"],
       ["*ONLY", "6A"],

lib/itoolkit.js

@@ -137,8 +137,14 @@ const xmlToJson = (xml) => {
       let sucFlag = sqlData[i].match(successReg);
       if(sucFlag && sucFlag.length > 0) {
         rs.success = true;
-        if(sucFlag.length > 1)
-          rs.stmt = sucFlag[1];
+        if(sucFlag.length > 1){
+          if(sucFlag[0].includes('![CDATA')){
+            let fixed = sucFlag[1].replace(/]]>/, '');
+            rs.stmt = fixed;
+          } else{
+            rs.stmt = sucFlag[1];
+          }
+        }
       }
       else {
         rs.success = false;
@@ -224,7 +230,7 @@ class iConn {
   }
   // setTimeout() override the default timeout value for sync mode.
   setTimeout(seconds) {
-    if(__getClass(flag) == "Number")
+    if(__getClass(seconds) == "Number")
       this.timeout = seconds * 1000;
   }
   // debug() get current verbose mode or enable/disable verbose mode for debugging.
@@ -535,11 +541,14 @@ class iSql {
   }
 
   rowCount(options) {
-    this.xml += i_xml.iXmlNodeSqlRowCount(options.action, options.error);
+    if(options && options.error)
+      this.xml += i_xml.iXmlNodeSqlRowCount(options.error);
+    else
+      this.xml += i_xml.iXmlNodeSqlRowCount();
   }
 
   count(options) {
-    this.xml += i_xml.iXmlNodeSqlRowCount(options.desc, options.error);
+    this.xml += i_xml.iXmlNodeSqlCount(options.desc, options.error);
   }
 
   describe(options) {

lib/ixml.js

@@ -289,7 +289,7 @@ const iXmlNodeSqlConnect = (db, uid, pwd, option_label) => {
 }
 
 const iXmlNodeSqlOptions = (options) => {
-  const iXml = iXmlNodeOpen(I_XML_NODE_SQL_OPTIONS_OPEN);
+  let iXml = iXmlNodeOpen(I_XML_NODE_SQL_OPTIONS_OPEN);
   for(const i in options)
 	 iXml += iXmlAttrDefault(options[i].desc, options[i].value, I_XML_ATTR_VALUE_OPTIONAL);
   return iXml + I_XML_NODE_CLOSE + I_XML_NODE_SQL_OPTIONS_CLOSE;
@@ -332,7 +332,7 @@ const iXmlNodeSqlExecuteClose = () => {
 
 const iXmlNodeSqlParmOpen = (xio) => {
   return iXmlNodeOpen(I_XML_NODE_PARM_OPEN)
-          + iXmlAttrDefault(I_XML_ATTR_KEY_NAME,xio,I_XML_ATTR_VALUE_OPTIONAL)
+          + iXmlAttrDefault(I_XML_ATTR_KEY_IO,xio,I_XML_ATTR_VALUE_OPTIONAL)
           + I_XML_NODE_CLOSE;
 }