X-Git-Url: https://git.auder.net/?p=erdiag.git;a=blobdiff_plain;f=parser.js;h=0ab6a4321a15f59a62718d39cbfc699d17563e39;hp=d6cee80cab3350e63d20bd40f8cb937e70944426;hb=HEAD;hpb=b06f8fe6700d326e5bfae39e01a6ec58c1f46680

diff --git a/parser.js b/parser.js
index d6cee80..0ab6a43 100644
--- a/parser.js
+++ b/parser.js
@@ -9,7 +9,7 @@ class ErDiags
 		this.tables = { };
 		this.mcdParsing(description);
 		this.mldParsing();
-		this.output = output || "compact";
+		this.output = output || "graph";
 		this.image = image || "svg";
 	}
 
@@ -187,13 +187,8 @@ class ErDiags
 					name: inh.parent + "_id",
 					type: this.tables[inh.parent][idx].type,
 					isKey: true,
-<<<<<<< HEAD
-					qualifiers: (this.tables[inh.parent][idx].qualifiers || "") + " foreign key references " + inh.parent,
-					ref: inh.parent,
-=======
 					qualifiers: this.tables[inh.parent][idx].qualifiers || "",
 					ref: inh.parent + "(" + this.tables[inh.parent][idx].name + ")",
->>>>>>> 40b4a9d230d105a61e22bef0a63a6e8d515524e9
 				});
 			});
 		});
@@ -408,7 +403,7 @@ class ErDiags
 		mcdDot += '}';
 		if (this.output == "graph") //draw graph in element
 			element.innerHTML = "<img src='scripts/getGraph_" + this.image + ".php?dot=" + encodeURIComponent(mcdDot) + "'/>";
-		else //just show dot input
+		else //output = "text": just show dot input
 			element.innerHTML = mcdDot.replace(/</g,"&lt;").replace(/>/g,"&gt;");
 	}