From 63e6a01e8f9e9cfa04fc083bf845891d538ba9eb Mon Sep 17 00:00:00 2001
From: Sida Wang <sidaw@cs.stanford.edu>
Date: Mon, 23 Jan 2017 11:42:56 -0800
Subject: [PATCH] sandbox bug fix

---
 src/edu/stanford/nlp/sempre/JsonServer.java | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/edu/stanford/nlp/sempre/JsonServer.java b/src/edu/stanford/nlp/sempre/JsonServer.java
index 059fa5c..d258efa 100644
--- a/src/edu/stanford/nlp/sempre/JsonServer.java
+++ b/src/edu/stanford/nlp/sempre/JsonServer.java
@@ -211,8 +211,9 @@ public class JsonServer {
         
         
         synchronized (queryLogLock)  {
-          boolean isContext = query.startsWith("(:context ");
-          if (!sandbox && (!isContext || opts.verbose >= 2)) {
+//          boolean isContext = query.startsWith("(:context ");
+//          if (!sandbox && (!isContext || opts.verbose >= 2)) {
+          if (!sandbox) {
             PrintWriter out = IOUtils.openOutAppend(opts.queryLogPath);
             out.println(Json.writeValueAsStringHard(jsonMap));
             out.close();
@@ -226,11 +227,8 @@ public class JsonServer {
       Session session = master.getSession(sessionId);
       session.remoteHost = remoteHost;
       session.format = "json";
-      // 
-      session.logToFile = sandbox;
-
-      if (query == null) query = session.getLastQuery();
-      if (query == null) query = "";
+      session.sandbox = sandbox;
+      if (query == null) query = "null";
       logs("Server.handleQuery %s: %s", session.id, query);
 
       // Print header