Merge pull request #4965 from inception-project/bugfix/4964-Flash-mes…

…sage-shown-when-trying-to-query-during-index-rebuild-shows-wrong-progress #4964 - Flash message shown when trying to query during index rebuild shows wrong progress
inception-project · Jul 28, 2024 · 42c5a3a · 42c5a3a
2 parents 0a667ff + d79be0f
commit 42c5a3a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...ception-scheduling/src/main/java/de/tudarmstadt/ukp/inception/scheduling/TaskMonitor.java b/...ception-scheduling/src/main/java/de/tudarmstadt/ukp/inception/scheduling/TaskMonitor.java
@@ -217,6 +217,6 @@ public boolean isCancelled()
     @Deprecated
     public synchronized Progress toProgress()
     {
-        return new Progress(maxProgress, progress);
+        return new Progress(progress, maxProgress);
     }
 }
diff --git a/...-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasDocumentIndex.java b/...-mtas/src/main/java/de/tudarmstadt/ukp/inception/search/index/mtas/MtasDocumentIndex.java
@@ -211,7 +211,7 @@ private synchronized IndexWriter getIndexWriter() throws IOException
             _indexWriter = createIndexWriter();
             return _indexWriter;
         }
-        catch (IOException e) {
+        catch (IOException | IllegalArgumentException e) {
             if (LOG.isDebugEnabled()) {
                 LOG.warn("Unable to read MTAS index: {}. Deleting index so it can be rebuilt.",
                         e.getMessage(), e);

diff --git a/...main/java/de/tudarmstadt/ukp/inception/app/ui/search/sidebar/SearchAnnotationSidebar.java b/...main/java/de/tudarmstadt/ukp/inception/app/ui/search/sidebar/SearchAnnotationSidebar.java
@@ -585,7 +585,7 @@ private void executeSearchResultsGroupedQuery(AjaxRequestTarget aTarget)
             return;
         }
         catch (Exception e) {
-            error("Error in the query: " + e.getMessage());
+            error("Query error: " + e.getMessage());
             aTarget.addChildren(getPage(), IFeedback.class);
             resultsProvider.emptyQuery();
             return;