Changeset 331 for branches

Timestamp:

Aug 30, 2008, 9:34:39 PM (17 years ago)

Author:

RBRi

Message:

log output added
source formating

File:

• branches/2.19_branch/NewView/TextSearchQuery.pas (modified) (11 diffs)

branches/2.19_branch/NewView/TextSearchQuery.pas

@@ -29 +29 @@
     CombineMethod: TSearchTermCombineMethod;
 
-    constructor Create( const TheText: string;
-                        const TheCombineMethod: TSearchTermCombineMethod );
+    constructor Create( const aText: string;
+                        const aCombineMethod: TSearchTermCombineMethod );
     destructor Destroy; override;
+
+    function AsLogText: String;
   end;
 
@@ -40 +42 @@
     function GetTermCount: longint;
   public
-    constructor Create( const SearchString: string );
+    constructor Create(const aSearchString: String);
     destructor Destroy; override;
 
     property Term[ Index: longint ]: TSearchTerm read GetTerm;
     property TermCount: longint read GetTermCount;
+
+    procedure Log;
   end;
 
@@ -63 +67 @@
                            const Apply: boolean );
 begin
-
   Language.Prefix := 'SearchQuery.';
   Language.LL( Apply, QueryErrorMissingWord1, 'QueryErrorMissingWord1', 'No search word given after ' );
@@ -69 +72 @@
 end;
 
-constructor TTextSearchQuery.Create( const SearchString: string );
-var
-  TermText: string;
-  CombineMethod: TSearchTermCombineMethod;
+
+constructor TTextSearchQuery.Create(const aSearchString: string);
+var
+  tmpTermText: string;
+  tmpCombineMethod: TSearchTermCombineMethod;
   Term: TSearchTerm;
   tmpTerms : TStringList;
@@ -80 +84 @@
   try
     tmpTerms := TStringList.Create;
-    StrExtractStringsQuoted(tmpTerms, SearchString);
+    StrExtractStringsQuoted(tmpTerms, aSearchString);
 
     for i := 0 to tmpTerms.count-1 do
     begin
-      TermText := tmpTerms[i];
+      tmpTermText := tmpTerms[i];
 
       // Check for modifiers:
       //  + word must be matched
       //  - word must not be matched
-      case TermText[ 1 ] of
+      case tmpTermText[ 1 ] of
        '+':
-         CombineMethod := cmRequired;
+         tmpCombineMethod := cmRequired;
        '-':
-         CombineMethod := cmExcluded;
+         tmpCombineMethod := cmExcluded;
        else
-         CombineMethod := cmOptional;
+         tmpCombineMethod := cmOptional;
       end;
 
-      if CombineMethod <> cmOptional then
+      if tmpCombineMethod <> cmOptional then
       begin
         // delete + or -
-        if Length( TermText ) = 1 then
+        if Length( tmpTermText ) = 1 then
           if (i < tmpTerms.count-1) then
             raise ESearchSyntaxError.Create( QueryErrorMissingWord1
-                                             + StrInDoubleQuotes(TermText)
+                                             + StrInDoubleQuotes(tmpTermText)
                                              + QueryErrorMissingWord2
                                              + StrInDoubleQuotes(tmpTerms[i+1]) )
           else
             raise ESearchSyntaxError.Create( QueryErrorMissingWord1
-                                             + StrInDoubleQuotes(TermText));
-        Delete( TermText, 1, 1 );
+                                             + StrInDoubleQuotes(tmpTermText));
+        Delete( tmpTermText, 1, 1 );
       end;
 
-      Term := TSearchTerm.Create( TermText,
-                                  CombineMethod );
+      Term := TSearchTerm.Create( tmpTermText, tmpCombineMethod );
       Terms.Add( Term );
     end;
@@ -125 +128 @@
 end;
 
+
 destructor TTextSearchQuery.Destroy;
 begin
@@ -131 +135 @@
 end;
 
+
+function TSearchTerm.AsLogText: String;
+var
+  i : integer;
+begin
+  result := 'TSearchTerm: ''' + text + '''  (' + IntToStr(Parts.Count) + ' parts; ';
+
+  case CombineMethod of
+  cmRequired :
+    result := result + 'cmRequired';
+  cmExcluded :
+    result := result + 'cmExcluded';
+  cmOptional :
+    result := result + 'cmOptional';
+  end;
+
+  result := result + ')';
+end;
+
+
+
 function TTextSearchQuery.GetTerm( index: longint ): TSearchTerm;
 begin
@@ -136 +161 @@
 end;
 
+
 function TTextSearchQuery.GetTermCount: longint;
 begin
@@ -141 +167 @@
 end;
 
-constructor TSearchTerm.Create( const TheText: string;
-                                const TheCombineMethod: TSearchTermCombineMethod );
+
+constructor TSearchTerm.Create( const aText: string;
+                                const aCombineMethod: TSearchTermCombineMethod );
 var
   TermParseIndex: longint;
@@ -150 +177 @@
   Parts := TStringList.Create;
 
-  Text := TheText;
-  CombineMethod := TheCombineMethod;
+  Text := aText;
+  CombineMethod := aCombineMethod;
 
   // Break out each part of the term as IPF does:
@@ -204 +231 @@
 end;
 
+
+procedure TTextSearchQuery.Log;
+var
+  i : longint;
+begin
+  if IsLogAspectsEnabled(LogSearch) then
+  begin
+    LogEvent(LogSearch, ' TTextSearchQuery:');
+
+    for i := 0 to TermCount - 1 do
+    begin
+      LogEvent(LogSearch, '  Term ' + IntToStr(0) + ' [' + Term[i].AsLogText + ']');
+    end;
+  end;
+end;
+
+
+
 Initialization
    RegisterProcForLanguages( OnLanguageEvent );