Fixed advanced search in labels not working

Fixed certain characters in Mbox file name not working
ePADD · Aug 18, 2022 · f1ce31b · f1ce31b
1 parent 6469e5b
commit f1ce31b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/WebContent/js/browseMessages.js b/WebContent/js/browseMessages.js
@@ -60,8 +60,11 @@ var Navigation = function(){
         });
 
         // forward/back nav
+
+        if (typeof jog !== 'undefined') {				// 2022.08.02	Aries Tsang
         $('#page_forward').click(jog.forward);
         $('#page_back').click(jog.backward);
+        }
     };
 
     // annoying, have to declare these connector funcs, because jog is defined only in setupEvents, so can't directly use those funcs in the Navigation's interface.

diff --git a/src/java/edu/stanford/muse/email/MboxEmailStore.java b/src/java/edu/stanford/muse/email/MboxEmailStore.java
@@ -200,7 +200,10 @@ protected Folder openFolderWithoutCount(Store s, String fname) throws MessagingE
 
         //This is the root folder in the namespace provided
         //see http://docs.oracle.com/javaee/5/api/javax/mail/Store.html#getDefaultFolder%28%29
-		Folder folder = store.getDefaultFolder();
+// 2022-08-11 Aries Tsang        
+//		Folder folder = store.getDefaultFolder();
+		Folder folder = store.getFolder(fname);
+
 		if (folder == null)
 			throw new RuntimeException ("Invalid folder: " + fname);
 

diff --git a/src/java/edu/stanford/muse/index/SearchResult.java b/src/java/edu/stanford/muse/index/SearchResult.java
@@ -347,7 +347,16 @@ private static SearchResult filterForAnnotationText(SearchResult inputSet) {
                 String comment = annotationManager.getAnnotation(edoc.getUniqueId());
                 if (!Util.nullOrEmpty(comment)) {
                     comment = comment.toLowerCase();
-                    return annotations.contains(comment);
+// 2022-08-09 Aries Tsang					
+                    boolean isFound=false;
+                    for (String f1 : annotations) {
+                        if (comment.contains(f1)) {
+                            isFound = true;
+                            break;
+                        }
+                    }                    
+//                    return annotations.contains(comment);
+                    return isFound;
                 }else
                     return false;
             }).collect(Collectors.toMap(Map.Entry::getKey,Map.Entry::getValue));