fix Echo 有两重定向词条，这时显示在侯选列表中

readme.txt

@@ -1048,6 +1048,70 @@ goldendict-ng C++ 代码通过拦截 entry:// 协议并将其转换为内部查
 
 
 
+`e:\huggingface\goldendict-ng\wpfmdict` 目前的情况是搜 echo 词条会连同 Echo 的词条内容一同出现在 echo 的内容里， mdx 里原始文本是这样的：echo
+...内容省略
+</>
+Echo
+@@@LINK=Echo¹
+</>
+Echo
+@@@LINK=Echo²
+</>   我需要搜 echo 时不出现 Echo 的内容，但是把 Echo 这两个不同的条目，既 @@@LINK=Echo¹ 和 @@@LINK=Echo² 这两条重定向条目放在 UI 搜索框下面的列表里，供用户稍后点击查询
+
+The required changes have been implemented to address the issue where searching for "echo" displayed content from "Echo" entries, and to ensure "Echo" redirect entries appear in the suggestion list.
+
+### Changes Summary
+1. MdxReader.cs Update :
+   
+   - Duplicate Headword Support : Changed the Index structure from Dictionary<string, long> to Dictionary<string, List<int>> . This allows the application to store and retrieve multiple entries that share the same case-insensitive key (e.g., "echo" and "Echo").
+   - Data Retrieval : Added an Entries list to store MdxEntry structs (containing Headword and Offset ) and updated GetDefinition to retrieve definitions by entry index.
+   - Compatibility : Restored GetRecordData(string) and GetResource(string) methods to maintain compatibility with Dictionary.cs , ensuring that file resource loading continues to work correctly.
+2. EchodictWindow.xaml.cs Update :
+   
+   - Search Logic Refactoring : Updated the Search method to handle the new List<int> returned by the index lookup.
+   - Content Filtering : Implemented strict case matching ( StringComparison.Ordinal ) for content display. Now, when searching for "echo", only the content for the exact match "echo" is displayed.
+   - Suggestion List Enhancement : Modified the search loop to iterate through all case-insensitive matches (e.g., "Echo" redirects). If an entry is a redirect (starts with @@@LINK= ), its target is added to the suggestion list ( WordList ) regardless of case, fulfilling the requirement to show "Echo" redirects in the list.
+### Outcome
+- Search "echo" :
+  - Main View : Displays only the content for the exact lowercase "echo" entry.
+  - Suggestion List : Includes the targets of the "Echo" redirect entries (e.g., "Echo¹", "Echo²").
+- Search "Echo" :
+  - Main View : Will display content for exact "Echo" matches (if any non-redirect content exists).
+  - Suggestion List : Includes redirect targets.
+You can now rebuild the project. The application will automatically rebuild the dictionary caches ( .idx files) on the next run to apply the new index format.
+
+
+
+
+`e:\huggingface\goldendict-ng\wpfmdict` mdx 文件解析出来的源文本是：Echo
+@@@LINK=Echo¹
+</>
+Echo
+@@@LINK=Echo²
+</>    我希望搜索 Echo 时，将 Echo¹ Echo² 这两个重定向词条显示在 UI 搜索框下面的那个列表中，这样用户可以手动点击 Echo¹ 或着 Echo² 实现查询这两个词条
+
+
+I've implemented the changes to support separate handling of "echo" and "Echo", ensuring that redirects appear in the suggestion list.
+
+### Key Changes
+1. MdxReader.cs Update :
+   
+   - Added a resolveLinks parameter to GetDefinition (defaulting to true for backward compatibility, but allowing false for raw data access).
+   - This allows the search logic to inspect the raw content of an entry to see if it's a redirect ( @@@LINK= ) without automatically following it.
+2. EchodictWindow.xaml.cs Update :
+   
+   - Modified the search loop to call GetDefinition(index, false) to get the raw content.
+   - Redirect Handling : If an entry is a redirect (starts with @@@LINK= ), it parses the link target and adds it to the WordList (suggestion list) regardless of case matching. This ensures "Echo¹" and "Echo²" appear in the list when searching for "echo".
+   - Content Display : Content is only displayed if the headword exactly matches the search query (case-sensitive StringComparison.Ordinal ).
+   - Empty Result Handling : If a query matches only redirects (like "Echo" -> "Echo¹"), and no content is displayed, it now shows a "Multiple candidates found" message instead of a blank result.
+### Result
+When you search for "echo":
+
+1. Content : Only the definition for the exact lowercase "echo" will be displayed.
+2. Suggestions : The WordList below the search box will be populated with "Echo¹" and "Echo²" (from the "Echo" redirect entries), allowing you to click them to view their specific definitions.
+You can now rebuild and run the application. The dictionary index will automatically update on the next run.
+
+
 
 
 

wpfmdict/EchodictWindow.xaml.cs

