Add LIMIT & OFFSET to Search query (#159)

RDFLib · Oct 4, 2023 · 630d403 · 630d403
1 parent a8e64b4
commit 630d403
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/prez/models/search_method.py b/prez/models/search_method.py
@@ -24,11 +24,12 @@ class SearchMethod(BaseModel):
     def __hash__(self):
         return hash(self.uri)
 
-    def populate_query(self, term, limit, focus_to_filter, filter_to_focus, predicates):
+    def populate_query(self, term, limit, offset, focus_to_filter, filter_to_focus, predicates):
         self.populated_query = self.template_query.substitute(
             {
                 "TERM": term,
                 "LIMIT": limit,
+                "OFFSET": offset,
                 "FOCUS_TO_FILTER": focus_to_filter,
                 "FILTER_TO_FOCUS": filter_to_focus,
                 "PREDICATES": predicates,

diff --git a/prez/reference_data/search_methods/search_default.ttl b/prez/reference_data/search_methods/search_default.ttl
@@ -37,6 +37,7 @@ prez:default
             }
         }
         GROUP BY ?search_result_uri ?predicate ?match
-        LIMIT $LIMIT
+        ORDER BY DESC(?weight)
+        LIMIT $LIMIT OFFSET $OFFSET
     }
         """ .
diff --git a/prez/routers/search.py b/prez/routers/search.py
@@ -23,6 +23,7 @@ async def search(
 ):
     term = request.query_params.get("term")
     limit = request.query_params.get("limit", 20)
+    offset = request.query_params.get("offset", 0)
     foc_2_filt, filt_2_foc = extract_qsa_params(request.query_params)
     if not term:
         return PlainTextResponse(
@@ -59,7 +60,7 @@ async def search(
     )
     predicates_sparql_string = " ".join(f"<{p}>" for p in predicates)
     search_query.populate_query(
-        term, limit, filter_to_focus_str, focus_to_filter_str, predicates_sparql_string
+        term, limit, offset, filter_to_focus_str, focus_to_filter_str, predicates_sparql_string
     )
 
     full_query = generate_item_construct(