From 0e654e18c15621f25ef079dcb81f8b8146b421d3 Mon Sep 17 00:00:00 2001
From: Louis Chemineau <louis@chmn.me>
Date: Tue, 14 Nov 2023 15:19:16 +0100
Subject: [PATCH] WIP

Signed-off-by: Louis Chemineau <louis@chmn.me>
---
 src/services/PhotoSearch.js | 46 +++++++++++++++++++++++++++----------
 1 file changed, 34 insertions(+), 12 deletions(-)

diff --git a/src/services/PhotoSearch.js b/src/services/PhotoSearch.js
index 8e2b737f7..979f5d1a7 100644
--- a/src/services/PhotoSearch.js
+++ b/src/services/PhotoSearch.js
@@ -100,21 +100,43 @@ export default async function(path = '', options = {}) {
 	let timeWindow = ''
 	if (options.dateTimeUpperBound !== undefined) {
 		timeWindow = `
-			<d:lt>
-				<d:prop>
-					<nc:metadata-photos-original_date_time/>
-				</d:prop>
-				<d:literal>${options.dateTimeUpperBound}</d:literal>
-			</d:lt>`
+			<d:or>
+				<d:lte>
+					<d:prop><nc:metadata-photos-original_date_time/></d:prop>
+					<d:literal>${options.dateTimeUpperBound}</d:literal>
+				</d:lte>
+				<d:and>
+					<d:not>
+						<d:is-defined>
+							<d:prop><nc:metadata-photos-original_date_time/></d:prop>
+						</d:is-defined>
+					</d:not>
+					<d:lte>
+						<d:prop><d:getlastmodified/></d:prop>
+						<d:literal>${options.dateTimeUpperBound}</d:literal>
+					</d:lte>
+				</d:and>
+			</d:or>`
 	}
 	if (options.dateTimeLowerBound !== undefined) {
 		timeWindow += `
-		<d:gt>
-			<d:prop>
-				<nc:metadata-photos-original_date_time/>
-			</d:prop>
-			<d:literal>${options.dateTimeLowerBound}</d:literal>
-		</d:gt>`
+			<d:or>
+				<d:gt>
+					<d:prop><nc:metadata-photos-original_date_time/></d:prop>
+					<d:literal>${options.dateTimeLowerBound}</d:literal>
+				</d:gt>
+				<d:and>
+					<d:not>
+						<d:is-defined>
+							<d:prop><nc:metadata-photos-original_date_time/></d:prop>
+						</d:is-defined>
+					</d:not>
+					<d:gt>
+						<d:prop><d:getlastmodified/></d:prop>
+						<d:literal>${options.dateTimeLowerBound}</d:literal>
+					</d:gt>
+				</d:and>
+			</d:or>`
 	}
 
 	options = Object.assign({