Browse Source

* Dotted filenames for package fpindexer

Michaël Van Canneyt 2 years ago
parent
commit
a1d21b2d17

+ 3 - 0
packages/fpindexer/namespaced/FpIndexer.Db.Fb.pp

@@ -0,0 +1,3 @@
+unit FpIndexer.Db.Fb;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fbindexdb.pp}

+ 3 - 0
packages/fpindexer/namespaced/FpIndexer.Db.Memory.pp

@@ -0,0 +1,3 @@
+unit FpIndexer.Db.Memory;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i memindexdb.pp}

+ 3 - 0
packages/fpindexer/namespaced/FpIndexer.Db.Pg.pp

@@ -0,0 +1,3 @@
+unit FpIndexer.Db.Pg;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i pgindexdb.pp}

+ 3 - 0
packages/fpindexer/namespaced/FpIndexer.Db.SqlDb.pp

@@ -0,0 +1,3 @@
+unit FpIndexer.Db.SqlDb;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i sqldbindexdb.pp}

+ 3 - 0
packages/fpindexer/namespaced/FpIndexer.Db.Sqlite.pp

@@ -0,0 +1,3 @@
+unit FpIndexer.Db.Sqlite;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i sqliteindexdb.pp}

+ 3 - 0
packages/fpindexer/namespaced/FpIndexer.Db.Types.pp

@@ -0,0 +1,3 @@
+unit FpIndexer.Db.Types;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i dbindexer.pp}

+ 3 - 0
packages/fpindexer/namespaced/FpIndexer.Indexer.pp

@@ -0,0 +1,3 @@
+unit FpIndexer.Indexer;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpindexer.pp}

+ 3 - 0
packages/fpindexer/namespaced/FpIndexer.Masks.pp

@@ -0,0 +1,3 @@
+unit FpIndexer.Masks;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpmasks.pp}

+ 3 - 0
packages/fpindexer/namespaced/FpIndexer.Reader.Html.pp

@@ -0,0 +1,3 @@
+unit FpIndexer.Reader.Html;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i ireaderhtml.pp}

+ 3 - 0
packages/fpindexer/namespaced/FpIndexer.Reader.Pascal.pp

@@ -0,0 +1,3 @@
+unit FpIndexer.Reader.Pascal;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i ireaderpas.pp}

+ 3 - 0
packages/fpindexer/namespaced/FpIndexer.Reader.Txt.pp

@@ -0,0 +1,3 @@
+unit FpIndexer.Reader.Txt;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i ireadertxt.pp}

+ 13 - 0
packages/fpindexer/namespaces.lst

@@ -0,0 +1,13 @@
+src/dbindexer.pp=namespaced/FpIndexer.Db.Types.pp
+{s*:src/}=namespaced/
+{i+:src/}
+src/fpmasks.pp=namespaced/FpIndexer.Masks.pp
+src/ireadertxt.pp=namespaced/FpIndexer.Reader.Txt.pp
+src/ireaderpas.pp=namespaced/FpIndexer.Reader.Pascal.pp
+src/sqldbindexdb.pp=namespaced/FpIndexer.Db.SqlDb.pp
+src/ireaderhtml.pp=namespaced/FpIndexer.Reader.Html.pp
+src/fpindexer.pp=namespaced/FpIndexer.Indexer.pp
+src/memindexdb.pp=namespaced/FpIndexer.Db.Memory.pp
+src/fbindexdb.pp=namespaced/FpIndexer.Db.Fb.pp
+src/sqliteindexdb.pp=namespaced/FpIndexer.Db.Sqlite.pp
+src/pgindexdb.pp=namespaced/FpIndexer.Db.Pg.pp

+ 11 - 0
packages/fpindexer/src/dbindexer.pp

@@ -13,14 +13,21 @@
 
 
  **********************************************************************}
  **********************************************************************}
  
  
+{$IFNDEF FPC_DOTTEDUNITS}
 unit DBIndexer;
 unit DBIndexer;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 {$mode objfpc}{$H+}
 {$mode objfpc}{$H+}
 
 
 interface
 interface
 
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, FpIndexer.Reader.Txt, Data.Db, Data.Sqldb, Data.SqlDb.Ib, FpIndexer.Indexer;
+{$ELSE FPC_DOTTEDUNITS}
 uses
 uses
   Classes, SysUtils, ireadertxt, db, sqldb, ibconnection, fpindexer;
   Classes, SysUtils, ireadertxt, db, sqldb, ibconnection, fpindexer;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 Type
 Type
 
 
