Changeset 345 for trunk/NewView/SearchUnit.pas

Timestamp:

Jun 2, 2009, 8:56:09 PM (16 years ago)

Author:

RBRi

Message:

use the same index; reformated

File:

• trunk/NewView/SearchUnit.pas (modified) (6 diffs)

trunk/NewView/SearchUnit.pas

@@ -210 +210 @@
 
   // Search topic titles
-  for TopicIndex:= 0 to HelpFile.TopicCount - 1 do
-  begin
-    Topic:= HelpFile.Topics[ TopicIndex ];
-    pTitle:= Topic.TitlePtr;
+  for TopicIndex := 0 to HelpFile.TopicCount - 1 do
+  begin
+    Topic := HelpFile.Topics[ TopicIndex ];
+    pTitle := Topic.TitlePtr;
     TitleWordIndex := 0;
 
@@ -233 +233 @@
           begin
             // in fact it's the only word
-            TitleWordRelevance := mwOnlyTitleWord
-                                  * WordRelevance
+            TitleWordRelevance := mwOnlyTitleWord * WordRelevance
           end
           else
-            TitleWordRelevance := mwFirstTitleWord
-                                  * WordRelevance
+            TitleWordRelevance := mwFirstTitleWord * WordRelevance
         end
         else
         begin
-          TitleWordRelevance := mwTitleWord
-                                * WordRelevance;
+          TitleWordRelevance := mwTitleWord * WordRelevance;
         end;
-        inc( Results[ TopicIndex ],
-             TitleWordRelevance );
+        inc( Results[ Topic.Index ], TitleWordRelevance );
       end;
       inc( TitleWordIndex );
@@ -262 +258 @@
   pIndexEntry: pstring;
   IndexEntryWord: string;
-  Topic: TTopic;
+  tmpTopic: TTopic;
   IndexEntryWordIndex: longint;
   WordRelevance: longint;
@@ -273 +269 @@
   for IndexIndex := 0 to HelpFile.Index.Count - 1 do
   begin
-    Topic := HelpFile.Index.getTopic(IndexIndex);
     pIndexEntry := HelpFile.Index.GetLabels.ValuePtrs[IndexIndex];
     IndexEntryWordIndex := 0;
@@ -284 +279 @@
       IndexEntryWord := tmpIndexWords[i];
 
-      WordRelevance := CompareWord( SearchWord,
-                                    IndexEntryWord );
+      WordRelevance := CompareWord( SearchWord, IndexEntryWord );
       if WordRelevance > 0 then
       begin
@@ -294 +288 @@
           begin
             // in fact it's the only word
-            IndexEntryWordRelevance := mwOnlyIndexWord
-                                       * WordRelevance
+            IndexEntryWordRelevance := mwOnlyIndexWord * WordRelevance
           end
           else
-            IndexEntryWordRelevance := mwFirstIndexWord
-                                    * WordRelevance
+            IndexEntryWordRelevance := mwFirstIndexWord * WordRelevance
         end
         else
         begin
-          IndexEntryWordRelevance := mwIndexWord
-                                  * WordRelevance;
+          IndexEntryWordRelevance := mwIndexWord * WordRelevance;
         end;
-        inc( Results[ Topic.Index ],
-             IndexEntryWordRelevance );
+        tmpTopic := HelpFile.Index.getTopic(IndexIndex);
+        inc( Results[ tmpTopic.Index ], IndexEntryWordRelevance );
       end;
       inc( IndexEntryWordIndex );