LT-21053: Update homographs to match publication

Src/xWorks/ConfiguredLcmGenerator.cs

@@ -429,7 +429,7 @@ internal static IFragment GenerateContentForFieldByReflection(object field, Conf
 			{
 				// REVIEW: We have overloaded terms here, this is a C# class not a css class, consider a different name
 				var customFieldOwnerClassName = GetClassNameForCustomFieldParent(config, settings.Cache);
-				if (!GetPropValueForCustomField(field, config, cache, customFieldOwnerClassName, config.FieldDescription, ref propertyValue))
+				if (!GetPropValueForCustomField(field, config, cache, publicationDecorator, customFieldOwnerClassName, config.FieldDescription, ref propertyValue))
 					return settings.ContentGenerator.CreateFragment();
 			}
 			else
@@ -454,7 +454,12 @@ internal static IFragment GenerateContentForFieldByReflection(object field, Conf
 #endif
 					return settings.ContentGenerator.CreateFragment();
 				}
-				propertyValue = GetValueFromMember(property, field);
+				// This code demonstrates using the cache metadata,
+				// an alternative form of reflection to get values that respect the decorator
+				// We may be able to replace the GetValueFromMember above with this code, but the ownerClassName may take
+				// some work to determine
+				var success = GetPropValueForCustomField(field, config, cache, publicationDecorator,
+					((ICmObject)field).ClassName, property.Name, ref propertyValue);
 				GetSortedReferencePropertyValue(config, ref propertyValue, field);
 			}
 			// If the property value is null there is nothing to generate