@@ -397,16 +397,19 @@ namespace Echodict
                     string anchorName = $"dict_{dict.Id}";
                     StringBuilder dictContent = new StringBuilder();
                     bool hasContent = false;
+                    bool hasRedirects = false;
 
                     foreach (int index in entryIndices)
                     {
                         var entry = dict.Mdx.Entries[index];
-                        string? def = dict.Mdx.GetDefinition(index);
+                        string? def = dict.Mdx.GetDefinition(index, false); // Get raw definition (no redirect following)
 
                         if (string.IsNullOrEmpty(def)) continue;
 
+                        bool isRedirect = def.StartsWith("@@@LINK=");
+
                         // Check for redirects to populate suggestion list
-                        if (def.StartsWith("@@@LINK="))
+                        if (isRedirect)
                         {
                             if (updateWordList)
                             {
@@ -428,15 +431,24 @@ namespace Echodict
                         // Check for Exact Match to display content
                         if (entry.Headword.Equals(query, StringComparison.Ordinal))
                         {
-                            // Rewrite relative links to include dictionary ID for isolation
-                            // Matches src="..." or href="..." where value doesn't start with http, https, data:, #, or entry:
-                            string pattern = @"(?i)(src|href)=[""'](?!http|https|data:|#|entry:)([^""']+)[""']";
-                            string replacement = $"$1=\"http://custom-rendering/{dict.Id}/$2\"";
-                            def = System.Text.RegularExpressions.Regex.Replace(def, pattern, replacement);
-                            
-                            dictContent.Append(def);
-                            dictContent.Append("<br/>");
-                            hasContent = true;
+                            if (isRedirect)
+                            {
+                                // It's a redirect that exactly matches the query.
+                                // We mark hasRedirects so we can show a message if no other content is found.
+                                hasRedirects = true;
+                            }
+                            else
+                            {
+                                // Rewrite relative links to include dictionary ID for isolation
+                                // Matches src="..." or href="..." where value doesn't start with http, https, data:, #, or entry:
+                                string pattern = @"(?i)(src|href)=[""'](?!http|https|data:|#|entry:)([^""']+)[""']";
+                                string replacement = $"$1=\"http://custom-rendering/{dict.Id}/$2\"";
+                                def = System.Text.RegularExpressions.Regex.Replace(def, pattern, replacement);
+                                
+                                dictContent.Append(def);
+                                dictContent.Append("<br/>");
+                                hasContent = true;
+                            }
                         }
                     }
 
@@ -457,6 +469,22 @@ namespace Echodict
                         sb.Append(dictContent.ToString());
                         sb.Append("<br/><br/>");
                     }
+                    else if (hasRedirects)
+                    {
+                        // Found only redirects for this query in this dictionary
+                        found = true; // Still consider it found
+
+                        ListBoxItem resultItem = new ListBoxItem();
+                        resultItem.Content = dict.Name;
+                        resultItem.Tag = anchorName;
+                        resultItem.MouseDoubleClick += ResultItem_MouseDoubleClick;
+                        DictsList.Items.Add(resultItem);
+
+                        sb.Append($"<a name=\"{anchorName}\"></a>");
+                        sb.Append($"<h3>{query} <small>({dict.Name})</small></h3>");
+                        sb.Append("<p><i>Multiple candidates found. Please select from the list.</i></p>");
+                        sb.Append("<hr/>");
+                    }
                 }
             }
 

wpfmdict/MdxReader.cs

@@ -305,10 +305,15 @@ namespace Echodict
 
         public string? GetDefinition(int entryIndex)
         {
-            return GetDefinitionInternal(entryIndex, new HashSet<int>());
+            return GetDefinitionInternal(entryIndex, new HashSet<int>(), true);
         }
 
-        private string? GetDefinitionInternal(int entryIndex, HashSet<int> visited)
+        public string? GetDefinition(int entryIndex, bool resolveLinks)
+        {
+            return GetDefinitionInternal(entryIndex, new HashSet<int>(), resolveLinks);
+        }
+
+        private string? GetDefinitionInternal(int entryIndex, HashSet<int> visited, bool resolveLinks)
         {
             if (visited.Contains(entryIndex)) return null; // Cycle detection
             visited.Add(entryIndex);
@@ -342,7 +347,7 @@ namespace Echodict
             }
 
             // Handle internal redirects
-            if (text.StartsWith("@@@LINK="))
+            if (resolveLinks && text.StartsWith("@@@LINK="))
             {
                 // Check for multiple links
                 if (text.IndexOf("@@@LINK=", 1) != -1)
@@ -369,7 +374,7 @@ namespace Echodict
                             break;
                         }
                     }
-                    var targetDef = GetDefinitionInternal(bestMatch, visited);
+                    var targetDef = GetDefinitionInternal(bestMatch, visited, true);
                     if (targetDef != null) return targetDef;
                 }
             }