From 49ec5eb1e2acae1de5e7be51cac40bb3843f31c4 Mon Sep 17 00:00:00 2001
From: ZitRos <zitros.lab@gmail.com>
Date: Wed, 16 Nov 2016 20:19:09 +0200
Subject: [PATCH] Classes are not rendered properly when rendering package bug
 fix

---
 cache/projectTemplate.xml | 12 ++++++----
 package.json              | 50 ++++++++++-----------------------------
 2 files changed, 19 insertions(+), 43 deletions(-)

diff --git a/cache/projectTemplate.xml b/cache/projectTemplate.xml
index a6c8add..29881b7 100644
--- a/cache/projectTemplate.xml
+++ b/cache/projectTemplate.xml
@@ -248,16 +248,18 @@ Return method data.</Description>
 <Description><![CDATA[
 Returns if <var>packageName</var> is in <var>basePackageName</var>.]]></Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec>basePackageNames:%String,packageName:%String</FormalSpec>
+<FormalSpec>basePackageName:%String,packageName:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	set pack = $PIECE(packageName, ".", 1)
-	set list = $LISTFROMSTRING(basePackageNames, ",")
-	set OK = 0
+	set pack = $LISTFROMSTRING(packageName, ".")
+	set list = $LISTFROMSTRING(basePackageName, ".")
+	set OK = 1
 	for i=1:1:$LISTLENGTH(list) {
-		if ($LISTGET(list, i) = pack) {
+		if ($LISTGET(list, i) = $LISTGET(pack, i)) {
 			set OK = 1
+		} else {
+			set OK = 0
 			quit
 		}
 	}
diff --git a/package.json b/package.json
index 1e699bc..f6099b5 100755
--- a/package.json
+++ b/package.json
@@ -1,46 +1,20 @@
 {
   "name": "CacheClassExplorer",
-  "version": "1.16.3",
+  "version": "1.17.0",
   "description": "Class Explorer for InterSystems Caché",
-  "directories": {
-    "test": "test"
-  },
+  "directories": { "test": "test" },
   "dependencies": {},
-  "devDependencies": {
-    "autoprefixer-core": "^5.1.11",
-    "express": "^5.0.0-alpha.1",
-    "gulp": "^3.9.0",
-    "gulp-add-src": "^0.2.0",
-    "gulp-clean": "^0.3.1",
-    "gulp-concat": "^2.4.1",
-    "gulp-header": "^1.2.2",
-    "gulp-html-replace": "^1.4.1",
-    "gulp-minify-css": "^0.3.11",
-    "gulp-postcss": "^5.1.3",
-    "gulp-rename": "^1.2.0",
-    "gulp-replace": "^0.5.3",
-    "gulp-strip-comments": "^1.0.1",
-    "gulp-uglify": "^1.2.0",
-    "gulp-wrap": "^0.5.0",
-    "gulp-zip": "^2.0.2"
-  },
-  "scripts": {
-    "gulp": "gulp"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ZitRos/CacheUMLExplorer"
-  },
-  "keywords": [
-    "UMLExplorer",
-    "Caché",
-    "UML",
-    "diagram"
-  ],
+  "devDependencies": { "autoprefixer-core": "^5.1.11", "express": "^5.0.0-alpha.1",
+    "gulp": "^3.9.0", "gulp-add-src": "^0.2.0", "gulp-clean": "^0.3.1", "gulp-concat": "^2.4.1",
+    "gulp-header": "^1.2.2", "gulp-html-replace": "^1.4.1", "gulp-minify-css": "^0.3.11",
+    "gulp-postcss": "^5.1.3", "gulp-rename": "^1.2.0", "gulp-replace": "^0.5.3",
+    "gulp-strip-comments": "^1.0.1", "gulp-uglify": "^1.2.0", "gulp-wrap": "^0.5.0",
+    "gulp-zip": "^2.0.2" },
+  "scripts": { "gulp": "gulp" },
+  "repository": { "type": "git", "url": "https://github.com/ZitRos/CacheUMLExplorer" },
+  "keywords": [ "UMLExplorer", "Caché", "UML", "diagram" ],
   "author": "ZitRo",
   "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/ZitRos/CacheUMLExplorer/issues"
-  },
+  "bugs": { "url": "https://github.com/ZitRos/CacheUMLExplorer/issues" },
   "homepage": "https://github.com/ZitRos/CacheUMLExplorer"
 }