Drop unused enum values in JuniperDFW.

3 files changed, 28 insertions, 28 deletions

diff --git a/searchsummary/src/tests/juniper/auxTest.cpp b/searchsummary/src/tests/juniper/auxTest.cpp
index c42cf4ccd83..d4b65858e3e 100644
--- a/searchsummary/src/tests/juniper/auxTest.cpp
+++ b/searchsummary/src/tests/juniper/auxTest.cpp
@@ -137,7 +137,7 @@ AuxTest::TestDoubleWidth()
     juniper::QueryParser q("\xef\xbd\x93\xef\xbd\x8f\xef\xbd\x8e\xef\xbd\x99");
     juniper::QueryHandle qh(q, nullptr, juniper.getModifier());
     auto res = juniper::Analyse(myConfig, qh,
-                                input, 17, 0, 0, 0);
+                                input, 17, 0, 0);
     _test(static_cast<bool>(res));
 
     juniper::Summary* sum = juniper::GetTeaser(*res, nullptr);
@@ -175,7 +175,7 @@ AuxTest::TestPartialUTF8()
     juniper::QueryParser q("ipod");
     juniper::QueryHandle qh(q, nullptr, juniper.getModifier());
     auto res = juniper::Analyse(myConfig, qh,
-                                input, inputSize, 0, 0, 0);
+                                input, inputSize, 0, 0);
     _test(static_cast<bool>(res));
 
     juniper::Summary* sum = juniper::GetTeaser(*res, nullptr);
@@ -213,7 +213,7 @@ void AuxTest::TestLargeBlockChinese()
     juniper::QueryParser q("希望");
     juniper::QueryHandle qh(q, nullptr, juniper.getModifier());
     auto res = juniper::Analyse(myConfig, qh,
-                                input, inputSize, 0, 0, 0);
+                                input, inputSize, 0, 0);
     _test(static_cast<bool>(res));
 
     juniper::Summary* sum = juniper::GetTeaser(*res, nullptr);
@@ -238,7 +238,7 @@ void AuxTest::TestExample()
     int content_len = strlen(content);
     auto res = juniper::Analyse(*juniper::TestConfig, qh,
                                 content, content_len,
-                                0, 0, 0);
+                                0, 0);
     _test(static_cast<bool>(res));
 
     res->Scan();
@@ -402,7 +402,7 @@ void AuxTest::TestUTF8context()
     s.append(char_from_u8(u8" beste forekomst av s\u00f8ket med s\u00f8kemotor til brukeren blir det enda bedre. "));
     s.append(char_from_u8(u8"Hvis bare UTF8-kodingen virker som den skal for tegn som tar mer enn \u00e9n byte."));
 
-    auto res = juniper::Analyse(*juniper::TestConfig, qh, s.c_str(), s.size(), 0, 0, 0);
+    auto res = juniper::Analyse(*juniper::TestConfig, qh, s.c_str(), s.size(), 0, 0);
     _test(static_cast<bool>(res));
 
     size_t charsize;
@@ -484,7 +484,7 @@ void AuxTest::TestJapanese()
         int content_len = strlen(content);
         auto res = juniper::Analyse(*juniper::TestConfig, qh,
                                     content, content_len,
-                                    0, 0, 0);
+                                    0, 0);
         _test(static_cast<bool>(res));
 
         size_t charsize;
@@ -574,7 +574,7 @@ void AuxTest::TestStartHits()
     int content_len = strlen(content);
     auto res = juniper::Analyse(*juniper::TestConfig, qh,
                                 content, content_len,
-                                0, 0, 0);
+                                0, 0);
     _test(static_cast<bool>(res));
 
     juniper::Summary* sum = juniper::GetTeaser(*res, nullptr);
@@ -598,7 +598,7 @@ void AuxTest::TestEndHit()
 
     auto res = juniper::Analyse(*juniper::TestConfig, qh,
                                 content, content_len,
-                                0, 0, 0);
+                                0, 0);
     _test(static_cast<bool>(res));
 
     juniper::Summary* sum = juniper::GetTeaser(*res, nullptr);
