Changeset 115 for trunk/NewView/SearchUnit.pas

Timestamp:

Apr 25, 2007, 10:30:39 AM (18 years ago)

Author:

RBRi

Message:

changed to use StringUtilsUnit

File:

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

trunk/NewView/SearchUnit.pas

@@ -49 +49 @@
   SysUtils,
   DebugUnit,
-  ACLStringUtility,
+  StringUtilsUnit,
   HelpTopic;
 
@@ -109 +109 @@
   OccurrencePos := CaseInsensitivePos( SearchWord, ReferenceWord );
   if OccurrencePos = 0 then
+  begin
     // no match
     exit;
+  end;
 
   Result := MatchedWordRelevance( SearchWord, ReferenceWord );
@@ -147 +149 @@
   begin
     pDictWord := HelpFile.DictionaryWordPtrs[ DictIndex ];
-    if StringsSame( SearchWord, pDictWord^ ) then
+    if StrEqualIgnoringCase( SearchWord, pDictWord^ ) then
       Results[ DictIndex ] := mwExactWord;
   end;
@@ -166 +168 @@
   begin
     DictWord := HelpFile.DictionaryWords[ DictIndex ];
-    if StrStarts( SearchWord, DictWord ) then
+    if StrStartsWithIgnoringCase( SearchWord, DictWord ) then
       Results[ DictIndex ] := MatchedWordRelevance( SearchWord, DictWord );
   end;
@@ -185 +187 @@
   begin
     DictWord := HelpFile.DictionaryWords[ DictIndex ];
-    if StrEnds( SearchWord, DictWord ) then
+    if StrEndsWithIgnoringCase( SearchWord, DictWord ) then
       Results[ DictIndex ] := MatchedWordRelevance( SearchWord, DictWord );
   end;
@@ -202 +204 @@
   WordRelevance: longint;
   TitleWordRelevance: longint;
-  P: longint;
-begin
+  tmpTitleWords : TStringList;
+  i : integer;
+begin
+  tmpTitleWords := TStringList.Create;
+
   // Search topic titles
   for TopicIndex:= 0 to HelpFile.TopicCount - 1 do
@@ -210 +215 @@
     pTitle:= Topic.TitlePtr;
     TitleWordIndex := 0;
-    P := 1;
-    while P < Length( pTitle^ ) do
+
+    tmpTitleWords.Clear;
+    StrExtractStringsQuoted(tmpTitleWords, pTitle^);
+
+    for i := 0 to tmpTitleWords.count-1 do
     begin
-      GetNextValue( pTitle^, P, TitleWord, ' ' );
+      TitleWord := tmpTitleWords[i];
+
       WordRelevance := CompareWord( SearchWord,
                                     TitleWord );
@@ -221 +230 @@
         begin
           // matching the first word is best
-          if P >= Length( pTitle^ ) then
+          if i = tmpTitleWords.count-1 then
+          begin
             // in fact it's the only word
             TitleWordRelevance := mwOnlyTitleWord
                                   * WordRelevance
+          end
           else
             TitleWordRelevance := mwFirstTitleWord
@@ -240 +251 @@
     end;
   end;
+  tmpTitleWords.Destroy;
 end;
 
@@ -254 +266 @@
   WordRelevance: longint;
   IndexEntryWordRelevance: longint;
-  P: longint;
-begin
+  tmpIndexWords : TStringList;
+  i : integer;
+begin
+  tmpIndexWords := TStringList.Create;
+
   for IndexIndex := 0 to HelpFile.Index.Count - 1 do
   begin
@@ -261 +276 @@
     pIndexEntry := HelpFile.IndexEntryPtr[ IndexIndex ];
     IndexEntryWordIndex := 0;
-    P := 1;
-    while P < Length( pIndexEntry^ ) do
+
+    tmpIndexWords.Clear;
+    StrExtractStringsQuoted(tmpIndexWords, pIndexEntry^);
+
+    for i := 0 to tmpIndexWords.count-1 do
     begin
-      GetNextValue( pIndexEntry^, P, IndexEntryWord, ' ' );
+      IndexEntryWord := tmpIndexWords[i];
+
       WordRelevance := CompareWord( SearchWord,
                                     IndexEntryWord );
@@ -272 +291 @@
         begin
           // matching the first word is best
-          if P >= Length( pIndexEntry^ ) then
+          if i = tmpIndexWords.count-1 then
+          begin
             // in fact it's the only word
             IndexEntryWordRelevance := mwOnlyIndexWord
                                        * WordRelevance
+          end
           else
             IndexEntryWordRelevance := mwFirstIndexWord
@@ -291 +312 @@
     end;
   end;
+
+  tmpIndexWords.Destroy;
 end;