From: Benjamin Auder <benjamin.auder@somewhere>
Date: Fri, 2 Feb 2018 17:21:00 +0000 (+0100)
Subject: Fix typos, debugging
X-Git-Url: https://git.auder.net/js/doc/app_dev.php/_configurator?a=commitdiff_plain;h=351d7a8448c574b40ed5d1cb488519d7b3f70ca5;p=erdiag.git

Fix typos, debugging
---

diff --git a/example.html b/example.html
index dcb2fcd..d5a27ac 100644
--- a/example.html
+++ b/example.html
@@ -1,4 +1,5 @@
-<div id="test"></div>
+<div id="mcd"></div>
+<div id="mld"></div>
 
 <script src="//cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js"></script>
 <script src="parser.js"></script>
@@ -30,5 +31,6 @@
 			is_a
 			Instrument Piano Guitar
 		`);
-	er.drawMcd("test");
+	er.drawMcd("mcd"); //,"bubble"
+	er.drawMld("mld");
 </script>
diff --git a/parser.js b/parser.js
index f718f31..db70f7f 100644
--- a/parser.js
+++ b/parser.js
@@ -9,6 +9,9 @@ class ErDiags
 		this.tables = { };
 		this.mcdParsing(description);
 		this.mldParsing();
+		
+		console.log(this.tables);
+		
 		// Cache SVG graphs returned by server (in addition to server cache = good perfs)
 		this.mcdGraph = "";
 		this.mldGraph = "";
@@ -192,7 +195,7 @@ class ErDiags
 									isKey: e.card.length >= 2 && e.card[1] == 'R', //"weak tables" foreign keys become part of the key
 									name: "#" + e2.name + "_" + attr.name,
 									type: attr.type,
-									qualifiers: "foreign key references " + e2.name + " " + (e.card[0]=='1' : "not null" : ""),
+									qualifiers: "foreign key references " + e2.name + " " + (e.card[0]=='1' ? "not null" : ""),
 									ref: e2.name, //easier drawMld function (fewer regexps)
 								});
 							}
@@ -202,18 +205,18 @@ class ErDiags
 				else
 				{
 					// Add all keys in current entity
-					let fields = e.attributes.filter( attr => { return attr.isKey; });
+					let fields = this.entities[e.name].attributes.filter( attr => { return attr.isKey; });
 					newTableAttrs.push({
 						fields: fields,
 						entity: e.name,
 					});
 				}
-			}
+			});
 			if (newTableAttrs.length > 1)
 			{
 				// Ok, really create a new table
 				let newTable = {
-					name: a.name || newTableAttrs.map( item => { return item.entity; }).join("_");
+					name: a.name || newTableAttrs.map( item => { return item.entity; }).join("_"),
 					fields: [ ],
 				};
 				newTableAttrs.forEach( item => {
@@ -221,7 +224,7 @@ class ErDiags
 						newTable.fields.push({
 							name: item.entity + "_" + f.name,
 							isKey: true,
-							type: f.type,,
+							type: f.type,
 							qualifiers: (f.qualifiers+" " || "") + "foreign key references " + item.entity + " not null",
 							ref: item.entity,
 						});
@@ -404,14 +407,14 @@ class ErDiags
 		_.shuffle(Object.keys(this.tables)).forEach( name => {
 			mldDot += '"' + name + '" [label=<<table BORDER="1" ALIGN="LEFT" CELLPADDING="5" CELLSPACING="0">\n';
 			mldDot += '<tr><td BGCOLOR="#ae7d4e" BORDER="0"><font COLOR="#FFFFFF">' + name + '</font></td></tr>\n';
-			this.tables[name].fields.forEach( f => {
+			this.tables[name].forEach( f => {
 				let label = (f.isKey ? '<u>' : '') + (!!f.qualifiers && f.qualifiers.indexOf("foreign")>=0 ? '#' : '') + f.name + (f.isKey ? '</u>' : '');
 				mldDot += '<tr><td port="' + f.name + '"' + (f.isKey ? ' port="__key"' : '')
 					+ ' BGCOLOR="#FFFFFF" BORDER="0" ALIGN="LEFT"><font COLOR="#000000" >' + label + '</font></td></tr>\n';
 				if (!!f.ref)
 				{
 					if (Math.random() < 0.5)
-						links += '"' + f.ref + '":__key -- "' + '"'+name+'":"'+f.name+'"\n';
+						links += '"' + f.ref + '":__key -- "' + name+'":"'+f.name+'"\n';
 					else
 						links += '"'+name+'":"'+f.name+'" -- "' + f.ref + '":__key\n';
 				}
@@ -420,7 +423,7 @@ class ErDiags
 		});
 		mldDot += links + '\n';
 		mldDot += '}\n';
-		//console.log(mldDot);
+		console.log(mldDot);
 		ErDiags.AjaxGet(mldDot, graphSvg => {
 			this.mldGraph = graphSvg;
 			element.innerHTML = graphSvg;