@@ -68,7 +75,11 @@ Type
 
 
 implementation
 implementation
 
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.DateUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses dateutils;
 uses dateutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 { TIBIndexer }
 { TIBIndexer }
 
 

+ 7 - 0
packages/fpindexer/src/fbindexdb.pp

@@ -12,14 +12,21 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 
  **********************************************************************}
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fbIndexdb;
 unit fbIndexdb;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 {$mode objfpc}{$H+}
 {$mode objfpc}{$H+}
 
 
 interface
 interface
 
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, FpIndexer.Indexer, FpIndexer.Db.SqlDb ,Data.Sqldb, Data.SqlDb.Ib;
+{$ELSE FPC_DOTTEDUNITS}
 uses
 uses
   Classes, SysUtils, fpIndexer, sqldbIndexDB ,sqldb, ibconnection;
   Classes, SysUtils, fpIndexer, sqldbIndexDB ,sqldb, ibconnection;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 type
 type
   { TFBIndexDB }
   { TFBIndexDB }

+ 16 - 1
packages/fpindexer/src/fpindexer.pp

@@ -13,7 +13,9 @@
 
 
  **********************************************************************}
  **********************************************************************}
  
  
-unit FPIndexer;
+{$IFNDEF FPC_DOTTEDUNITS}
+unit FpIndexer;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 {$mode objfpc}{$H+}
 {$mode objfpc}{$H+}
 
 
@@ -21,8 +23,13 @@ unit FPIndexer;
 
 
 interface
 interface
 
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
 uses
   Classes, SysUtils;
   Classes, SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 type
 type
   TWordTokenType = (wtOr, wtAnd, wtWord);
   TWordTokenType = (wtOr, wtAnd, wtWord);
@@ -463,11 +470,19 @@ function QuoteString(S: UTF8String): UTF8String;
 
 
 implementation
 implementation
 
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  {$ifdef LangDetect}
+     fpTextCat, Math,
+  {$endif}
+  FpIndexer.Masks;     //please note that this is an LCL unit, should be moved to FCL afaic
+{$ELSE FPC_DOTTEDUNITS}
 uses
 uses
   {$ifdef LangDetect}
   {$ifdef LangDetect}
      fpTextCat, Math,
      fpTextCat, Math,
   {$endif}
   {$endif}
   fpmasks;     //please note that this is an LCL unit, should be moved to FCL afaic
   fpmasks;     //please note that this is an LCL unit, should be moved to FCL afaic
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 resourcestring
 resourcestring
   SErrNoSuchLanguage = 'Unknown language : "%s".';
   SErrNoSuchLanguage = 'Unknown language : "%s".';

+ 8 - 0
packages/fpindexer/src/fpmasks.pp

@@ -19,15 +19,23 @@
  *                                                                           *
  *                                                                           *
  *****************************************************************************
  *****************************************************************************
 }
 }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit FPMasks;
 unit FPMasks;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 {$mode objfpc}{$H+}
 {$mode objfpc}{$H+}
 
 
 interface
 interface
 
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  // For Smart Linking: Do not use the LCL!
+  System.Classes, System.SysUtils, System.Contnrs;
+{$ELSE FPC_DOTTEDUNITS}
 uses
 uses
   // For Smart Linking: Do not use the LCL!
   // For Smart Linking: Do not use the LCL!
   Classes, SysUtils, Contnrs;
   Classes, SysUtils, Contnrs;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 type
 type
   TMaskCharType = (mcChar, mcCharSet, mcAnyChar, mcAnyText);
   TMaskCharType = (mcChar, mcCharSet, mcAnyChar, mcAnyText);

+ 9 - 1
packages/fpindexer/src/ireaderhtml.pp

@@ -1,5 +1,5 @@
 {
 {
-    This file is part of the Free Component Library (FCL)
+    This file is part of the Free Component Library (Fcl)
     Copyright (c) 2012 by the Free Pascal development team
     Copyright (c) 2012 by the Free Pascal development team
 
 
     HTML text reader
     HTML text reader
@@ -12,15 +12,23 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 
  **********************************************************************}
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit IReaderHTML;
 unit IReaderHTML;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 {$mode objfpc}{$H+}
 {$mode objfpc}{$H+}
 
 
 interface
 interface
 
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Fcl.FastHtmlParser, //, Fcl.Htmlutil,          // Fast Parser Functions
+  System.Classes, FpIndexer.Indexer;
+{$ELSE FPC_DOTTEDUNITS}
 uses
 uses
   FastHTMLParser, //, HTMLUtil,          // Fast Parser Functions
   FastHTMLParser, //, HTMLUtil,          // Fast Parser Functions
   Classes, fpIndexer;
   Classes, fpIndexer;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 type
 type
 
 

+ 7 - 0
packages/fpindexer/src/ireaderpas.pp

@@ -12,14 +12,21 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 
  **********************************************************************}
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit IReaderPAS;
 unit IReaderPAS;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 {$mode objfpc}{$H+}
 {$mode objfpc}{$H+}
 
 
 interface
 interface
 
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, FpIndexer.Indexer, FpIndexer.Reader.Txt;
+{$ELSE FPC_DOTTEDUNITS}
 uses
 uses
   Classes, fpIndexer, IReaderTXT;
   Classes, fpIndexer, IReaderTXT;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 type
 type
 
 