@@ -868,7 +868,7 @@ AuxTest::TestWhiteSpacePreserved()
 
     juniper::QueryParser q("best");
     juniper::QueryHandle qh(q, nullptr, juniper.getModifier());
-    auto res = juniper::Analyse(myConfig, qh, input.c_str(), input.size(), 0, 0, 0);
+    auto res = juniper::Analyse(myConfig, qh, input.c_str(), input.size(), 0, 0);
     _test(static_cast<bool>(res));
 
     juniper::Summary* sum = juniper::GetTeaser(*res, nullptr);
diff --git a/searchsummary/src/tests/juniper/matchobjectTest.cpp b/searchsummary/src/tests/juniper/matchobjectTest.cpp
index d8b7724d8a5..f1dc9f81e4a 100644
--- a/searchsummary/src/tests/juniper/matchobjectTest.cpp
+++ b/searchsummary/src/tests/juniper/matchobjectTest.cpp
@@ -30,7 +30,7 @@ void MatchObjectTest::testTerm() {
     // Fetch a result descriptor:
     auto res = juniper::Analyse(*juniper::TestConfig, q._qhandle,
                                 content, content_len,
-                                0, 0, 0);
+                                0, 0);
     _test(static_cast<bool>(res));
 
     // Do the scanning manually. This calls accept several times
