summaryrefslogtreecommitdiffstats
path: root/searchsummary
diff options
context:
space:
mode:
authorGeir Storli <geirst@verizonmedia.com>2019-11-29 15:19:59 +0000
committerGeir Storli <geirst@verizonmedia.com>2019-12-03 08:20:54 +0000
commit06fc5a871482470cebf6315dc47342b0cbc06900 (patch)
tree8da5f603dac1b64070bd0ff3850b9a8448fa4091 /searchsummary
parent610dcc8a32847c0b017e55319f2c5977004c198f (diff)
Rename urlresult* -> general_result* to match class name.
Diffstat (limited to 'searchsummary')
-rw-r--r--searchsummary/src/tests/docsumformat/docsum-pack.cpp2
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/CMakeLists.txt2
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.h2
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.h2
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/general_result.cpp (renamed from searchsummary/src/vespa/searchsummary/docsummary/urlresult.cpp)2
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/general_result.h (renamed from searchsummary/src/vespa/searchsummary/docsummary/urlresult.h)0
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/juniperdfw.h2
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/resultconfig.h2
8 files changed, 7 insertions, 7 deletions
diff --git a/searchsummary/src/tests/docsumformat/docsum-pack.cpp b/searchsummary/src/tests/docsumformat/docsum-pack.cpp
index 18b38db3fa1..c88513920ca 100644
--- a/searchsummary/src/tests/docsumformat/docsum-pack.cpp
+++ b/searchsummary/src/tests/docsumformat/docsum-pack.cpp
@@ -1,7 +1,7 @@
// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <vespa/searchlib/util/rawbuf.h>
-#include <vespa/searchsummary/docsummary/urlresult.h>
+#include <vespa/searchsummary/docsummary/general_result.h>
#include <vespa/searchsummary/docsummary/resultconfig.h>
#include <vespa/searchsummary/docsummary/resultpacker.h>
#include <vespa/fastos/app.h>
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/CMakeLists.txt b/searchsummary/src/vespa/searchsummary/docsummary/CMakeLists.txt
index 6d846a47d93..0152da26a7f 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/CMakeLists.txt
+++ b/searchsummary/src/vespa/searchsummary/docsummary/CMakeLists.txt
@@ -10,6 +10,7 @@ vespa_add_library(searchsummary_docsummary OBJECT
docsumstate.cpp
docsumwriter.cpp
dynamicteaserdfw.cpp
+ general_result.cpp
geoposdfw.cpp
getdocsumargs.cpp
juniperproperties.cpp
@@ -28,7 +29,6 @@ vespa_add_library(searchsummary_docsummary OBJECT
summaryfieldconverter.cpp
textextractordfw.cpp
tokenizer.cpp
- urlresult.cpp
AFTER
searchsummary_config
)
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.h b/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.h
index 1a904d4f858..43375fb47f3 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.h
@@ -2,7 +2,7 @@
#pragma once
-#include "urlresult.h"
+#include "general_result.h"
#include "resultconfig.h"
#include <vespa/searchlib/util/rawbuf.h>
#include <vespa/vespalib/data/slime/inserter.h>
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.h b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.h
index e5dd2793089..2b686afcb42 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.h
@@ -3,7 +3,7 @@
#pragma once
#include "juniperproperties.h"
-#include "urlresult.h"
+#include "general_result.h"
#include "resultconfig.h"
#include "docsumstore.h"
#include "keywordextractor.h"
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/urlresult.cpp b/searchsummary/src/vespa/searchsummary/docsummary/general_result.cpp
index 074cc1cadf1..8e4c6bbb4ce 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/urlresult.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/general_result.cpp
@@ -1,6 +1,6 @@
// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include "urlresult.h"
+#include "general_result.h"
#include "resultconfig.h"
#include <zlib.h>
#include <cassert>
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/urlresult.h b/searchsummary/src/vespa/searchsummary/docsummary/general_result.h
index a4cdd1b7f69..a4cdd1b7f69 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/urlresult.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/general_result.h
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/juniperdfw.h b/searchsummary/src/vespa/searchsummary/docsummary/juniperdfw.h
index 17beddf1e60..1cdeeb2f679 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/juniperdfw.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/juniperdfw.h
@@ -2,7 +2,7 @@
#pragma once
-#include "urlresult.h"
+#include "general_result.h"
#include "resultconfig.h"
#include "docsumfieldwriter.h"
#include <vespa/searchlib/util/rawbuf.h>
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/resultconfig.h b/searchsummary/src/vespa/searchsummary/docsummary/resultconfig.h
index 31218d94e93..3df96c3e838 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/resultconfig.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/resultconfig.h
@@ -3,7 +3,7 @@
#pragma once
#include "resultclass.h"
-#include "urlresult.h"
+#include "general_result.h"
#include <vespa/config-summary.h>
#include <vespa/searchlib/util/rawbuf.h>
#include <vespa/searchlib/util/stringenum.h>