+ 7 - 0
packages/fpindexer/src/ireadertxt.pp

@@ -12,14 +12,21 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 
  **********************************************************************}
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit IReaderTXT;
 unit IReaderTXT;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 {$mode objfpc}{$H+}
 {$mode objfpc}{$H+}
 
 
 interface
 interface
 
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, FpIndexer.Indexer;
+{$ELSE FPC_DOTTEDUNITS}
 uses
 uses
   Classes, fpIndexer;
   Classes, fpIndexer;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 type
 type
 
 

+ 12 - 1
packages/fpindexer/src/memindexdb.pp

@@ -1,5 +1,5 @@
 {
 {
-    This file is part of the Free Component Library (FCL)
+    This file is part of the Free Component Library (Fcl)
     Copyright (c) 2012 by the Free Pascal development team
     Copyright (c) 2012 by the Free Pascal development team
 
 
     Memory database
     Memory database
@@ -12,14 +12,21 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 
  **********************************************************************}
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit memindexdb;
 unit memindexdb;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 {$mode objfpc}{$H+}
 {$mode objfpc}{$H+}
 
 
 interface
 interface
 
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, FpIndexer.Indexer, System.Contnrs;
+{$ELSE FPC_DOTTEDUNITS}
 uses
 uses
   Classes, SysUtils, fpindexer, contnrs;
   Classes, SysUtils, fpindexer, contnrs;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 Type
 Type
   TMatch = Class;
   TMatch = Class;
@@ -197,7 +204,11 @@ Type
 
 
 implementation
 implementation
 
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses Fcl.Streams.Buffer;
+{$ELSE FPC_DOTTEDUNITS}
 uses bufstream;
 uses bufstream;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 { TMemIndexDB }
 { TMemIndexDB }
 
 

+ 7 - 0
packages/fpindexer/src/pgindexdb.pp

@@ -12,14 +12,21 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 
  **********************************************************************}
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit pgindexdb;
 unit pgindexdb;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 {$mode objfpc}{$H+}
 {$mode objfpc}{$H+}
 
 
 interface
 interface
 
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, FpIndexer.Indexer, FpIndexer.Db.SqlDb ,Data.Sqldb, Data.SqlDb.Pq;
+{$ELSE FPC_DOTTEDUNITS}
 uses
 uses
   Classes, SysUtils, fpIndexer, sqldbIndexDB ,sqldb, pqconnection;
   Classes, SysUtils, fpIndexer, sqldbIndexDB ,sqldb, pqconnection;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 type
 type
   { TPGIndexDB }
   { TPGIndexDB }

+ 7 - 0
packages/fpindexer/src/sqldbindexdb.pp

@@ -12,14 +12,21 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 
  **********************************************************************}
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit SQLDBIndexDB;
 unit SQLDBIndexDB;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 {$mode objfpc}{$H+}
 {$mode objfpc}{$H+}
 
 
 interface
 interface
 
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.SysUtils, FpIndexer.Indexer, Data.Sqldb, Data.Db;
+{$ELSE FPC_DOTTEDUNITS}
 uses
 uses
   SysUtils, fpIndexer, sqldb, db;
   SysUtils, fpIndexer, sqldb, db;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 // SQLDB Specific, cache query objects
 // SQLDB Specific, cache query objects
 type
 type

+ 7 - 0
packages/fpindexer/src/sqliteindexdb.pp

@@ -12,14 +12,21 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 
  **********************************************************************}
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit SQLiteIndexDB;
 unit SQLiteIndexDB;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 {$mode objfpc}{$H+}
 {$mode objfpc}{$H+}
 
 
 interface
 interface
 
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.SysUtils, FpIndexer.Indexer, System.CTypes, Api.Sqlite3;
+{$ELSE FPC_DOTTEDUNITS}
 uses
 uses
   SysUtils, fpIndexer, ctypes, sqlite3;
   SysUtils, fpIndexer, ctypes, sqlite3;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 type
 type
   TDatabaseID = record
   TDatabaseID = record