1 files changed, 17 insertions, 3 deletions
diff --git a/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java b/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java
index f84cb7270bd..340d4a7eb81 100644
--- a/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java
+++ b/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java
@@ -371,6 +371,7 @@ public class VdsVisit {
         private int fullTimeout = 7 * 24 * 60 * 60 * 1000;
         private boolean jsonOutput = false;
         private boolean tensorShortForm = false; // TODO Vespa 9: change default to true
+        private boolean tensorDirectValues = false; // TODO Vespa 9: change default to true
 
         public VisitorParameters getVisitorParameters() {
             return visitorParameters;
@@ -447,16 +448,25 @@ public class VdsVisit {
         public void setTensorShortForm(boolean tensorShortForm) {
             this.tensorShortForm = tensorShortForm;
         }
+
+        public boolean tensorDirectValues() {
+            return tensorDirectValues;
+        }
+
+        public void setTensorDirectValues(boolean tensorDirectValues) {
+            this.tensorDirectValues = tensorDirectValues;
+        }
+
     }
 
     protected static class ArgumentParser {
-        private Options options;
+        private final Options options;
 
         public ArgumentParser(Options options) {
             this.options = options;
         }
 
-        public VdsVisitParameters parse(String args[]) throws org.apache.commons.cli.ParseException {
+        public VdsVisitParameters parse(String[] args) throws org.apache.commons.cli.ParseException {
             VdsVisitParameters allParams = new VdsVisitParameters();
             VisitorParameters params = new VisitorParameters("");
             CommandLineParser parser = new DefaultParser();
@@ -572,6 +582,9 @@ public class VdsVisit {
             if (line.hasOption("shorttensors")) {
                 allParams.setTensorShortForm(true);
             }
+            if (line.hasOption("tensorvalues")) {
+                allParams.setTensorDirectValues(true);
+            }
 
             boolean jsonOutput = line.hasOption("jsonoutput");
             boolean xmlOutput = line.hasOption("xmloutput");
@@ -743,7 +756,8 @@ public class VdsVisit {
                 params.getAbortOnClusterDown(),
                 params.getProcessTime(),
                 params.jsonOutput,
-                params.tensorShortForm);
+                params.tensorShortForm,
+                params.tensorDirectValues);
 
         if (visitorParameters.getResumeFileName() != null) {
             handler.setProgressFileName(visitorParameters.getResumeFileName());