Changeset 333 for branches/2.19_branch/NewView/HelpTopic.pas

Timestamp:

Aug 31, 2008, 2:01:55 PM (17 years ago)

Author:

RBRi

Message:

search bug fix; more logging

File:

• branches/2.19_branch/NewView/HelpTopic.pas (modified) (10 diffs)

branches/2.19_branch/NewView/HelpTopic.pas

@@ -1460 +1460 @@
                                 ): longint;
 var
-  WordSequence: TList;
-  SequenceStepIndex: longint;
+  tmpWordSequence: TList;
+  tmpSequenceStepIndex: longint;
   pSequenceStepWords: Uint32ArrayPointer;
 
@@ -1476 +1476 @@
   for SequenceIndex := 0 to WordSequences.Count - 1 do
   begin
-    WordSequence := WordSequences[ SequenceIndex ];
-    pSequenceStepWords := WordSequence[ 0 ];
+    tmpWordSequence := WordSequences[ SequenceIndex ];
+    pSequenceStepWords := tmpWordSequence[ 0 ];
 
     if pSequenceStepWords^[ GlobalDictIndex ] > 0 then
     begin
       // matched first step in this sequence. Look ahead...
-
-      SequenceStepIndex := 0;
+      tmpSequenceStepIndex := 1;
 
       pDataTemp := pData;
       SlotIndexTemp := SlotIndex;
       StateTemp := State;
+
       while true do
       begin
-        inc( SequenceStepIndex );
-        if SequenceStepIndex = WordSequence.Count then
-        begin
-          // have a match for the sequence, insert start highlight
-          Result := WordSequence.Count;
+        if tmpSequenceStepIndex = tmpWordSequence.Count then
+        begin
+          // have a match for the sequence; time to leave
+          Result := tmpWordSequence.Count;
           break;
         end;
 
         // get words for next step in sequence
-        pSequenceStepWords := WordSequence[ SequenceStepIndex ];
-
-        DictIndex := GetNextIPFTextItem( SlotIndexTemp,
-                                         pDataTemp,
-                                         StateTemp );
+        pSequenceStepWords := tmpWordSequence[ tmpSequenceStepIndex ];
+
+        DictIndex := GetNextIPFTextItem( SlotIndexTemp, pDataTemp, StateTemp );
         if DictIndex = -2 then
         begin
@@ -1518 +1515 @@
 
         // s := pstring( _GlobalDictionary[ DictIndex ] )^; // for debug only
+
+
+        // ignore whitespace
         if not StrIsEmptyOrSpaces( pstring( _GlobalDictionary[ DictIndex ] )^ ) then
         begin
@@ -1525 +1525 @@
             break;
           end;
+
+          // match; next one
+          inc(tmpSequenceStepIndex);
         end;
 
@@ -1533 +1536 @@
   end; // for sequenceindex ...
 end;
+
 
 // Main translation function. Turns the IPF data into
@@ -1637 +1641 @@
 
         if ShowWordSeparators then
+        begin
           Text.AddString( '{' + IntToStr( GlobalDictIndex )+ '}' );
+        end;
 
         // normal lookup
@@ -1656 +1662 @@
           // store string into "word"
           if State.TextBlock.Length = 0 then
+          begin
             // store start of block
             State.StartOfTextBlock := Text.Length;
+          end;
 
           State.TextBlock.AddString( StringToAdd );
@@ -1672 +1680 @@
               begin
                 // now finished, insert end highlight
-                StringToAdd := StringToAdd
-                               + State.BackgroundColorTag;
-
+                StringToAdd := StringToAdd + State.BackgroundColorTag;
               end;
             end
@@ -1699 +1705 @@
                 if SequenceStepIndex = 0 then
                   // and ends it.
-                  StringToAdd := StringToAdd
-                           + State.BackgroundColorTag;
+                  StringToAdd := StringToAdd + State.BackgroundColorTag;
               end;
 
@@ -1821 +1826 @@
   end;
   State.TextBlock.Destroy;
-
-end;
+end;
+
 
 function TTopic.SearchForWord( DictIndex: integer;