From 8ce335d011e4a5a17e0f38c1d83728062240f758 Mon Sep 17 00:00:00 2001
From: Faterou <francis_tofu@hotmail.com>
Date: Tue, 7 Feb 2017 15:07:36 -0500
Subject: [PATCH 1/3] Click process has changed. Creates a problem with the
 examples highlighting the erros that were on the previous page.

---
 .../examples/misaligned-elements.html         |  2 +-
 .../server/resource/staticProbe.inc.js        | 27 +++++++++++--------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/Source/Server/src/ca/uqac/lif/cornipickle/server/resource/examples/misaligned-elements.html b/Source/Server/src/ca/uqac/lif/cornipickle/server/resource/examples/misaligned-elements.html
index 64004a5..af7b108 100644
--- a/Source/Server/src/ca/uqac/lif/cornipickle/server/resource/examples/misaligned-elements.html
+++ b/Source/Server/src/ca/uqac/lif/cornipickle/server/resource/examples/misaligned-elements.html
@@ -8,8 +8,8 @@
 <link rel="stylesheet" type="text/css" href="https://code.jquery.com/ui/1.11.1/themes/smoothness/jquery-ui.css" />
 <script type="text/javascript" src="https://code.jquery.com/jquery-1.11.2.min.js"></script>
 <script type="text/javascript" src="https://code.jquery.com/ui/1.11.1/jquery-ui.min.js"></script>
-<script type="text/javascript" src="/cornipickle.js"></script>
 <script type="text/javascript" src="/probe"></script>
+<script type="text/javascript" src="/cornipickle.js"></script>
 <title>Misaligned menu elements - Cornipickle</title>
 <script type="text/javascript">
 // <![CDATA[
diff --git a/Source/Server/src/ca/uqac/lif/cornipickle/server/resource/staticProbe.inc.js b/Source/Server/src/ca/uqac/lif/cornipickle/server/resource/staticProbe.inc.js
index f435c86..3315e48 100644
--- a/Source/Server/src/ca/uqac/lif/cornipickle/server/resource/staticProbe.inc.js
+++ b/Source/Server/src/ca/uqac/lif/cornipickle/server/resource/staticProbe.inc.js
@@ -34,6 +34,11 @@ Cornipickle.CornipickleProbe = function()
 	 * The probe's hash
 	 */
 	this.probe_hash = "";
