feat: improve query handling with general-agent

nrkno · Aug 15, 2023 · 42e02cb · 42e02cb
1 parent 83b5c95
commit 42e02cb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/client/agents/general/general-agent.js b/client/agents/general/general-agent.js
@@ -9,7 +9,8 @@ const REQUESTS = {
 		path: paths.SEARCH,
 		params: {
 			TITLE: 'title',
-			CREATED: 'created'
+			CREATED: 'created',
+			POOL_ID: 'poolId'
 		}
 	}
 }
@@ -35,6 +36,7 @@ class GeneralAgent {
 	 * @param {object} criteria - query criteria
 	 * @param {string} criteria.title - clip title criteria. * is allowed as a wildcard
 	 * @param {string} criteria.created - scope the search to clips created in a specific period
+	 * @param {string} criteria.poolId - optional poolId to be forwarded to the backend search agent
 	 *
 	 * @returns {Promise} - a promise containing the search results
 	 */
@@ -46,6 +48,7 @@ class GeneralAgent {
 		url.pathname = url.pathname + path
 		url.searchParams.append(params.TITLE, criteria?.title)
 		url.searchParams.append(params.CREATED, criteria?.created)
+		url.searchParams.append(params.POOL_ID, criteria?.poolId)
 
 		return fetch(url.href).then((response) => {
 			if (response.ok) {

diff --git a/client/ui/search-engine.js b/client/ui/search-engine.js
@@ -7,11 +7,11 @@ let isVisible = isNowVisible()
 let lastTimeout = null
 
 export async function init(server, poolId, refreshInterval, { onResults }) {
-	const quantelAgent = new QuantelAgent(server, poolId)
+	const quantelAgent = new QuantelAgent(server)
 	let firstQuery = true
 
 	function setQuery(query) {
-		lastQuery = Object.assign({}, query)
+		lastQuery = Object.assign({}, query, { poolId })
 
 		clearTimeout(lastTimeout)
 		performSearch(

diff --git a/server/agents/casparcg-scanner/casparcg-scanner-agent.mjs b/server/agents/casparcg-scanner/casparcg-scanner-agent.mjs
@@ -83,7 +83,8 @@ function filterClipResults(title, created, results) {
 		LAST_365_DAYS: last365Days.getTime()
 	}
 
-	const nameFilter = new RegExp(title.replace(/\*+/gi, '[\\S]+'), 'i')
+	// try and replicate SOLR wildcard behavior using RegExp
+	const nameFilter = new RegExp('^' + title.replace(/\*+/gi, '[\\S]+') + '$', 'i')
 
 	return results.filter((clipInfo) => {
 		if (clipInfo.time < PERIOD_PRESETS[created]) return false