Noun annotation: fix multiple annotation case

Author: catreedle

Keyboards/DataManager/LanguageDBManager.swift

@@ -279,30 +279,36 @@ extension LanguageDBManager {
     let language = getControllerLanguageAbbr()
     let contract = ContractManager.shared.loadContract(language: language)
 
+    var allGenders: [String] = []
+
     let queries = GenderManager.shared.buildGenderQueries(word: word, contract: contract)
 
     for queryInfo in queries {
-      let result = queryDBRow(
+      let results = queryDBRows(
         query: queryInfo.query,
         outputCols: queryInfo.outputCols,
         args: StatementArguments(queryInfo.args)
       )
 
-      // For canonical gender: return the actual gender value from DB
+      // For canonical gender: results are the actual genders
       if queryInfo.fallbackGender == nil {
-        if !result.isEmpty && !result[0].isEmpty {
-          return result
+        for gender in results where !gender.isEmpty {
+          if !allGenders.contains(gender) {
+            allGenders.append(gender)
+          }
         }
       }
-      // For masculine/feminine: if word found, return the fallback gender
+      // For masculine/feminine: if any result, use fallback
       else {
-        if !result.isEmpty && !result[0].isEmpty {
-          return [queryInfo.fallbackGender!]
+        if !results.isEmpty && !results[0].isEmpty,
+           let fallback = queryInfo.fallbackGender,
+           !allGenders.contains(fallback) {
+          allGenders.append(fallback)
         }
       }
     }
 
-    return [""]
+    return allGenders.isEmpty ? [""] : [allGenders.joined(separator: "/")]
   }
 
   /// Query the plural form of word in `nouns`.

Keyboards/KeyboardsBase/ScribeFunctionality/Annotate.swift

@@ -52,18 +52,33 @@ func convertFullGenderToAbbr(_ genderFull: String) -> String {
 ///   - wordToAnnotate: the word that an annotation should be created for.
 ///   - KVC: the keyboard view controller.
 func wordAnnotation(wordToAnnotate: String, KVC: KeyboardViewController) {
-  var nounForm: String
+  var genderAnnotations: [String] = []
+  var pluralAnnotation: String?
+
+  // Get gender(s)
+  let nounForm = LanguageDBManager.shared.queryNounForm(of: wordToAnnotate)[0]
+  if !nounForm.isEmpty {
+    // nounForm might already be "M/F" if multiple genders found
+    genderAnnotations = nounForm.components(separatedBy: "/")
+  }
 
-  // Check if word is plural first
+  // Check if plural
   if let pluralWords = pluralWords, pluralWords.contains(wordToAnnotate.lowercased()) {
-    nounForm = "PL"
-  } else {
-    nounForm = LanguageDBManager.shared.queryNounForm(of: wordToAnnotate)[0]
+    pluralAnnotation = "PL"
+  }
+
+  // Combine: gender(s) first, then PL if applicable
+  var allAnnotations = genderAnnotations
+  if let pl = pluralAnnotation, !allAnnotations.contains("PL") {
+    allAnnotations.append(pl)
   }
 
+  // Join back with "/"
+  let combinedNounForm = allAnnotations.joined(separator: "/")
+
   prepAnnotationForm = LanguageDBManager.shared.queryPrepForm(of: wordToAnnotate.lowercased())[0]
 
-  hasNounForm = !nounForm.isEmpty
+  hasNounForm = !combinedNounForm.isEmpty
   hasPrepForm = !prepAnnotationForm.isEmpty
 
   annotationsToAssign = [String]()
@@ -105,10 +120,10 @@ func wordAnnotation(wordToAnnotate: String, KVC: KeyboardViewController) {
     )
   } else {
     if hasNounForm {
-      if !nounForm.contains("/") {
-        annotationsToAssign.append(nounForm)
+      if !combinedNounForm.contains("/") {
+        annotationsToAssign.append(combinedNounForm)
       } else {
-        for a in nounForm.components(separatedBy: "/") {
+        for a in combinedNounForm.components(separatedBy: "/") {
           annotationsToAssign.append(a)
         }
       }
@@ -262,16 +277,29 @@ func typedWordAnnotation(KVC: KeyboardViewController) {
 ///   - index: the auto action key index that the annotation should be set for.
 ///   - KVC: the keyboard view controller.
 func autoActionAnnotation(autoActionWord: String, index: Int, KVC: KeyboardViewController) {
-  var nounForm: String
+  var genderAnnotations: [String] = []
+  var pluralAnnotation: String?
 
-  // Check if word is plural first
+  // Get gender(s)
+  let nounForm = LanguageDBManager.shared.queryNounForm(of: autoActionWord)[0]
+  if !nounForm.isEmpty {
+    genderAnnotations = nounForm.components(separatedBy: "/")
+  }
+
+  // Check if plural
   if let pluralWords = pluralWords, pluralWords.contains(autoActionWord.lowercased()) {
-    nounForm = "PL"
-  } else {
-    nounForm = LanguageDBManager.shared.queryNounForm(of: autoActionWord)[0]
+    pluralAnnotation = "PL"
   }
 
-  hasNounForm = !nounForm.isEmpty
+  // Combine
+  var allAnnotations = genderAnnotations
+  if let pl = pluralAnnotation, !allAnnotations.contains("PL") {
+    allAnnotations.append(pl)
+  }
+
+  let combinedNounForm = allAnnotations.joined(separator: "/")
+
+  hasNounForm = !combinedNounForm.isEmpty
 
   newAutoActionAnnotationsToAssign = [String]()
   newAutoActionAnnotationBtns = [UIButton]()
@@ -282,10 +310,10 @@ func autoActionAnnotation(autoActionWord: String, index: Int, KVC: KeyboardViewC
   let annotationHeight = KVC.scribeKey.frame.height * 0.1
 
   if hasNounForm {
-    if !nounForm.contains("/") {
-      newAutoActionAnnotationsToAssign.append(nounForm)
+    if !combinedNounForm.contains("/") {
+      newAutoActionAnnotationsToAssign.append(combinedNounForm)
     } else {
-      for a in nounForm.components(separatedBy: "/") {
+      for a in combinedNounForm.components(separatedBy: "/") {
         newAutoActionAnnotationsToAssign.append(a)
       }
     }