Skip to content

Commit d41ae7f

Browse files
committed
Log the total number of matching score sets rather than the number returned.
1 parent ca631d9 commit d41ae7f

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

src/mavedb/lib/score_sets.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -278,16 +278,14 @@ def search_score_sets(db: Session, owner_or_contributor: Optional[User], search:
278278

279279
num_score_sets = len(score_sets)
280280
if search.limit is not None and num_score_sets > search.limit:
281-
# Limit the results.
281+
# In the main query, we have allowed limit + 1 results. The extra record tells us whether we need to run a count
282+
# query.
282283
score_sets = score_sets[: search.limit]
283-
count_query = db.query(ScoreSet) # \
284-
# .filter(ScoreSet.private.is_(False))
284+
count_query = db.query(ScoreSet)
285285
build_search_score_sets_query_filter(db, count_query, owner_or_contributor, search)
286286
num_score_sets = count_query.order_by(None).limit(None).count()
287287

288-
# build_search_score_sets_query_filter(db, query, owner_or_contributor, search)
289-
290-
save_to_logging_context({"matching_resources": len(score_sets)})
288+
save_to_logging_context({"matching_resources": num_score_sets})
291289
logger.debug(msg=f"Score set search yielded {len(score_sets)} matching resources.", extra=logging_context())
292290

293291
return {"score_sets": score_sets, "num_score_sets": num_score_sets}

0 commit comments

Comments
 (0)