@@ -47,10 +47,10 @@ void MatchObjectTest::testTerm() {
     TestQuery q2("*ea*");
     TestQuery q3("*d");
     TestQuery q4("*word");
-    auto r1 = juniper::Analyse(*juniper::TestConfig, q1._qhandle, content, content_len, 0, 0, 0);
-    auto r2 = juniper::Analyse(*juniper::TestConfig, q2._qhandle, content, content_len, 0, 0, 0);
-    auto r3 = juniper::Analyse(*juniper::TestConfig, q3._qhandle, content, content_len, 0, 0, 0);
-    auto r4 = juniper::Analyse(*juniper::TestConfig, q4._qhandle, content, content_len, 0, 0, 0);
+    auto r1 = juniper::Analyse(*juniper::TestConfig, q1._qhandle, content, content_len, 0, 0);
+    auto r2 = juniper::Analyse(*juniper::TestConfig, q2._qhandle, content, content_len, 0, 0);
+    auto r3 = juniper::Analyse(*juniper::TestConfig, q3._qhandle, content, content_len, 0, 0);
+    auto r4 = juniper::Analyse(*juniper::TestConfig, q4._qhandle, content, content_len, 0, 0);
     _test(static_cast<bool>(r1));
     if (r1) {
         r1->Scan();
diff --git a/searchsummary/src/tests/juniper/mcandTest.cpp b/searchsummary/src/tests/juniper/mcandTest.cpp
index 46bd4a5196f..43d34539ddf 100644
--- a/searchsummary/src/tests/juniper/mcandTest.cpp
+++ b/searchsummary/src/tests/juniper/mcandTest.cpp
@@ -44,7 +44,7 @@ void MatchCandidateTest::testLog() {
     auto res = juniper::Analyse(*juniper::TestConfig,
                                 q._qhandle,
                                 content.c_str(), content.size(),
-                                0, 0, 0);
+                                0, 0);
     _test(static_cast<bool>(res)); // We get a result handle
     _test(!res->_mo); // but it is empty
 
@@ -72,7 +72,7 @@ void MatchCandidateTest::testDump() {
         auto res = juniper::Analyse(*juniper::TestConfig,
                                     q._qhandle,
                                     content.c_str(), content.size(),
-                                    0, 0, 0);
+                                    0, 0);
         _test(static_cast<bool>(res));
         long relevance = juniper::GetRelevancy(*res);
         // zero value since there are no hits and constraints are enabled..
@@ -84,7 +84,7 @@ void MatchCandidateTest::testDump() {
         auto res = juniper::Analyse(*juniper::TestConfig,
                                     q._qhandle,
                                     content.c_str(), content.size(),
-                                    0, 0, 0);
+                                    0, 0);
         _test(static_cast<bool>(res));
         long relevance = juniper::GetRelevancy(*res);
         // Check that X_CONSTR propagates as intended
@@ -96,7 +96,7 @@ void MatchCandidateTest::testDump() {
         auto res = juniper::Analyse(*juniper::TestConfig,
                                     q._qhandle,
                                     content.c_str(), content.size(),
-                                    0, 0, 0);
+                                    0, 0);
         _test(static_cast<bool>(res));
         long relevance = juniper::GetRelevancy(*res);
         // constant value since there are no hits but this is
@@ -109,7 +109,7 @@ void MatchCandidateTest::testDump() {
         auto res = juniper::Analyse(*juniper::TestConfig,
                                     q._qhandle,
                                     content.c_str(), content.size(),
-                                    0, 0, 0);
+                                    0, 0);
         _test(static_cast<bool>(res));
         long relevance = juniper::GetRelevancy(*res);
         // Relevance may change, but nice to discover such changes..
@@ -133,7 +133,7 @@ void MatchCandidateTest::testorder() {
     auto res = juniper::Analyse(*juniper::TestConfig,
                                 q._qhandle,
                                 content, content_len,
-                                0, 0, 0);
+                                0, 0);
     _test(static_cast<bool>(res));
 
     // Do the scanning manually. Scan calls accept several times
@@ -162,7 +162,7 @@ void MatchCandidateTest::testMatches_limit() {
     auto res = juniper::Analyse(*juniper::TestConfig,
                                 q._qhandle,
                                 content, content_len,
-                                0, 0, 0);
+                                0, 0);
     _test(static_cast<bool>(res));
 
     // Do the scanning manually. This calls accept several times
@@ -196,7 +196,7 @@ void MatchCandidateTest::testAccept() {
     auto res = juniper::Analyse(*juniper::TestConfig,
                                 q._qhandle,
                                 content, content_len,
-                                0, 0, 0);
+                                0, 0);
     _test(static_cast<bool>(res));
 
     // Do the scanning manually. This calls accept several times
@@ -254,7 +254,7 @@ void MatchCandidateTest::testMake_keylist() {
     auto res = juniper::Analyse(*juniper::TestConfig,
                                 q._qhandle,
                                 content, content_len,
-                                0, 0, 0);
+                                0, 0);
     _test(static_cast<bool>(res));
 
     // Do the scanning manually. This calls accept several times
@@ -283,7 +283,7 @@ void MatchCandidateTest::testAdd_to_keylist() {
     auto res = juniper::Analyse(*juniper::TestConfig,
                                 q._qhandle,
                                 content, content_len,
-                                0, 0, 0);
+                                0, 0);
     _test(static_cast<bool>(res));
 
 // Do the scanning manually. This calls accept several times
@@ -321,7 +321,7 @@ void MatchCandidateTest::testLength() {
         // Fetch a result descriptor:
         auto res = juniper::Analyse(*juniper::TestConfig, q._qhandle,
                                     content, content_len,
-                                    0, 0, 0);
+                                    0, 0);
 
         juniper::Summary* sum = juniper::GetTeaser(*res);
         Matcher& m = *res->_matcher;
@@ -343,7 +343,7 @@ void MatchCandidateTest::testLength() {
         auto res = juniper::Analyse(*juniper::TestConfig,
                                     q._qhandle
                                     ,content, content_len,
-                                    0, 0, 0);
+                                    0, 0);
 
         res->Scan();
         Matcher& m = *res->_matcher;
@@ -360,7 +360,7 @@ void MatchCandidateTest::testLength() {
         // Fetch a result descriptor:
         auto res = juniper::Analyse(*juniper::TestConfig, q._qhandle,
                                     content, content_len,
-                                    0, 0, 0);
+                                    0, 0);
 
         res->Scan();
         Matcher& m = *res->_matcher;
@@ -403,7 +403,7 @@ void MatchCandidateTest::requireThatMaxNumberOfMatchCandidatesCanBeControlled()
     auto res = juniper::Analyse(*juniper::TestConfig,
                                 q._qhandle,
                                 content, content_len,
-                                0, 0, 0);
+                                0, 0);
     _test(static_cast<bool>(res));
 
     // Deflect tokens to my processor