Skip to content

Commit 8ac397d

Browse files
myieyemyieye
committed
Fix build errors
1 parent a193991 commit 8ac397d

5 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎backend/FwLite/LcmCrdt/Data/Filtering.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public static IQueryable<Entry> WhereExemplar(
1818
public static IQueryable<Entry> SearchFilter(IQueryable<Entry> entries, IQueryable<MorphType> morphTypes, string query)
1919
{
2020
return from entry in entries
21-
join mt in morphTypes on entry.MorphType equals mt.MorphType into mtGroup
21+
join mt in morphTypes on entry.MorphType equals mt.Kind into mtGroup
2222
from mt in mtGroup.DefaultIfEmpty()
2323
where entry.SearchHeadwords(mt.Prefix, mt.Postfix, query) // CitationForm.SearchValue would be redundant
2424
|| entry.LexemeForm.SearchValue(query)

‎backend/FwLite/LcmCrdt/Data/MiniLcmRepository.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@ public void Dispose()
7373
public IQueryable<SemanticDomain> SemanticDomains => dbContext.SemanticDomains;
7474
public IQueryable<PartOfSpeech> PartsOfSpeech => dbContext.PartsOfSpeech;
7575

76-
private IReadOnlyDictionary<MorphType, MorphType>? _morphTypeDataLookup;
76+
private IReadOnlyDictionary<MorphTypeKind, MorphType>? _morphTypeDataLookup;
7777

78-
private async ValueTask<IReadOnlyDictionary<MorphType, MorphType>> GetMorphTypeDataLookup()
78+
private async ValueTask<IReadOnlyDictionary<MorphTypeKind, MorphType>> GetMorphTypeDataLookup()
7979
{
80-
return _morphTypeDataLookup ??= await AllMorphTypeData
81-
.ToDictionaryAsyncEF(m => m.MorphType);
80+
return _morphTypeDataLookup ??= await MorphTypes
81+
.ToDictionaryAsyncEF(m => m.Kind);
8282
}
8383

8484
public IQueryable<Publication> Publications => dbContext.Publications;

‎backend/FwLite/LcmCrdt/Data/Sorting.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ public static class Sorting
66
{
77
public static IQueryable<Entry> ApplyHeadwordOrder(this IQueryable<Entry> entries, ITable<MorphType> morphTypes, SortOptions order, string? query = null)
88
{
9-
var stemOrder = morphTypes.Where(m => m.MorphType == MorphType.Stem).Select(m => m.SecondaryOrder);
9+
var stemOrder = morphTypes.Where(m => m.Kind == MorphTypeKind.Stem).Select(m => m.SecondaryOrder);
1010
if (order.Ascending)
1111
{
1212
return
1313
from entry in entries
1414
orderby
1515
entry.Headword(order.WritingSystem).CollateUnicode(order.WritingSystem),
16-
morphTypes.Where(m => m.MorphType == entry.MorphType)
16+
morphTypes.Where(m => m.Kind == entry.MorphType)
1717
.Select(m => (int?)m.SecondaryOrder).FirstOrDefault() ?? stemOrder.FirstOrDefault(),
1818
// entry.HomographNumber,
1919
entry.Id
@@ -25,7 +25,7 @@ from entry in entries
2525
from entry in entries
2626
orderby
2727
entry.Headword(order.WritingSystem).CollateUnicode(order.WritingSystem) descending,
28-
(morphTypes.Where(m => m.MorphType == entry.MorphType)
28+
(morphTypes.Where(m => m.Kind == entry.MorphType)
2929
.Select(m => (int?)m.SecondaryOrder).FirstOrDefault() ?? stemOrder.FirstOrDefault()) descending,
3030
// entry.HomographNumber descending,
3131
entry.Id descending
@@ -40,12 +40,12 @@ entry.Id descending
4040
/// </summary>
4141
public static IQueryable<Entry> ApplyRoughBestMatchOrder(this IQueryable<Entry> entries, ITable<MorphType> morphTypes, SortOptions order, string? query = null)
4242
{
43-
var stemOrder = morphTypes.Where(m => m.MorphType == MorphType.Stem).Select(m => m.SecondaryOrder);
43+
var stemOrder = morphTypes.Where(m => m.Kind == MorphTypeKind.Stem).Select(m => m.SecondaryOrder);
4444
if (order.Ascending)
4545
{
4646
return
4747
from e in entries
48-
join mt in morphTypes on e.MorphType equals mt.MorphType into mtGroup
48+
join mt in morphTypes on e.MorphType equals mt.Kind into mtGroup
4949
from mt in mtGroup.DefaultIfEmpty()
5050
orderby
5151
!string.IsNullOrEmpty(query) && SqlHelpers.ContainsIgnoreCaseAccents(e.Headword(order.WritingSystem), query!) descending,
@@ -61,7 +61,7 @@ from mt in mtGroup.DefaultIfEmpty()
6161
{
6262
return
6363
from e in entries
64-
join mt in morphTypes on e.MorphType equals mt.MorphType into mtGroup
64+
join mt in morphTypes on e.MorphType equals mt.Kind into mtGroup
6565
from mt in mtGroup.DefaultIfEmpty()
6666
orderby
6767
!string.IsNullOrEmpty(query) && SqlHelpers.ContainsIgnoreCaseAccents(e.Headword(order.WritingSystem), query!),

‎backend/FwLite/LcmCrdt/FullTextSearch/EntrySearchService.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ public IQueryable<Entry> FilterAndRank(IQueryable<Entry> queryable,
5252
.ThenBy(t => t.Headword.Length)
5353
.ThenBy(t => t.Headword.CollateUnicode(wsId))
5454
.ThenBy(t => t.HeadwordMatches
55-
? morphTypeTable.Where(mt => mt.MorphType == t.Entry.MorphType || mt.MorphType == MorphType.Stem)
56-
.OrderBy(mt => mt.MorphType == MorphType.Stem ? 1 : 0) // stem is the fallback, so it should come last
55+
? morphTypeTable.Where(mt => mt.Kind == t.Entry.MorphType || mt.Kind == MorphTypeKind.Stem)
56+
.OrderBy(mt => mt.Kind == MorphTypeKind.Stem ? 1 : 0) // stem is the fallback, so it should come last
5757
.Select(mt => mt.SecondaryOrder).FirstOrDefault()
5858
: int.MaxValue)
5959
// .ThenBy(t => t.Entry.HomographNumber)
@@ -213,7 +213,7 @@ public async Task UpdateEntrySearchTable(Guid entryId)
213213
public async Task UpdateEntrySearchTable(Entry entry)
214214
{
215215
var writingSystems = await dbContext.WritingSystemsOrdered.ToArrayAsync();
216-
var morphTypeDataLookup = await dbContext.AllMorphTypeData.ToDictionaryAsync(m => m.MorphType);
216+
var morphTypeDataLookup = await dbContext.MorphTypes.ToDictionaryAsync(m => m.Kind);
217217
var record = ToEntrySearchRecord(entry, writingSystems, morphTypeDataLookup);
218218
await InsertOrUpdateEntrySearchRecord(record, EntrySearchRecordsTable);
219219
}
@@ -262,7 +262,7 @@ public static async Task UpdateEntrySearchTable(IEnumerable<Entry> entries,
262262
return ws1.Id.CompareTo(ws2.Id);
263263
});
264264
var entrySearchRecordsTable = dbContext.GetTable<EntrySearchRecord>();
265-
var morphTypeDataLookup = await dbContext.AllMorphTypeData.ToDictionaryAsync(m => m.MorphType);
265+
var morphTypeDataLookup = await dbContext.MorphTypes.ToDictionaryAsync(m => m.Kind);
266266
var searchRecords = entries.Select(entry => ToEntrySearchRecord(entry, writingSystems, morphTypeDataLookup));
267267
foreach (var entrySearchRecord in searchRecords)
268268
{
@@ -281,7 +281,7 @@ public async Task RegenerateEntrySearchTable()
281281
await EntrySearchRecordsTable.TruncateAsync();
282282

283283
var writingSystems = await dbContext.WritingSystemsOrdered.ToArrayAsync();
284-
var morphTypeDataLookup = await dbContext.AllMorphTypeData.ToDictionaryAsync(m => m.MorphType);
284+
var morphTypeDataLookup = await dbContext.MorphTypes.ToDictionaryAsync(m => m.Kind);
285285
await EntrySearchRecordsTable
286286
.BulkCopyAsync(dbContext.Set<Entry>()
287287
.LoadWith(e => e.Senses)
@@ -307,7 +307,7 @@ private async Task<bool> HasMissingEntries()
307307
}
308308

309309
private static EntrySearchRecord ToEntrySearchRecord(Entry entry, WritingSystem[] writingSystems,
310-
IReadOnlyDictionary<MorphType, MorphType> morphTypeDataLookup)
310+
IReadOnlyDictionary<MorphTypeKind, MorphType> morphTypeDataLookup)
311311
{
312312
// Include headwords (with morph tokens) for ALL vernacular writing systems (space-separated).
313313
// This ensures FTS matches across all WS, including morph-token-decorated forms.

‎backend/FwLite/LcmCrdt/QueryHelpers.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public static class QueryHelpers
77
{
88
public static void Finalize(this Entry entry,
99
IComparer<ComplexFormComponent> complexFormComparer,
10-
IReadOnlyDictionary<MorphType, MorphType> morphTypeDataLookup)
10+
IReadOnlyDictionary<MorphTypeKind, MorphType> morphTypeDataLookup)
1111
{
1212
entry.Senses.ApplySortOrder();
1313
entry.Components.ApplySortOrder();

0 commit comments

Comments
 (0)