Merge pull request #846 from OpenKnowledgeMaps/dev

refactor: error handling updates

Author: chreman

examples/public/main_integration/css/main.css

@@ -2075,6 +2075,7 @@ a.donation-button:hover, a.donation-button:active, a.donation-button:focus {
 
 #error-remedy_list li {
     list-style: disc;
+    margin-bottom: 10px;
 }
 
 #error-remedy_list {

server/preprocessing/other-scripts/utils.R

@@ -120,26 +120,17 @@ detect_error <- function(failed, service, params) {
         reason <- c(reason, "API error: OpenAIRE not reachable")
       }
     }
+
+    # If not one of the known data source API errors:
+    # "not enough results" or "timeframe too short" if it was specified
     if (length(reason) == 0) {
-        result <- regmatches(failed$query, regexec(phrasepattern, failed$query))
-        # if not one of the known data source API errors:
-        # apply query error detection heuristics
-        if (grepl('“', failed$query, fixed = TRUE) ||
-            grepl('“', failed$query, fixed = TRUE)) {
-          reason <- c(reason, 'query formatting')
-        }
-        if (!identical(result[[1]], character(0)) &&
-            length(unlist(strsplit(result[[1]][2], " "))) > 4) {
-          reason <- c(reason, 'too specific')
-        } else if (length(unlist(strsplit(failed$query, " "))) < 4) {
-          reason <- c(reason, 'typo', 'too specific')
-        } else {
-          reason <- c(reason, 'query length', 'too specific')
-        }
-        if (!is.null(failed$params$to) &&
-            !is.null(failed$params$from) &&
-            difftime(failed$params$to, failed$params$from) <= 60) {
-          reason <- c(reason, 'timeframe too short')
+      has_timeframe <- !is.null(failed$params$to) && !is.null(failed$params$from)
+      is_short_timeframe <- has_timeframe && difftime(failed$params$to, failed$params$from) <= 60
+
+      if (is_short_timeframe) {
+        reason <- c(reason, 'timeframe too short')
+      } else {
+        reason <- c(reason, 'not enough results')
       }
     }
   }

vis/test/component/citationmodal.test.tsx

@@ -43,8 +43,9 @@ const getMockStoreData = (isStreamgraph: boolean) => {
 const getCitationText = (isStreamgraph: boolean) => {
   const mockStoreData = getMockStoreData(isStreamgraph);
   const citationTemplate = mockStoreData.localization.citation_template;
+  const currentYear = new Date().getFullYear();
   const mockCitationStringData = {
-    year: "2025",
+    year: String(currentYear),
     type: isStreamgraph ? "Streamgraph" : "Knowledge Map",
     query: "climate change and impact",
     source: "http://localhost:3000/",
@@ -53,7 +54,7 @@ const getCitationText = (isStreamgraph: boolean) => {
 
   return formatString(citationTemplate, mockCitationStringData).replace(
     " [].",
-    "."
+    ".",
   );
 };
 
@@ -68,7 +69,7 @@ const setup = (isStreamgraph: boolean) => {
       <LocalizationProvider localization={localization}>
         <CitationModal />
       </LocalizationProvider>
-    </Provider>
+    </Provider>,
   );
 };