+	
+	/*
+	 * The last page that was serialized (without a click yet)
+	 */
+	this.m_lastPage = {};
 
 
 	/**
@@ -119,7 +124,7 @@ Cornipickle.CornipickleProbe = function()
 		var current_path = path;
 		current_path.push(n.tagName);
 		var out = {};
-		if (this.includeInResult(n, path) === Cornipickle.CornipickleProbe.INCLUDE || n === event.target)
+		if (this.includeInResult(n, path) === Cornipickle.CornipickleProbe.INCLUDE || (event !== null && n === event))
 		{
 			if (n.tagName)
 			{
@@ -146,7 +151,7 @@ Cornipickle.CornipickleProbe = function()
 				out = this.addIfDefined(out, "disabled", Cornipickle.CornipickleProbe.formatBool(n.disabled));
 				out = this.addIfDefined(out, "accesskey", n.accessKey);
 				out = this.addIfDefined(out, "min", n.min);
-				if (n === event.target)
+				if (event !== null && n === event.target)
 				{
 					out.event = this.serializeEvent(event);
 				}
@@ -362,8 +367,8 @@ Cornipickle.CornipickleProbe = function()
 		// Un-highlight previously highlighted elements
 		Cornipickle.CornipickleProbe.unHighlightElements();
 		// Serialize page contents
-		var json = cp_probe.serializePageContents(document.body, [], event);
-		json = cp_probe.serializeWindow(json);
+		var json = cp_probe.serializeWindow(cp_probe.serializePageContents(document.body, [], event));
+		
 		var url = "http://" + this.server_name + "/image/";
 		xhttp = new XMLHttpRequest();
 		xhttp.open("POST", url, true);
@@ -520,7 +525,10 @@ Cornipickle.CornipickleProbe.handleResponse = function(response)
 
 Cornipickle.CornipickleProbe.unHighlightElements = function()
 {
-	document.getElementById("cp-highlight").innerHTML = "";
+	if(document.getElementById("cp-highlight"))
+	{
+		document.getElementById("cp-highlight").innerHTML = "";
+	}
 };
 
 /**
@@ -818,14 +826,11 @@ function loadFunction() {
             // If we clicked on the probe status panel, do nothing
             return;
         }
-        // Wait .25 sec, so that the browser has time to process the click
-        window.setTimeout(function() {
-            cp_probe.handleEvent(event);
-        }, 0.25);
+        cp_probe.handleEvent(event);
     };
 
-	// Call the probe a first time at startup
-	//window.setTimeout(cp_probe.handleEvent(event), 0.25);
+	//Call the probe a first time at startup
+	//cp_probe.handleEvent(null);
 }
 
 var addFunctionOnWindowLoad = function(callback){

From d97f7ab073eb1102c6ee5f54a8097df8099d781f Mon Sep 17 00:00:00 2001
From: Faterou <francis_tofu@hotmail.com>
Date: Wed, 12 Apr 2017 14:28:21 -0400
Subject: [PATCH 2/3] Added a preevaluation after the page as loaded to get the
 current verdict but the interpreter doesn't update from that callback; it
 updates after the next event.

---
 .../cornipickle/server/CornipickleServer.java |   1 +
 .../lif/cornipickle/server/DummyImage.java    |   5 -
 .../lif/cornipickle/server/PreEvaluation.java | 224 ++++++++++++++++++
 .../cornipickle/server/resource/probe.inc.js  |  27 +++
 .../server/resource/staticProbe.inc.js        |  58 ++++-
 5 files changed, 304 insertions(+), 11 deletions(-)
 create mode 100644 Source/Server/src/ca/uqac/lif/cornipickle/server/PreEvaluation.java

diff --git a/Source/Server/src/ca/uqac/lif/cornipickle/server/CornipickleServer.java b/Source/Server/src/ca/uqac/lif/cornipickle/server/CornipickleServer.java
index f431b6e..0231e32 100755
--- a/Source/Server/src/ca/uqac/lif/cornipickle/server/CornipickleServer.java
+++ b/Source/Server/src/ca/uqac/lif/cornipickle/server/CornipickleServer.java
@@ -48,6 +48,7 @@ public CornipickleServer(String server_name, int port)
     registerCallback(new StatusPageCallback(m_interpreter, this));
     registerCallback(new GetProbe(m_interpreter, m_serverName, m_port));
     registerCallback(new DummyImage(m_interpreter));
+    registerCallback(new PreEvaluation(m_interpreter));
     registerCallback(new JsonGetState(m_interpreter, this));
     registerCallback(new JsonPutState(m_interpreter, this));
     registerCallback(new FiddleCallback());
diff --git a/Source/Server/src/ca/uqac/lif/cornipickle/server/DummyImage.java b/Source/Server/src/ca/uqac/lif/cornipickle/server/DummyImage.java
index cf2bfc9..b5da1ea 100755
--- a/Source/Server/src/ca/uqac/lif/cornipickle/server/DummyImage.java
+++ b/Source/Server/src/ca/uqac/lif/cornipickle/server/DummyImage.java
@@ -108,11 +108,6 @@
  */
 class DummyImage extends InterpreterCallback
 {
-	/**
-	 * The name of the cookie used to pass info back to the probe
-	 */
-	protected static final String s_cookieName = "cornipickle";
-	
   /**
    * Dummy image made of one white pixel
    */
diff --git a/Source/Server/src/ca/uqac/lif/cornipickle/server/PreEvaluation.java b/Source/Server/src/ca/uqac/lif/cornipickle/server/PreEvaluation.java
new file mode 100644
index 0000000..de6d050
--- /dev/null
+++ b/Source/Server/src/ca/uqac/lif/cornipickle/server/PreEvaluation.java
@@ -0,0 +1,224 @@
+package ca.uqac.lif.cornipickle.server;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Map;
+import java.util.Set;
+
+import javax.xml.bind.DatatypeConverter;
+
+import com.sun.net.httpserver.HttpExchange;
+
+import ca.uqac.lif.cornipickle.Interpreter;
+import ca.uqac.lif.cornipickle.Verdict;
+import ca.uqac.lif.cornipickle.Interpreter.StatementMetadata;
+import ca.uqac.lif.jerrydog.CallbackResponse;
+import ca.uqac.lif.jerrydog.InnerFileServer;
+import ca.uqac.lif.jerrydog.RequestCallback;
+import ca.uqac.lif.json.JsonElement;
+import ca.uqac.lif.json.JsonList;
+import ca.uqac.lif.json.JsonMap;
+import ca.uqac.lif.json.JsonNumber;
+import ca.uqac.lif.json.JsonParser;
+import ca.uqac.lif.json.JsonString;
+import ca.uqac.lif.json.JsonParser.JsonParseException;
+
+public class PreEvaluation extends InterpreterCallback {
+
+  /**
+   * Dummy image made of one white pixel
+   */
+  static final byte[] s_dummyImage = InnerFileServer.readBytes(
+      CornipickleServer.class.getResourceAsStream("resource/dummy-image.png"));
+  
+  /**
+   * Dummy image made of one red pixel
+   */
+  static final byte[] s_dummyImageRed = InnerFileServer.readBytes(
+      CornipickleServer.class.getResourceAsStream("resource/dummy-image-red.png"));
+  
+  /**
+   * Dummy image made of one green pixel
+   */  
+  static final byte[] s_dummyImageGreen = InnerFileServer.readBytes(
+      CornipickleServer.class.getResourceAsStream("resource/dummy-image-green.png"));
+  
+  static JsonParser s_jsonParser;
+
+  public PreEvaluation(Interpreter i)
+  {
+    super(i, RequestCallback.Method.POST, "/preevaluate/");
+    s_jsonParser = new JsonParser();
+  }
+  
+  /**
+   * Process like DummyImage but returns the original interpreter instead of the updated one.
+   */
+  @Override
+  public CallbackResponse process(HttpExchange t)
+  {
+    Map<String,String> attributes = getParameters(t);
+    
+    JsonElement j = null;
+    String memento = "";
+    try {
+      j = s_jsonParser.parse(URLDecoder.decode(attributes.get("contents"), "UTF-8"));
+      if(attributes.get("interpreter") != null)
+      {
+        memento = URLDecoder.decode(attributes.get("interpreter"), "UTF-8");
+        m_interpreter = m_interpreter.restoreFromMemento(memento);
+      }
+    } catch (JsonParseException e) {
+      e.printStackTrace(); //Never supposed to happen....
+    } catch (UnsupportedEncodingException e) {
+      // TODO Auto-generated catch block
+      e.printStackTrace();
+    }
+    
+    if (j != null)
+    {
+      m_interpreter.evaluateAll(j);
+      //m_server.setLastProbeContact();
+    }
+    
+    // Select the dummy image to send back
+    Map<StatementMetadata,Verdict> verdicts = m_interpreter.getVerdicts();
+    byte[] image_to_return = selectImage(verdicts);
+    // Create response
+    CallbackResponse cbr = new CallbackResponse(t);
+    cbr.setHeader("Access-Control-Allow-Origin", "*");
+    cbr.setContents(createResponseBody(verdicts, memento, image_to_return));
+    cbr.setContentType(CallbackResponse.ContentType.JSON);
+    m_interpreter.clear();
+    // DEBUG: print state
+    //com.google.gson.GsonBuilder builder = new com.google.gson.GsonBuilder();
+    //com.google.gson.Gson gson = builder.create();
+    //System.out.println(gson.toJson(m_interpreter));
+    return cbr;
+  }
+  
+  /**
+   * Determines which of the three images (red, white, blue) to send back
+   *   to the browser. The image is chosen as follows:
+   *   <ul>
+   *   <li>All properties evaluate to true: green</li>
+   *   <li>No property to evaluate: white</li>
+   *   <li>At least one property evaluates to false: red</li>
+   *   </ul>
+   * @param verdicts A map from the metadata for each property to
+   *   its current verdict
+   * @return The byte array with the contents of the selected image
+   */
+  protected static byte[] selectImage(Map<StatementMetadata,Verdict> verdicts)
+  {
+    int num_errors = 0;
+    byte[] image_out = s_dummyImage;
+    for (StatementMetadata key : verdicts.keySet())
+    {
+      Verdict v = verdicts.get(key);
+      if (v.is(Verdict.Value.FALSE))
+      {
+        num_errors++;
+      }
+    }
+    if (num_errors == 0)
+    {
+      if (verdicts.isEmpty())
+      {
+        // Cornipickle has no property to evaluate
+      }
+      else
+      {
+        // All's well! All properties evaluate to true 
+      }
+    }
+    else
+    {
+      // Errors found
+      image_out = s_dummyImageRed;
+    }
+    return image_out;
+  }
+  
+  /**
+   * Creates the response body out of the verdict of each property handled by the
+   * interpreter. This response contains, for each property, its caption,
+   * a list of element IDs to highlight (if any), as well as the total
+   * number of true/false/inconclusive properties.
+   * In addition, it contains the serialized state of the current interpreter
+   * @param verdicts A map from the metadata for each property to
+   *   its current verdict
+   * @param interpreter String in base 64 representing the state of the interpreter
+   * @param image The image to return as an array of bytes
+   * @return A JSON string to be passed as the response to
+   *   the browser
+   */
+  protected static String createResponseBody(Map<StatementMetadata,Verdict> verdicts, String interpreter, byte[] image)
+  {
+    int num_false = 0;
+    int num_true = 0;
+    int num_inconclusive = 0;
+    Verdict outcome = new Verdict(Verdict.Value.TRUE);
+    JsonList highlight_ids = new JsonList();
+    for (StatementMetadata key : verdicts.keySet())
+    {
+      JsonMap element = new JsonMap();
+      JsonList id_to_highlight = new JsonList();
+      Verdict v = verdicts.get(key);
+      outcome.conjoin(v);
+      if (v.is(Verdict.Value.FALSE))
+      {
+        num_false++;
+        id_to_highlight.addAll(getIdsToHighlight(v));
+      }
+      else if (v.is(Verdict.Value.TRUE))
+      {
+        num_true++;
+      } 
+      else
+      {
+        num_inconclusive++;
+      }
+      element.put("ids", id_to_highlight);
+      element.put("caption", new JsonString(CornipickleServer.escapeQuotes(key.get("description"))));
+      highlight_ids.add(element);
+    }
+    JsonMap result = new JsonMap();
+    result.put("global-verdict", outcome.toPlainString());
+    result.put("num-true", num_true);
+    result.put("num-false", num_false);
+    result.put("num-inconclusive", num_inconclusive);
+    result.put("highlight-ids", highlight_ids);
+    result.put("interpreter", interpreter);
+    result.put("image", "data:image/png;base64," + DatatypeConverter.printBase64Binary(image));
+    // Below, we use true to get a compact JSON string without CF/LF
+    // (otherwise the cookie won't be passed correctly to the browser)
+    return result.toString("", true); 
+  }
+  
+  protected static JsonList getIdsToHighlight(Verdict v)
+  {
+    JsonList ids = new JsonList();
+    Set<Set<JsonElement>> tuples = v.getWitness().flatten();
+    for (Set<JsonElement> tuple : tuples)
+    {
+      JsonList out = new JsonList();
+      for (JsonElement e : tuple)
+      {
+        if (!(e instanceof JsonMap))
+        {
+          continue;
+        }
+        JsonMap m = (JsonMap) e;
+        JsonElement id = m.get("cornipickleid");
+        if (id == null || !(id instanceof JsonNumber))
+        {
+          continue;
+        }
+        out.add((JsonNumber) id);
+      }
+      ids.add(out);
+    }
+    return ids;
+  }
+}
diff --git a/Source/Server/src/ca/uqac/lif/cornipickle/server/resource/probe.inc.js b/Source/Server/src/ca/uqac/lif/cornipickle/server/resource/probe.inc.js
index b5cb6e8..c7a5c2d 100644
--- a/Source/Server/src/ca/uqac/lif/cornipickle/server/resource/probe.inc.js
+++ b/Source/Server/src/ca/uqac/lif/cornipickle/server/resource/probe.inc.js
@@ -43,6 +43,33 @@ var dynamicProbe = function()
         cp_probe.setProbeId( "1" );
         cp_probe.setProbeHash( "interpreter" );
         document.getElementById("cp-witness").innerHTML = "%%WITNESS_CODE%%";
+        
+        if(document.getElementsByClassName("cornipickle-code"))
+        {
+        	var codestring = "";
+        	var codes = document.getElementsByClassName("cornipickle-code");
+        	for(var i = 0; i < codes.length; i++)
+    		{
+        		codestring = codestring + codes[i].textContent.replace(/\u00A0/g, ' ');
+    		}
+        	
+        	$.ajax({
+        	    url : "/add",
+        	    type : "POST",
+        	    data : encodeURIComponent(codestring),
+        	    success : function(result) {
+        	      //$("#to-cornipickle").prop('disabled', true);
+        	      cp_probe.setAttributesToInclude(result.attributes);
+        	      cp_probe.setTagNamesToInclude(result.tagnames);
+        	      sessionStorage.interpreter = result.interpreter;
+        	      cp_probe.preEvaluate();
+        	    },
+        	  });
+        }
+        else
+        {
+        	cp_probe.preEvaluate();
+        }
     }, 500);
 };
 
