From cd700875d174d8d12ea501f5ca71f2723307c65c Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Mon, 30 Sep 2019 17:10:30 +0000
Subject: Remove some more transport related stuff.

---
 .../src/vespa/searchvisitor/searchvisitor.cpp       | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'streamingvisitors')

diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
index a1f1d41f87a..63972ca139d 100644
--- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
@@ -9,7 +9,6 @@
 #include <vespa/document/datatype/mapdatatype.h>
 #include <vespa/searchlib/aggregation/modifiers.h>
 #include <vespa/searchlib/common/packets.h>
-#include <vespa/searchlib/common/transport.h>
 #include <vespa/searchlib/uca/ucaconverter.h>
 #include <vespa/searchlib/features/setup.h>
 #include <vespa/vespalib/geo/zcurve.h>
@@ -51,6 +50,11 @@ ForceWordfolderInit::ForceWordfolderInit()
 
 static ForceWordfolderInit _G_forceNormWordFolderInit;
 
+// Leftovers from FS4 protocol with limited use here.
+enum queryflags {
+    QFLAG_DUMP_FEATURES        = 0x00040000
+};
+
 
 AttributeVector::SP
 createMultiValueAttribute(const vespalib::string & name, const document::FieldValue & fv, bool arrayType)
@@ -223,11 +227,11 @@ void SearchVisitor::init(const Parameters & params)
         LOG(debug, "Received rank profile: %s", _rankController.getRankProfile().c_str());
     }
 
-    if (params.lookup("queryflags", valueRef) ) {
-        vespalib::string tmp(valueRef.data(), valueRef.size());
-        LOG(debug, "Received query flags: 0x%lx", strtoul(tmp.c_str(), nullptr, 0));
-        uint32_t queryFlags = strtoul(tmp.c_str(), nullptr, 0);
-        _rankController.setDumpFeatures((queryFlags & search::fs4transport::QFLAG_DUMP_FEATURES) != 0);
+    int queryFlags = 0;
+    if (params.get("queryflags", queryFlags)) {
+        bool dumpFeatures = (queryFlags & QFLAG_DUMP_FEATURES) != 0;
+        _summaryGenerator.getDocsumState()._args.dumpFeatures(dumpFeatures);
+        _rankController.setDumpFeatures(dumpFeatures);
         LOG(debug, "QFLAG_DUMP_FEATURES: %s", _rankController.getDumpFeatures() ? "true" : "false");
     }
 
@@ -263,11 +267,6 @@ void SearchVisitor::init(const Parameters & params)
         _summaryGenerator.getDocsumState()._args.SetRankProfile(tmp);
     }
 
-    int queryFlags = 0;
-    if (params.get("queryflags", queryFlags)) {
-        _summaryGenerator.getDocsumState()._args.SetQueryFlags(queryFlags);
-    }
-
     vespalib::string location;
     if (params.lookup("location", valueRef)) {
         location = vespalib::string(valueRef.data(), valueRef.size());
-- 
cgit v1.2.3