commit 735bc4eda6ec0fa1ccb913e4484a4b52a6562062
author Eldon Carman <ecarm002@ucr.edu> Thu Jun 18 19:14:07 2015 -0700
committer Preston Carman <ecarm002@ucr.edu> Tue Jun 23 16:30:44 2015 -0700
tree 1b6c07b7e1308f9ebfd0ef220bd2d085d4a6dfe4
parent 0bae161187c485103d39df5c584c8d2e44ac898f

Fix for issue 872

Change-Id: If8cf621b8b89302cb28bd34f63e23f9c5f684351
Reviewed-on: https://asterix-gerrit.ics.uci.edu/290
Reviewed-by: Ildar Absalyamov <ildar.absalyamov@gmail.com>
Reviewed-by: Ian Maxon <imaxon@apache.org>
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>

asterix-app/src/main/java/edu/uci/ics/asterix/api/common/APIFramework.java

diff --git a/asterix-app/src/main/java/edu/uci/ics/asterix/api/common/APIFramework.java b/asterix-app/src/main/java/edu/uci/ics/asterix/api/common/APIFramework.java
index 0ce15ed..2d91d90 100644
--- a/asterix-app/src/main/java/edu/uci/ics/asterix/api/common/APIFramework.java
+++ b/asterix-app/src/main/java/edu/uci/ics/asterix/api/common/APIFramework.java
@@ -157,7 +157,7 @@
     public static Pair<Query, Integer> reWriteQuery(List<FunctionDecl> declaredFunctions,
             AqlMetadataProvider metadataProvider, Query q, SessionConfig conf) throws AsterixException {
 
-        if (conf.is(SessionConfig.FORMAT_ONLY_PHYSICAL_OPS) && conf.is(SessionConfig.OOB_EXPR_TREE)) {
+        if (!conf.is(SessionConfig.FORMAT_ONLY_PHYSICAL_OPS) && conf.is(SessionConfig.OOB_EXPR_TREE)) {
             conf.out().println();
 
             if (conf.is(SessionConfig.FORMAT_HTML)) {
@@ -186,7 +186,7 @@
             SessionConfig conf, ICompiledDmlStatement statement) throws AsterixException, AlgebricksException,
             JSONException, RemoteException, ACIDException {
 
-        if (conf.is(SessionConfig.FORMAT_ONLY_PHYSICAL_OPS) && conf.is(SessionConfig.OOB_REWRITTEN_EXPR_TREE)) {
+        if (!conf.is(SessionConfig.FORMAT_ONLY_PHYSICAL_OPS) && conf.is(SessionConfig.OOB_REWRITTEN_EXPR_TREE)) {
             conf.out().println();
 
             if (conf.is(SessionConfig.FORMAT_HTML)) {
@@ -219,7 +219,7 @@
         }
 
         LogicalOperatorPrettyPrintVisitor pvisitor = new LogicalOperatorPrettyPrintVisitor();
-        if (conf.is(SessionConfig.FORMAT_ONLY_PHYSICAL_OPS) && conf.is(SessionConfig.OOB_LOGICAL_PLAN)) {
+        if (!conf.is(SessionConfig.FORMAT_ONLY_PHYSICAL_OPS) && conf.is(SessionConfig.OOB_LOGICAL_PLAN)) {
             conf.out().println();
 
             if (conf.is(SessionConfig.FORMAT_HTML)) {

asterix-app/src/main/resources/webui/querytemplate.html

diff --git a/asterix-app/src/main/resources/webui/querytemplate.html b/asterix-app/src/main/resources/webui/querytemplate.html
index bcd177c..fb0a1cc 100644
--- a/asterix-app/src/main/resources/webui/querytemplate.html
+++ b/asterix-app/src/main/resources/webui/querytemplate.html
@@ -197,10 +197,10 @@
             <div>
               <label class="checkbox optlabel"> Output Format:<br/>
                 <select name="output-format" class="btn">
-                  <option selected value="JSON">JSON</option>
-                  <option value="ADM">ADM</option>
+                  <option selected value="ADM">ADM</option>
                   <option value="CSV">CSV (no header)</option>
                   <option value="CSV-Header">CSV (with header)</option>
+                  <option value="JSON">JSON</option>
                 </select>
               </label>
               <label class="checkbox optlabel"><input type="checkbox" name="print-expr-tree" value="true" /> Print parsed expressions</label>