Mirror/MarginaliaSearch
1
0
Fork 0
mirror of https://github.com/MarginaliaSearch/MarginaliaSearch.git synced 2025-02-24 05:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request 'master' (#50) from master into release

Browse Source 
Reviewed-on: https://git.marginalia.nu/marginalia/marginalia.nu/pulls/50
This commit is contained in:
Viktor Lofgren 2022-07-28 18:34:35 +02:00
commit cc774848e2
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/data/dao/EdgeDataStoreDaoImpl.java
View File

@ -267,6 +267,9 @@ public class EdgeDataStoreDaoImpl implements EdgeDataStoreDao {
@Override @Override
public List<BrowseResult> getBrowseResultFromUrlIds(List<EdgeId<EdgeUrl>> urlId) { public List<BrowseResult> getBrowseResultFromUrlIds(List<EdgeId<EdgeUrl>> urlId) {
if (urlId.isEmpty())
return Collections.emptyList();
List<BrowseResult> ret = new ArrayList<>(urlId.size()); List<BrowseResult> ret = new ArrayList<>(urlId.size());
try (var conn = dataSource.getConnection()) { try (var conn = dataSource.getConnection()) {
@ -274,7 +277,7 @@ public class EdgeDataStoreDaoImpl implements EdgeDataStoreDao {
// this is safe, string cocatenation is of integers // this is safe, string cocatenation is of integers
String inStmt = urlId.stream().map(id -> Integer.toString(id.id())).collect(Collectors.joining(", ", "(", ")")); String inStmt = urlId.stream().map(id -> Integer.toString(id.id())).collect(Collectors.joining(", ", "(", ")"));
var rsp = stmt.executeQuery("SELECT DOMAIN_ID, DOMAIN_NAME FROM EC_URL_VIEW WHERE ID IN " + inStmt); var rsp = stmt.executeQuery("SELECT DOMAIN_ID, DOMAIN_NAME FROM EC_URL_VIEW WHERE QUALITY>-5 ID IN " + inStmt);
while (rsp.next()) { while (rsp.next()) {
int id = rsp.getInt(1); int id = rsp.getInt(1);
String domain = rsp.getString(2); String domain = rsp.getString(2);

2
marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/search/EdgeSearchOperator.java
View File

@ -116,7 +116,7 @@ public class EdgeSearchOperator {
.findFirst().map(sq -> sq.searchTermsInclude).orElseGet(Collections::emptyList); .findFirst().map(sq -> sq.searchTermsInclude).orElseGet(Collections::emptyList);
if (keywords.size() == 1) { if (keywords.size() == 1) {
var request = new EdgeDomainSearchSpecification(specs.buckets.get(0), IndexBlock.Top, keywords.get(0), 1_000_000, 50, 5); var request = new EdgeDomainSearchSpecification(specs.buckets.get(0), IndexBlock.Topic, keywords.get(0), 1_000_000, 5, 10);
var response = indexClient.queryDomains(ctx, request); var response = indexClient.queryDomains(ctx, request);
return edgeDataStoreDao.getBrowseResultFromUrlIds(response.results); return edgeDataStoreDao.getBrowseResultFromUrlIds(response.results);