From 487f911a47b114cb6a751e6fb4a3e8c336c6dcfd Mon Sep 17 00:00:00 2001 From: Eric Zhang <31218485+16BitNarwhal@users.noreply.github.com> Date: Fri, 24 May 2024 20:43:11 -0400 Subject: [PATCH] rename collection to index in route (#2503) Renamed /api/collection/ to /api/index/ --- src/main/frontend/pages/components/SearchBar.tsx | 4 ++-- src/main/java/io/anserini/server/Controller.java | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/frontend/pages/components/SearchBar.tsx b/src/main/frontend/pages/components/SearchBar.tsx index d22b8d119e..d2b3df81b2 100644 --- a/src/main/frontend/pages/components/SearchBar.tsx +++ b/src/main/frontend/pages/components/SearchBar.tsx @@ -23,11 +23,11 @@ const SearchBar: React.FC = () => { const [query, setQuery] = useState(''); const [index, setIndex] = useState(''); - const fetchResults = async (query: string, collection: string) => { + const fetchResults = async (query: string, index: string) => { setLoading(true); try { let endpoint = '/api'; - if (collection != '') endpoint += `/collection/${collection}`; + if (index != '') endpoint += `/index/${index}`; endpoint += `/search?query=${query}`; const response = await fetch(endpoint); diff --git a/src/main/java/io/anserini/server/Controller.java b/src/main/java/io/anserini/server/Controller.java index 5eabbeb6e4..3074766153 100644 --- a/src/main/java/io/anserini/server/Controller.java +++ b/src/main/java/io/anserini/server/Controller.java @@ -30,19 +30,19 @@ @RequestMapping(path = "/api") public class Controller { - private static final String DEFAULT_COLLECTION = "msmarco-v1-passage"; + private static final String DEFAULT_INDEX = "msmarco-v1-passage"; - @RequestMapping(method = RequestMethod.GET, path = {"/collection/{collection}/search", "/search"}) - public Map search(@PathVariable(value = "collection", required = false) String collection, + @RequestMapping(method = RequestMethod.GET, path = {"/index/{index}/search", "/search"}) + public Map search(@PathVariable(value = "index", required = false) String index, @RequestParam("query") String query, @RequestParam(value = "hits", defaultValue = "10") int hits, @RequestParam(value = "qid", defaultValue = "") String qid) { - if (collection == null) { - collection = DEFAULT_COLLECTION; + if (index == null) { + index = DEFAULT_INDEX; } - SearchService searchService = new SearchService(collection); + SearchService searchService = new SearchService(index); List> candidates = searchService.search(query, hits); Map queryMap = new LinkedHashMap<>();