Quellcode durchsuchen

* Last patch from Andrey Sobol to fix bug ID #38141

git-svn-id: trunk@47719 -
(cherry picked from commit 9ac84262f66c36aea80d16ec475a0e3c2cae9352)
michael vor 4 Jahren
Ursprung
Commit
b6f8316cbb
2 geänderte Dateien mit 21 neuen und 3 gelöschten Zeilen
  1. 1 1
      utils/fpdoc/dw_html.pp
  2. 20 2
      utils/fpdoc/dw_htmlchm.inc

+ 1 - 1
utils/fpdoc/dw_html.pp

@@ -19,7 +19,7 @@ unit dw_html;
 {$WARN 5024 off : Parameter "$1" not used}
 interface
 
-uses Classes, DOM, DOM_HTML, dGlobals, PasTree, dWriter, ChmWriter;
+uses Classes, DOM, DOM_HTML, dGlobals, PasTree, dWriter, ChmWriter, chmtypes;
 
 const
   // Subpage indices for modules

+ 20 - 2
utils/fpdoc/dw_htmlchm.inc

@@ -2,12 +2,19 @@
 {$IFDEF chmInterface}
 type
 
+  { TFpDocChmWriter }
+
+  TFpDocChmWriter = class (TChmWriter)
+  protected
+    procedure FileAdded(AStream: TStream; const AEntry: TFileEntryRec); override;
+  end;
+
   { TCHMHTMLWriter }
 
   TCHMHTMLWriter = class(THTMLWriter)
   private
     FOutChm: TStream;
-    FChm: TChmWriter;
+    FChm: TFpDocChmWriter;
     FTempUncompressed: TStream;
     FTempUncompressedName: String;
     FChmTitle: String;
@@ -37,6 +44,17 @@ type
   end;
 {$ELSE} // implementation
 
+{ TFpDocChmWriter }
+
+procedure TFpDocChmWriter.FileAdded ( AStream: TStream;
+  const AEntry: TFileEntryRec ) ;
+begin
+  // Exclude Full text index for files starting from the dot
+  if Pos('.', AEntry.Name) <> 1 then
+    inherited FileAdded(AStream, AEntry);
+
+end;
+
 { TCHMHTMLWriter }
 
 function TCHMHTMLWriter.ResolveLinkIDAbs(const Name: String; Level : Integer = 0): DOMString;
@@ -466,7 +484,7 @@ begin
 
   FTempUncompressedName := GetTempFileName+IntToStr(GetProcessID) +'.raw';
   FTempUncompressed := TFileStream.Create(FTempUncompressedName, fmOpenReadWrite  or fmCreate);
-  FChm := TChmWriter.Create(FOutChm, False);
+  FChm := TFpDocChmWriter.Create(FOutChm, False);
   FChm.Title := FChmTitle;
   FChm.TempRawStream := FTempUncompressed;
   FChm.OnGetFileData := @RetrieveOtherFiles;