/*
 * Copyright 2011 Revelytix, Inc.
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 * 
 *     http://www.apache.org/licenses/LICENSE-2.0
 * 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package sherpa.client;

import java.util.HashMap;
import java.util.Map;

import spark.api.Command;
import spark.api.Connection;
import spark.api.Result;
import spark.api.Solutions;
import spark.api.Triples;
import spark.spi.BaseCommand;

public class SHPCommand extends BaseCommand implements Command {
  
  private QueryExecution query;
  private Integer batchSize = null;
  
  public SHPCommand(Connection connection, String command, QueryExecution query) {
    super(connection, command);
    this.query = query;
  }

  public void setBatchSize(int batchSize) {
    this.batchSize = Integer.valueOf(batchSize);
  }
  
  @Override
  public void cancel() {
    this.query.cancel();
  }

  @Override
  public Result execute() {    
    // TODO Auto-generated method stub
    return null;
  }

  @Override
  public Triples executeGraph() {
    // TODO Auto-generated method stub
    return null;
  }

  @Override
  public boolean executeAsk() {
    // TODO Auto-generated method stub
    return false;
  }

  @Override
  public Solutions executeQuery() {
    Map<String,String> params = new HashMap<String,String>();
    Map<String,String> props = new HashMap<String,String>();
    if (batchSize != null) props.put(QueryExecution.BATCH_SIZE, batchSize.toString());
    props.put(QueryExecution.TIMEOUT, "" + getTimeout());
    query.query(getCommand(), params, props);
    return new SHPSolutions(this, query);
  }

}

@@ -911,16 +911,22 @@
 private 
+final 
 QueryExe
@@ -953,32 +953,71 @@
 ate 
-Integer batchSize = null
+final Map%3CString, String%3E props = new HashMap%3CString, String%3E()
 ;%0A  
@@ -1213,24 +1213,44 @@
     
-this.batchSize =
+props.put(QueryExecution.BATCH_SIZE,
  Int
@@ -1258,15 +1258,16 @@
 ger.
-valueOf
+toString
 (bat
@@ -1273,16 +1273,17 @@
 tchSize)
+)
 ;%0A  %7D%0A  
@@ -1782,199 +1782,61 @@
 ();%0A
-    Map%3CString,String%3E props = new HashMap%3CString,String%3E();%0A    if (batchSize != null) props.put(QueryExecution.BATCH_SIZE, batchSize.toString());%0A    props.put(QueryExecution.TIMEOUT, %22%22 + 
+%0A    props.put(QueryExecution.TIMEOUT, Long.toString(
 getT
@@ -1844,17 +1844,19 @@
 meout())
-;
+);%0A
 %0A    que
@@ -1894,16 +1894,17 @@
 props);%0A
+%0A
     retu

change SHPCommand to keep a props Map & setBatchSize to operate directly on it