Changeset 137 for trunk/Modules/News

Timestamp:

Sep 9, 2022, 1:16:58 AM (22 months ago)

Author:

chronos

Message:

• Added: Robots page.
• Modified: Canonical URL for webcams.
• Modified: Removed compiler mode delphi as it is already set in project.
• Modified: Updated Common package.
• Modified: Use Generics.Collections instead of fgl.

Location:

trunk/Modules/News

Files:

• UModuleNews.pas (modified) (4 diffs)
• UNews.pas (modified) (5 diffs)

trunk/Modules/News/UModuleNews.pas

@@ -1 +1 @@
 unit UModuleNews;
-
-{$mode delphi}
 
 interface
 
 uses
-  Classes, SysUtils, UModularSystem, SpecializedDictionary, UModuleBase, UNews,
-  UHTTPServer, UModuleUser;
+  Classes, SysUtils, UModularSystem, UModuleBase, UNews, UHTTPServer, UModuleUser;
 
 type
@@ -82 +79 @@
 var
   DbRows: TDbRows;
-  Data: TDictionaryStringString;
 begin
   try
     DbRows := TDbRows.Create;
-    Data := TDictionaryStringString.Create;
 
     Core.CommonDatabase.Query(DbRows,
@@ -125 +120 @@
     '  ADD CONSTRAINT `News_ibfk_1` FOREIGN KEY (`Category`) REFERENCES `NewsCategory` (`Id`);');
   finally
-    Data.Free;
     DbRows.Free;
   end;
-  inherited Install;
+  inherited;
 end;
 
@@ -135 +129 @@
   DbRows: TDbRows;
 begin
-  inherited Uninstall;
+  inherited;
   try
     DbRows := TDbRows.Create;

trunk/Modules/News/UNews.pas

@@ -1 +1 @@
 unit UNews;
 
-{mode delphi}
-
 interface
 
 uses
-  Classes, SysUtils, USqlDatabase, UModuleUser, UUtils, fgl, UWebSession,
-  UHTTPServer, UModuleBase, SpecializedList;
+  Classes, SysUtils, USqlDatabase, UModuleUser, UUtils, Generics.Collections, UWebSession,
+  UHTTPServer, UModuleBase, UCommon;
 
 type
@@ -19 +17 @@
   end;
 
-  TNewsSettingItems = class(TFPGObjectList<TNewsSettingItem>)
+  TNewsSettingItems = class(TObjectList<TNewsSettingItem>)
   end;
 
@@ -44 +42 @@
 
 
-
 implementation
 
@@ -91 +88 @@
   J: Integer;
   Author: string;
-  Enclosures: TListString;
+  Enclosures: TStringArray;
 begin
   //global Database, NewsCategoryNames, NewsCountPerCategory, UploadedFilesFolder;
@@ -128 +125 @@
       if DbRows[I].Values['Enclosure'] <> '' then begin
         Output := Output + '<br />Přílohy: ';
-        try
-          Enclosures := TListString.Create;
-          Enclosures.Explode(DbRows[I].Values['Enclosure'], ';', StrToStr);
-          for J := 0 to Enclosures.Count - 1  do begin
-            if FileExists(UploadedFilesFolder + Enclosures[J]) then
-              Output := Output + ' <a href="' + UploadedFilesFolder + Enclosures[J] +
-              '">' + Enclosures[J] + '</a>';
-          end;
-        finally
-          Enclosures.Free;
+        Enclosures := Explode(';', DbRows[I].Values['Enclosure']);
+        for J := 0 to Length(Enclosures) - 1  do begin
+          if FileExists(UploadedFilesFolder + Enclosures[J]) then
+            Output := Output + ' <a href="' + UploadedFilesFolder + Enclosures[J] +
+            '">' + Enclosures[J] + '</a>';
         end;
       end;