Daterange

index.html

@@ -1,7 +1,7 @@
 ---
 title: Search user interface (UI) with Headless
 lang: en
-dateModified: 2025-02-24
+dateModified: 2025-06-18
 ---
 
 <p class="lead">This is a demo site for the GC Search UI.</p>
@@ -29,6 +29,8 @@ <h3>Advanced tests</h3>
 	<li><a href="test/budget.html">Budget sample</a></li>
 	<li><a href="test/gazette.html">Canada Gazette sample</a></li>
 	<li><a href="test/template.html">Custom summary and results templates</a></li>
+	<li><a href="test/newsadv-en.html">News Advanced Search user interface</a></li>
+	<li><a href="test/newsadv-fr.html">Interface utilisateur de la recherche avancée d'actualités</a></li>
 </ul>
 
 <hr>

src/connector.js

@@ -476,7 +476,7 @@ function initEngine() {
 
 	resultListController = buildResultList( headlessEngine, {
 		options: {
-			fieldsToInclude: [ "author", "date", "language", "urihash", "objecttype", "collection", "source", "permanentid", "displaynavlabel", "hostname" ]
+			fieldsToInclude: [ "author", "date", "language", "urihash", "objecttype", "collection", "source", "permanentid", "displaynavlabel", "hostname", "declared_type" ]
 		}
 	} );
 	querySummaryController = buildQuerySummary( headlessEngine );
@@ -485,7 +485,7 @@ function initEngine() {
 	statusController = buildSearchStatus( headlessEngine );
 
 	if ( urlParams.allq || urlParams.exctq || urlParams.anyq || urlParams.noneq || urlParams.fqupdate || 
-		urlParams.dmn || urlParams.fqocct || urlParams.elctn_cat || urlParams.filetype || urlParams.site || urlParams.year ) { 
+		urlParams.dmn || urlParams.fqocct || urlParams.elctn_cat || urlParams.filetype || urlParams.site || urlParams.year || urlParams.declaredtype || urlParams.startdate || urlParams.enddate ) { 
 		let q = [];
 		let qString = "";
 		if ( urlParams.allq ) {
@@ -622,6 +622,28 @@ function initEngine() {
 			let site = urlParams.site.toLowerCase().replace( '*', '' );
 			aqString += ' @canadagazettesite==' + site;
 		}
+
+		if ( urlParams.startdate && urlParams.enddate ) {
+			aqString += ' @date = "' + urlParams.startdate.replaceAll('-','/') + '..' + urlParams.enddate.replaceAll('-','/') + '"';
+		}
+
+		if ( urlParams.startdate ) {
+			aqString += ' @date = "' + urlParams.startdate.replaceAll('-','/') + '..' + currentDate() + '"';
+		}
+
+		if ( urlParams.enddate ) {
+			aqString += ' @date < "' + urlParams.enddate.replaceAll('-','/') + '"';
+		}
+
+		if ( urlParams.dprtmnt ) { 
+			aqString += ' @author = "' + urlParams.dprtmnt + '"';
+
+		}
+
+		if ( urlParams.declaredtype ) {
+			aqString += ' @declared_type="' + urlParams.declaredtype.replaceAll( /'/g, '&#39;' ) + '"';
+
+		}
 
 		if ( aqString ) {
 			const action = loadAdvancedSearchQueryActions( headlessEngine ).updateAdvancedSearchQueries( { 
@@ -1151,6 +1173,10 @@ function updatePagerState( newState ) {
 
 		buttonNode.onclick = () => { 
 			pagerController.previousPage();
+
+			if ( params.isAdvancedSearch ) {
+				updateUrlParameter( pagerState.currentPage );
+			}
 		};
 
 		pagerComponentElement.appendChild( liNode );
@@ -1178,6 +1204,10 @@ function updatePagerState( newState ) {
 
 		buttonNode.onclick = () => {
 			pagerController.selectPage( pageNo );
+
+			if ( params.isAdvancedSearch ) {
+				updateUrlParameter( pagerState.currentPage );
+			}
 		};
 
 		pagerComponentElement.appendChild( liNode );
@@ -1192,11 +1222,40 @@ function updatePagerState( newState ) {
 
 		buttonNode.onclick = () => { 
 			pagerController.nextPage(); 
+
+			if ( params.isAdvancedSearch ) {
+				updateUrlParameter( pagerState.currentPage );
+			}
 		};
 
 		pagerComponentElement.appendChild( liNode );
 	}
 }
 
+function currentDate() {
+	var today = new Date();
+	var dd = String(today.getDate()).padStart(2, '0');
+	var mm = String(today.getMonth() + 1).padStart(2, '0'); 
+	var yyyy = today.getFullYear();
+
+	today = yyyy + "/" + mm + "/" + dd;
+
+	return today;
+}
+
+function updateUrlParameter(curtPage) {
+
+	const urlParams = new URLSearchParams(window.location.search);
+	const paramName = 'firstResult';
+	const pageNum = (curtPage - 1) * 10;
+
+	// Set the value of the parameter. If it doesn't exist, it will be added.
+	urlParams.set(paramName, pageNum);
+
+	const newSearch = urlParams.toString();
+	window.history.replaceState({}, '', `${window.location.pathname}?${newSearch}${window.location.hash}`);
+
+}
+
 // Run Search UI
 initSearchUI();