Changeset 74 for trunk/NewView/HelpFile.pas

Timestamp:

Feb 8, 2007, 9:15:07 PM (19 years ago)

Author:

RBRi

Message:

improved TopicByTitleSearch #6 fixed

File:

• trunk/NewView/HelpFile.pas (modified) (2 diffs)

trunk/NewView/HelpFile.pas

@@ -700 +700 @@
 var
   i: longint;
-  Topic: TTopic;
+  tmpTopic: TTopic;
+  tmpLevel : integer;
+  tmpMore : boolean;
 begin
   result := nil;
-  for i := 0 to _Topics.Count - 1 do
-  begin
-    Topic := _Topics[ i ];
-    if StrStarts( SearchText, Topic.TitlePtr ^ ) then
+
+  tmpLevel := 0;
+  repeat
+    tmpMore := false;
+    inc(tmpLevel);
+    for i := 0 to _Topics.Count - 1 do
     begin
-      result := Topic;
-      exit;
-    end;
-  end;
+      tmpTopic := _Topics[i];
+      if tmpLevel = tmpTopic.ContentsLevel then
+      begin
+        if StrStarts( SearchText, tmpTopic.TitlePtr ^ ) then
+        begin
+          result := tmpTopic;
+          exit;
+        end;
+      end;
+      if tmpLevel < tmpTopic.ContentsLevel then
+      begin
+        tmpMore := True;
+      end;
+    end;
+  until NOT tmpMore;
 end;
 
@@ -717 +732 @@
 var
   i: longint;
-  Topic: TTopic;
+  tmpTopic: TTopic;
+  tmpLevel : integer;
+  tmpMore : boolean;
 begin
   result := nil;
-  for i := 0 to _Topics.Count - 1 do
-  begin
-    Topic := _Topics[ i ];
-    if CaseInsensitivePos( SearchText, Topic.TitlePtr ^ ) > 0 then
+
+  tmpLevel := 0;
+  repeat
+    tmpMore := false;
+    inc(tmpLevel);
+    for i := 0 to _Topics.Count - 1 do
     begin
-      result := Topic;
-      exit;
-    end;
-  end;
+      tmpTopic := _Topics[i];
+      if tmpLevel = tmpTopic.ContentsLevel then
+      begin
+        if CaseInsensitivePos( SearchText, tmpTopic.TitlePtr ^ ) > 0 then
+        begin
+          result := tmpTopic;
+          exit;
+        end;
+      end;
+      if tmpLevel < tmpTopic.ContentsLevel then
+      begin
+        tmpMore := True;
+      end;
+    end;
+  until NOT tmpMore;
 end;