Merge pull request #207 from kildem/development

fix compatibility with node v0.12
jaystack · Jun 12, 2015 · 73a412e · 73a412e
2 parents b239b99 + a7a2704
commit 73a412e
Showing 1 changed file with 20 additions and 15 deletions.
diff --git a/JaySvcUtil/JaySvcUtil.js b/JaySvcUtil/JaySvcUtil.js
@@ -275,21 +275,26 @@ $data.Class.define('$data.MetadataLoaderClass', null, null, {
 
             return resultDocument.textContent;
         } else if (typeof module !== 'undefined' && typeof require !== 'undefined') {
-            var xslt = require('node_xslt');
-
-            return xslt.transform(xslt.readXsltString(transformXslt), xslt.readXmlString(metadata), [
-                'SerivceUri', "'" + cnf.SerivceUri + "'",
-                'EntityBaseClass', "'" + cnf.EntityBaseClass + "'",
-                'ContextBaseClass', "'" + cnf.ContextBaseClass + "'",
-                'AutoCreateContext', "'" + cnf.AutoCreateContext + "'",
-                'ContextInstanceName', "'" + cnf.ContextInstanceName + "'",
-                'EntitySetBaseClass', "'" + cnf.EntitySetBaseClass + "'",
-                'CollectionBaseClass', "'" + cnf.CollectionBaseClass + "'",
-                'DefaultNamespace', "'" + cnf.DefaultNamespace + "'",
-                'MaxDataserviceVersion', "'" + (versionInfo.maxVersion || '3.0') + "'",
-                'AllowedTypesList', "'" + cnf.typeFilter + "'",
-                'GenerateNavigationProperties', "'" + cnf.navigation + "'"
-            ]);
+            var xslt4node = require('xslt4node');
+            var config = {
+              xslt: transformXslt,
+              source: metadata,
+              result: String,
+              params: {
+                'SerivceUri': cnf.SerivceUri,
+                 'EntityBaseClass': cnf.EntityBaseClass ,
+                 'ContextBaseClass': cnf.ContextBaseClass ,
+                 'AutoCreateContext': cnf.AutoCreateContext ,
+                 'ContextInstanceName': cnf.ContextInstanceName ,
+                 'EntitySetBaseClass': cnf.EntitySetBaseClass ,
+                 'CollectionBaseClass': cnf.CollectionBaseClass ,
+                 'DefaultNamespace': cnf.DefaultNamespace ,
+                 'MaxDataserviceVersion': (versionInfo.maxVersion || '3.0') ,
+                 'AllowedTypesList': cnf.typeFilter ,
+                 'GenerateNavigationProperties': cnf.navigation 
+             }
+            };
+           return xslt4node.transformSync(config);
         }
     },
     _prepareTypeFilter: function (doc, versionInfo, cnf) {