X-Git-Url: https://git.auder.net/?a=blobdiff_plain;ds=sidebyside;f=parser.js;h=d6cee80cab3350e63d20bd40f8cb937e70944426;hb=b06f8fe6700d326e5bfae39e01a6ec58c1f46680;hp=5ef2b3f25ba7ebb72fe58a6e0c93e3b30fdcc8e9;hpb=3789126f0dc7d0b751d99ded86a97c2b258afe80;p=erdiag.git
diff --git a/parser.js b/parser.js
index 5ef2b3f..d6cee80 100644
--- a/parser.js
+++ b/parser.js
@@ -1,7 +1,7 @@
// ER diagram description parser
class ErDiags
{
- constructor(description)
+ constructor(description, output, image)
{
this.entities = { };
this.inheritances = [ ];
@@ -9,10 +9,8 @@ class ErDiags
this.tables = { };
this.mcdParsing(description);
this.mldParsing();
- // Cache SVG graphs returned by server (in addition to server cache = good perfs)
- this.mcdGraph = "";
- this.mldGraph = "";
- this.sqlText = "";
+ this.output = output || "compact";
+ this.image = image || "svg";
}
static CARDINAL(symbol)
@@ -170,12 +168,11 @@ class ErDiags
name: attr.name,
type: attr.type,
isKey: attr.isKey,
- qualifiers: attr.qualifiers,
};
if (!!attr.qualifiers && !!attr.qualifiers.match(/references/i))
{
Object.assign(newField, {ref: attr.qualifiers.match(/references ([^\s]+)/i)[1]});
- attr.qualifiers = attr.qualifiers.replace(/references [^\s]+/, "");
+ newField.qualifiers = attr.qualifiers.replace(/references [^\s]+/i, "");
}
newTable.push(newField);
});
@@ -190,8 +187,13 @@ 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
});
});
});
@@ -285,28 +287,12 @@ class ErDiags
// DRAWING + GET SQL FROM PARSING
/////////////////////////////////
- static AjaxGet(dotInput, callback)
- {
- let xhr = new XMLHttpRequest();
- xhr.onreadystatechange = function() {
- if (this.readyState == 4 && this.status == 200)
- callback(this.responseText);
- };
- xhr.open("GET", "scripts/getGraphSvg.php?dot=" + encodeURIComponent(dotInput), true);
- xhr.send();
- }
-
// "Modèle conceptuel des données". TODO: option for graph size
// NOTE: randomizing helps to obtain better graphs (sometimes)
drawMcd(id, mcdStyle) //mcdStyle: bubble, or compact
{
let element = document.getElementById(id);
mcdStyle = mcdStyle || "compact";
- if (this.mcdGraph.length > 0)
- {
- element.innerHTML = this.mcdGraph;
- return;
- }
// Build dot graph input
let mcdDot = 'graph {\n';
mcdDot += 'rankdir="LR";\n';
@@ -420,23 +406,16 @@ class ErDiags
});
});
mcdDot += '}';
- //console.log(mcdDot);
- ErDiags.AjaxGet(mcdDot, graphSvg => {
- this.mcdGraph = graphSvg;
- element.innerHTML = graphSvg;
- });
+ if (this.output == "graph") //draw graph in element
+ element.innerHTML = "";
+ else //just show dot input
+ element.innerHTML = mcdDot.replace(//g,">");
}
// "Modèle logique des données", from MCD without anomalies
- // TODO: this one should draw links from foreign keys to keys (port=... in
" + sqlText + "
";
}