updates of reaction parameters attributes are now shown correctly in …

…tooltip
Gebbi8 · Nov 4, 2021 · 09cd6ac · 09cd6ac
1 parent ec053a3
commit 09cd6ac
Show file tree

Hide file tree

Showing 5 changed files with 825 additions and 29 deletions.
diff --git a/bives/bivesTool.js b/bives/bivesTool.js
@@ -124,18 +124,18 @@ function compareModels(f1, f2, command){
 	 	{
 	 		//console.log(data);
 	 		var report = $.parseJSON (data).reportHtml;
-	 		console.log(report);
+	 		//console.log(report);
 	 		var sbgnJson = $.parseJSON (data).reactionsSbgnJson;
-	 		console.log(sbgnJson);
+	 		//console.log(sbgnJson);
 	 		var comodiAnnotation = $.parseJSON(data).separateAnnotations;
 	 		//$("#sbgnJson").text(sbgnJson);
 	 		var xmlDiff = $.parseJSON (data).xmlDiff;
-	 		console.log(xmlDiff);
+	 		//console.log(xmlDiff);
 	 		//console.log(comodiAnnotation);
 	 		//console.log(report);
 	 		//console.log(xmlDocDiff, xmlDocSbml);
 	 		showSbgn(sbgnJson, xmlDiff, comodiAnnotation, f1, f2);
-	 		console.log($.parseJSON (sbgnJson));
+	 		//console.log($.parseJSON (sbgnJson));
 	 	}
 	 );
 }

diff --git a/index.html b/index.html
@@ -412,14 +412,16 @@ <h2 class="accordion-header" id="flush-headingThree">
 		var hiddenTests = {
 			"omex": ["sarma2012/BIOMD0000000444-v1.omex", "sarma2012/BIOMD0000000444-v2.omex"],
 			"xml": ["sarma2012/BIOMD0000000444-v1.xml.origin", "sarma2012/BIOMD0000000444-v2.xml"],
-			"paths": ["gitCompare/Liebal3-BIOMD0000000461.xml", "gitCompare/Liebal-fake-test2.xml"]
+			"paths": ["gitCompare/Liebal3-BIOMD0000000461.xml", "gitCompare/Liebal-fake-test2.xml"],
+			"singleChange": ["Kummer2000-v2.xml", "Kummer2000-v2-singleParaChange.xml"]
 		}
 
 		window.onload = function () {
-			document.getElementById("e1Kummer").click();
+			//document.getElementById("e1Kummer").click();
 			//assignExamples(hiddenTests["omex"][0], hiddenTests["omex"][1]);
 			//assignExamples(hiddenTests["xml"][0], hiddenTests["xml"][1]);
 			//assignExamples(hiddenTests["paths"][0], hiddenTests["paths"][1]);
+			assignExamples(hiddenTests["singleChange"][0], hiddenTests["singleChange"][1]);
 		}
 	</script>
 </body>

diff --git a/javascriptAndCss/xmlParser.js b/javascriptAndCss/xmlParser.js
@@ -227,15 +227,50 @@ function addChange(changeType, elementType, line, oldDoc, newDoc, dataByKeys, ad
     var oldValue, newValue;
     var elementName = "";
 
+    let changeClass = "bives-default";
+    let changeFill = "nothing";
+    let tag, doc, docPath;
+
+    if(changeType == "delete") {
+        changeClass = "delete-color";
+        changeFill = "deleted";
+        doc = oldDoc;
+        docPath = "oldPath";
+        value = "oldValue";
+        tag = "oldTag";
+    } else if (changeType == "insert") {
+        changeClass = "insert-color";
+        changeFill = "added";
+        doc = newDoc;
+        docPath = "newPath";
+        value = "newValue";
+        tag = "newTag";
+    } else if (changeType == "update"){
+        changeClass = "update-color";
+    }
+
     elementType = elementType[0].toUpperCase() + elementType.substring(1);
 
     if(changeType == "update"){
         if(line.includes("/kineticLaw[")){
-            //get path
             var oldPath = regEx(line, "oldPath");
             oldPath = getLocalXPath(oldPath);
             var newPath = regEx(line, "newPath");
             newPath = getLocalXPath(newPath);
+            if(line.includes("/listOfParam")){ //update of local Parameter
+                console.log(line);
+                let changedAttr = regEx(line, "name");
+                let oldVal = regEx(line, "oldValue");
+                let newVal = regEx(line, "newValue");
+                // let oldParameter = oldDoc.evaluate(oldPath, oldDoc, null, XPathResult.ANY_TYPE, null).iterateNext();
+                 let newParameter = newDoc.evaluate(newPath, newDoc, null, XPathResult.ANY_TYPE, null).iterateNext();
+
+                console.log(newParameter);
+                return htmlChange += "<li>Attribute <em><b><span class='" + changeClass + "'>" + changedAttr + "</span></b></em> of local parameter <b><em>" + newParameter.attributes.name.value + "</em></b> changed: " + oldVal + " &rarr; " + newVal;
+                alert("!");
+            }
+            //get path
+
             var mathIndexOld = oldPath.indexOf("/*[local-name()='math']");
             var mathIndexNew = newPath.indexOf("/*[local-name()='math']");
 
@@ -255,10 +290,10 @@ function addChange(changeType, elementType, line, oldDoc, newDoc, dataByKeys, ad
             console.log(resultOld);
 
             var mathMLNew = newDoc.evaluate(newPath, newDoc, null, XPathResult.ANY_TYPE, null);
-            var resultNew = mathMLNew.iterateNext().innerHT<ML;
+            var resultNew = mathMLNew.iterateNext().innerHTML;
             console.log(resultNew);
 
-            return htmlChange += resultOld + " -> " + resultNew;
+            return htmlChange += resultOld + " &rarr; " + resultNew;
             // var updates = xmlDocDiff.evaluate(
             //     "/bives/update/*",
             //     xmlDocDiff,
@@ -345,26 +380,6 @@ function addChange(changeType, elementType, line, oldDoc, newDoc, dataByKeys, ad
         return "UNHANDLED MOVE: " + line;
     }
 
-    let changeClass = "bives-default";
-    let changeFill = "nothing";
-    let tag, doc, docPath;
-
-    if(changeType == "delete") {
-        changeClass = "delete-color";
-        changeFill = "deleted";
-        doc = oldDoc;
-        docPath = "oldPath";
-        value = "oldValue";
-        tag = "oldTag";
-    } else if (changeType == "insert") {
-        changeClass = "insert-color";
-        changeFill = "added";
-        doc = newDoc;
-        docPath = "newPath";
-        value = "newValue";
-        tag = "newTag";
-    }
-
     if(elementType == "Attribute"){
         //change on an reaction element
         let name;