From 86fa1e2268ad5de2a4a6eec2a1bbf0ae7ee01451 Mon Sep 17 00:00:00 2001
From: yamat0jp <terukohietori@gmail.com>
Date: Fri, 5 Jul 2019 21:03:55 +0900
Subject: [PATCH] =?utf8?q?=E3=82=88=E3=81=8F=E3=81=A7=E3=81=8D=E3=81=A6?=
 =?utf8?q?=E3=81=84=E3=81=BE=E3=81=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 WebModuleUnit1.dfm |  5 ++---
 WebModuleUnit1.pas | 39 +++++++++++++++------------------------
 2 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/WebModuleUnit1.dfm b/WebModuleUnit1.dfm
index 8953cef..7b2e0c1 100644
--- a/WebModuleUnit1.dfm
+++ b/WebModuleUnit1.dfm
@@ -161,7 +161,7 @@ object TWebModule1: TTWebModule1
     Footer.Strings = (
       '<input type=submit value='#21066#38500#12377#12427'><input type=submit value='#12522#12475#12483#12488'>'
       '</form>'
-      '<p style=text-align:center><a href=/index?db=<#database>>'#25147#12427'</a>')
+      '')
     Header.Strings = (
       '<form action=/admindel method=post>')
     MaxRows = 30
@@ -379,8 +379,7 @@ object TWebModule1: TTWebModule1
   end
   object footer: TDataSetPageProducer
     HTMLDoc.Strings = (
-      '<p style=text-align:center>[ <#link> ] <#recent>'
-      '')
+      '<p style=text-align:center>[ <#link> ] <#recent>')
     DataSet = DataModule1.FDTable1
     OnHTMLTag = footerHTMLTag
     Left = 112
diff --git a/WebModuleUnit1.pas b/WebModuleUnit1.pas
index 1c921a5..19f97df 100644
--- a/WebModuleUnit1.pas
+++ b/WebModuleUnit1.pas
@@ -454,38 +454,30 @@ procedure TTWebModule1.TWebModule1adminAction(Sender: TObject;
   Request: TWebRequest; Response: TWebResponse; var Handled: Boolean);
 var
   s: string;
-  i, max: Integer;
+  i: Integer;
 begin
+  admin.MaxRows := DataModule1.FDTable3.FieldByName('count').AsInteger;
   s := TNetEncoding.URL.Decode(Request.QueryFields.Values['db']);
   DataModule1.FDTable1.Locate('database', s, []);
   s := Request.QueryFields.Values['num'];
-  max := DataModule1.FDTable3.FieldByName('count').AsInteger;
-  index.Tag := -1;
-  if s <> '' then
+  i := StrToIntDef(s, -1);
+  pages(DataModule1.FDTable2.RecordCount, i);
+  index.Tag := i;
+  s := '/admin';
+  footer.Tag := Integer(@s);
+  i := footer.HTMLDoc.Add
+    ('<p style=text-align:center><a href=/index?db=<#database>>–ß‚é</a>');
+  if admin.Tag = 0 then
   begin
-    index.Tag := s.ToInteger;
-    DataModule1.FDTable2.RecNo := (index.Tag - 1) * max - 1;
+    admin.footer.Insert(3, footer.Content);
+    admin.Tag := 1;
   end
   else
-    with DataModule1.FDTable2 do
-      RecNo := 1 + RecordCount - RecordCount mod max;
-  s := '/admin';
-  footer.Tag := Integer(@s);
-  if admin.Tag = -1 then
   begin
-    ss := TStringList.Create;
-    try
-      ss.Assign(admin.footer);
-      ss.Insert(2, footer.HTMLDoc.Text);
-      admin.footer.Text := footer.ContentFromString(ss.Text);
-    finally
-      ss.Free;
-    end;
+    admin.footer.Delete(3);
+    admin.footer.Insert(3, footer.Content);
   end;
-  i := DataModule1.FDTable2.RecNo;
-  admin.Tag := i;
-  pages(max, i);
-  index.Tag := i;
+  footer.HTMLDoc.Delete(i);
   Response.ContentType := 'text/html;charset=utf-8';
   Response.Content := admin.Content;
 end;
@@ -743,7 +735,6 @@ begin
     DataModule1.FDTable3.AppendRecord
       (['‚Æ‚é‚ˁ`‚Ǎ†', '<p style=font-color:gray>‚Æ‚é‚ˁ`‚Ǎ†</p>', false, a, 30]);
   end;
-  admin.Tag := -1;
 end;
 
 end.
-- 
2.11.0