@@ -467,7 +472,7 @@ internal static IFragment GenerateContentForFieldByReflection(object field, Conf
 				if (config.IsCustomField)
 				{
 					// Get the custom field value (in SubField) using the property which came from the field object
-					if (!GetPropValueForCustomField(propertyValue, config, cache, ((ICmObject)propertyValue).ClassName,
+					if (!GetPropValueForCustomField(propertyValue, config, cache, publicationDecorator, ((ICmObject)propertyValue).ClassName,
 						config.SubField, ref propertyValue))
 					{
 						return settings.ContentGenerator.CreateFragment();
@@ -572,8 +577,10 @@ private static IFragment GenerateContentForGroupingNode(object field, Configurab
 		/// <returns>true if the custom field was valid and false otherwise</returns>
 		/// <remarks>propertyValue can be null if the custom field is valid but no value is stored for the owning object</remarks>
 		private static bool GetPropValueForCustomField(object fieldOwner, ConfigurableDictionaryNode config,
-			LcmCache cache, string customFieldOwnerClassName, string customFieldName, ref object propertyValue)
+			LcmCache cache, ISilDataAccess decorator, string customFieldOwnerClassName, string customFieldName, ref object propertyValue)
 		{
+			if (decorator == null)
+				decorator = cache.DomainDataByFlid;
 			int customFieldFlid = GetCustomFieldFlid(config, cache, customFieldOwnerClassName, customFieldName);
 			if (customFieldFlid != 0)
 			{
@@ -618,36 +625,36 @@ private static bool GetPropValueForCustomField(object fieldOwner, ConfigurableDi
 					case (int)CellarPropertyType.OwningAtomic:
 						{
 							// This method returns the hvo of the object pointed to
-							propertyValue = cache.MainCacheAccessor.get_ObjectProp(specificObject.Hvo, customFieldFlid);
+							propertyValue = decorator.get_ObjectProp(specificObject.Hvo, customFieldFlid);
 							// if the hvo is invalid set propertyValue to null otherwise get the object
 							propertyValue = (int)propertyValue > 0 ? cache.LangProject.Services.GetObject((int)propertyValue) : null;
 							break;
 						}
 					case (int)CellarPropertyType.GenDate:
 						{
-							propertyValue = new GenDate(cache.MainCacheAccessor.get_IntProp(specificObject.Hvo, customFieldFlid));
+							propertyValue = new GenDate(decorator.get_IntProp(specificObject.Hvo, customFieldFlid));
 							break;
 						}
 
 					case (int)CellarPropertyType.Time:
 						{
-							propertyValue = SilTime.ConvertFromSilTime(cache.MainCacheAccessor.get_TimeProp(specificObject.Hvo, customFieldFlid));
+							propertyValue = SilTime.ConvertFromSilTime(decorator.get_TimeProp(specificObject.Hvo, customFieldFlid));
 							break;
 						}
 					case (int)CellarPropertyType.MultiUnicode:
 					case (int)CellarPropertyType.MultiString:
 						{
-							propertyValue = cache.MainCacheAccessor.get_MultiStringProp(specificObject.Hvo, customFieldFlid);
+							propertyValue = decorator.get_MultiStringProp(specificObject.Hvo, customFieldFlid);
 							break;
 						}
 					case (int)CellarPropertyType.String:
 						{
-							propertyValue = cache.MainCacheAccessor.get_StringProp(specificObject.Hvo, customFieldFlid);
+							propertyValue = decorator.get_StringProp(specificObject.Hvo, customFieldFlid);
 							break;
 						}
 					case (int)CellarPropertyType.Integer:
 						{
-							propertyValue = cache.MainCacheAccessor.get_IntProp(specificObject.Hvo, customFieldFlid);
+							propertyValue = decorator.get_IntProp(specificObject.Hvo, customFieldFlid);
 							break;
 						}
 				}

Src/xWorks/DictionaryPublicationDecorator.cs

@@ -244,6 +244,15 @@ private string GetSenseNumber(ILexSense sense)
 			return Cache.GetOutlineNumber(sense, LexSenseTags.kflidSenses, false, true, this);
 		}
 
+		public override ITsMultiString get_MultiStringProp(int hvo, int tag)
+		{
+			if (tag == m_mlHeadwordFlid)
+			{
+				return new PublicationAwareMultiStringAccessor(hvo, tag, this);
+			}
+			return base.get_MultiStringProp(hvo, tag);
+		}
+
 		public override ITsString get_MultiStringAlt(int hvo, int tag, int ws)
 		{
 			if (tag == m_mlHeadwordFlid)
@@ -615,5 +624,83 @@ private bool IsPublishableReference(ILexEntryRef entryRef)
 			// A reference is also not publishable if all of its PrimarySensesOrEntries are excluded
 			return entryRef.PrimarySensesOrEntries.Any(senseOrEntry => !m_excludedItems.Contains(senseOrEntry.Item.Hvo));
 		}
+
+		private class PublicationAwareMultiStringAccessor : IMultiAccessorBase
+		{
+			private readonly int m_hvo;
+			private readonly int m_tag;
+			private readonly DictionaryPublicationDecorator m_decorator;
+
+			public PublicationAwareMultiStringAccessor(int hvo, int tag, DictionaryPublicationDecorator decorator)
+			{
+				m_hvo = hvo;
+				m_tag = tag;
+				m_decorator = decorator;
+			}
+
+			public ITsString GetStringFromIndex(int iws, out int _ws)
+			{
+				throw new NotImplementedException();
+			}
+
+			public ITsString get_String(int ws)
+			{
+				return m_decorator.get_MultiStringAlt(m_hvo, m_tag, ws);
+			}
+
+			public void set_String(int ws, ITsString _tss)
+			{
+				throw new NotImplementedException();
+			}
+
+			public int StringCount { get; }
+			public void SetAnalysisDefaultWritingSystem(string val)
+			{
+				throw new NotImplementedException();
+			}
+
+			public void SetVernacularDefaultWritingSystem(string val)
+			{
+				throw new NotImplementedException();
+			}
+
+			public void SetUserWritingSystem(string val)
+			{
+				throw new NotImplementedException();
+			}
+
+			public void set_String(int ws, string val)
+			{
+				throw new NotImplementedException();
+			}
+
+			public bool TryWs(int ws, out int actualWs)
+			{
+				throw new NotImplementedException();
+			}
+
+			public bool TryWs(int ws, out int actualWs, out ITsString tssActual)
+			{
+				throw new NotImplementedException();
+			}
+
+			public ITsString StringOrNull(int ws)
+			{
+				throw new NotImplementedException();
+			}
+
+			public int Flid { get; }
+			public ITsString NotFoundTss { get; }
+			public ITsString AnalysisDefaultWritingSystem { get; set; }
+			public ITsString VernacularDefaultWritingSystem { get; set; }
+			public string UiString { get; }
+			public ITsString UserDefaultWritingSystem { get; set; }
+			public ITsString RawUserDefaultWritingSystem { get; }
+			public ITsString BestAnalysisVernacularAlternative { get; }
+			public ITsString BestAnalysisAlternative { get; }
+			public ITsString BestVernacularAlternative { get; }
+			public ITsString BestVernacularAnalysisAlternative { get; }
+			public int[] AvailableWritingSystemIds { get; }
+		}
 	}
 }