diff --git a/Source/Server/src/ca/uqac/lif/cornipickle/server/resource/staticProbe.inc.js b/Source/Server/src/ca/uqac/lif/cornipickle/server/resource/staticProbe.inc.js
index 3315e48..b73c889 100644
--- a/Source/Server/src/ca/uqac/lif/cornipickle/server/resource/staticProbe.inc.js
+++ b/Source/Server/src/ca/uqac/lif/cornipickle/server/resource/staticProbe.inc.js
@@ -106,7 +106,7 @@ Cornipickle.CornipickleProbe = function()
 	 * Map from unique IDs to element references
 	 */
 	this.m_idMap = {};
-
+	
 
 	/**
 	 * Serializes the contents of the page. This method recursively
@@ -359,6 +359,47 @@ Cornipickle.CornipickleProbe = function()
 		}
 		return event.type;
 	};
+	
+	this.preEvaluate = function()
+	{
+		console.log("preEvaluation");
+		Cornipickle.CornipickleProbe.updateTransmitIcon(true);
+		// Un-highlight previously highlighted elements
+		Cornipickle.CornipickleProbe.unHighlightElements();
+		// Serialize page contents
+		var json = cp_probe.serializeWindow(cp_probe.serializePageContents(document.body, [], null));
+		
+		var url = "http://" + this.server_name + "/preevaluate/";
+		xhttp = new XMLHttpRequest();
+		xhttp.open("POST", url, true);
+		xhttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+		xhttp.onreadystatechange = function () {
+		    var DONE = this.DONE || 4;
+		    if (this.readyState === DONE){
+		    	Cornipickle.CornipickleProbe.handleResponse(this.responseText);
+		    }
+		};
+		toSend = "contents=" + encodeURIComponent(JSON.stringify(json, Cornipickle.escape_json_string));
+
+		var cpProbeProbeHash = sessionStorage.getItem(cp_probe.probe_hash);
+
+		if( cpProbeProbeHash != null )
+		{
+			toSend += "&interpreter=" + encodeURIComponent(sessionStorage.getItem(cp_probe.probe_hash));
+		}
+
+		if(this.probe_id != "")
+		{
+			toSend += "&id=" + this.probe_id;
+		}
+
+		if(this.probe_hash != "")
+		{
+			toSend += "&hash=" + this.probe_hash;
+		}
+		xhttp.send(toSend);
+
+	};
 
 	this.handleEvent = function(event)
 	{
@@ -484,8 +525,13 @@ Cornipickle.CornipickleProbe.handleResponse = function(response)
 	console.log("handle Response");
 	// eval is evil, but we can't assume JSON.parse is available
 	eval("var response = " + decodeURI(response)); // jshint ignore:line
-
-	sessionStorage.setItem(cp_probe.probe_hash,response.interpreter);
+	
+	if(!(response.interpreter === ""))
+	{
+		sessionStorage.setItem(cp_probe.probe_hash,response.interpreter);
+		console.log("interpreter wasn't empty");
+	}
+	
 	document.getElementById("cp-image").src = response["image"];
 	if (response["global-verdict"] === "TRUE")
 	{
@@ -827,10 +873,10 @@ function loadFunction() {
             return;
         }
         cp_probe.handleEvent(event);
+        window.setTimeout(function() {
+        	cp_probe.preEvaluate();
+        }, 500);
     };
-
-	//Call the probe a first time at startup
-	//cp_probe.handleEvent(null);
 }
 
 var addFunctionOnWindowLoad = function(callback){

From 768c6424333adab3d19af8f15e5225ae88f696d3 Mon Sep 17 00:00:00 2001
From: Faterou <francis_tofu@hotmail.com>
Date: Wed, 12 Apr 2017 14:29:32 -0400
Subject: [PATCH 3/3] Updated version number.

---
 config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.xml b/config.xml
index c94d547..75fd127 100755
--- a/config.xml
+++ b/config.xml
@@ -26,7 +26,7 @@
   <name>Cornipickle</name>
   
   <!-- The project's version number -->
-  <version>1.1</version>
+  <version>1.2</version>
   
   <!-- The project's author. Currently this only
   shows up in the footer of the Javadoc documentation. -->