/regist がややこしくなってしまいました

setLastArticleは降順でもfirst lastの使い方は変わりませんでした

diff --git a/Unit1.dfm b/Unit1.dfm
index 061c926..33d84c5 100644 (file)
--- a/Unit1.dfm
+++ b/Unit1.dfm
@@ -29,11 +29,12 @@ object DataModule1: TDataModule1
       'Database=kainushi'
       'Server=localhost'
       'DriverID=MySQL')
+    Connected = True
     Left = 144
     Top = 24
   end
   object FDTable2: TFDTable
-    IndexFieldNames = 'DBNUM;NUMBER:DN'
+    IndexFieldNames = 'DBNUM;NUMBER:A'
     MasterSource = DataSource1
     MasterFields = 'DBNUM'
     Connection = FDConnection1
@@ -186,12 +187,4 @@ object DataModule1: TDataModule1
       Origin = 'SOURCE'
     end
   end
-  object FDQuery1: TFDQuery
-    Connection = FDConnection1
-    SQL.Strings = (
-      'select dbnum,number,title,date from article'
-      ' where number = 1 order by date;')
-    Left = 160
-    Top = 144
-  end
 end

diff --git a/Unit1.pas b/Unit1.pas
index 1e2df4f..c5a101b 100644 (file)
--- a/Unit1.pas
+++ b/Unit1.pas
@@ -45,7 +45,6 @@ type
     FDTable5NAME: TWideStringField;
     FDTable5SOURCE: TBlobField;
     FDTable1DATABASE: TWideStringField;
-    FDQuery1: TFDQuery;
     FDTable3password: TWideStringField;
     FDTable3ng: TWideStringField;
   private

diff --git a/WebModuleUnit1.dfm b/WebModuleUnit1.dfm
index ee01214..eb55759 100644 (file)
--- a/WebModuleUnit1.dfm
+++ b/WebModuleUnit1.dfm
@@ -1914,6 +1914,7 @@ object WebModule1: TWebModule1
       '<p style=font-weight:bold><#database>'#8595'</p>'
       '<div>'#12479#12452#12488#12523': '#39'<#title> , '#35352#20107#25968': <#count> , '#26356#26032#26178#21051': <#date></div><p>'
       '')
+    DataSet = DataModule1.FDTable2
     OnHTMLTag = tiHTMLTag
     Left = 48
     Top = 320

diff --git a/WebModuleUnit1.pas b/WebModuleUnit1.pas
index 4ebcafe..a04fe58 100644 (file)
--- a/WebModuleUnit1.pas
+++ b/WebModuleUnit1.pas
@@ -109,7 +109,8 @@ type
     tagstr: string;
     procedure pages(count: Integer; var page: Integer);
     procedure strsCheck(var error: string; var list: TStringList);
-    function isInfo: Boolean;
+    procedure setLastArticle;
+    function isInfo(sort: Boolean = true): Boolean;
     function loginCheck: Boolean;
     function hash(str: string): string;
     function mente: Boolean;
@@ -132,6 +133,8 @@ uses Unit1, IdHashSHA, IdGlobal, IdHash, IdHashMessageDigest;
 const
   promotion = '\8dL\8d\90:';
   tcnt = 7;
+  sortNormal = 'DBNUM;NUMBER';
+  sortReverse = 'DBNUM;NUMBER:A';
 
 procedure TWebModule1.adheadHTMLTag(Sender: TObject; Tag: TTag;
   const TagString: string; TagParams: TStrings; var ReplaceText: string);
@@ -341,10 +344,29 @@ begin
     ReplaceText := DataModule1.FDTable1.FieldByName('database').AsString;
 end;
 
-function TWebModule1.isInfo: Boolean;
+function TWebModule1.isInfo(sort: Boolean = true): Boolean;
+var
+  s: string;
 begin
   result := DataModule1.FDTable1.FieldByName('dbnum')
     .AsInteger = DataModule1.FDTable3.FieldByName('info').AsInteger;
+  if sort = false then
+    Exit;
+  with DataModule1.FDTable2 do
+  begin
+    s := IndexFieldNames;
+    if (result = false) and (s = sortNormal) then
+      Exit;
+    Close;
+    try
+      if result = true then
+        IndexFieldNames := sortReverse
+      else
+        IndexFieldNames := sortNormal;
+    finally
+      Open;
+    end;
+  end;
 end;
 
 procedure TWebModule1.itemsHTMLTag(Sender: TObject; Tag: TTag;
@@ -549,12 +571,23 @@ begin
     ReplaceText := css2.Content;
 end;
 
+procedure TWebModule1.setLastArticle;
+begin
+  {
+    if isInfo(false) = true then
+    DataModule1.FDTable2.First
+    else
+  }
+  DataModule1.FDTable2.Last;
+end;
+
 procedure TWebModule1.strsCheck(var error: string; var list: TStringList);
 var
   s: TStringList;
   i, j: Integer;
   x: Boolean;
 begin
+  x := false;
   s := TStringList.Create;
   try
     s.DelimitedText := DataModule1.FDTable3.FieldByName('ng').AsString;
@@ -576,14 +609,9 @@ procedure TWebModule1.tiHTMLTag(Sender: TObject; Tag: TTag;
   const TagString: string; TagParams: TStrings; var ReplaceText: string);
 begin
   if TagString = 'count' then
-  begin
-    DataModule1.FDTable1.Locate('dbnum',
-      DataModule1.FDQuery1.FieldByName('dbnum').AsInteger);
-    ReplaceText := DataModule1.FDTable2.RecordCount.ToString;
-  end
+    ReplaceText := DataModule1.FDTable2.FieldCount.ToString
   else if TagString = 'database' then
-    ReplaceText := DataModule1.FDTable1.Lookup('dbnum',
-      DataModule1.FDQuery1.FieldByName('dbnum').AsInteger, 'database');
+    ReplaceText := DataModule1.FDTable1.FieldByName('database').AsString;
 end;
 
 procedure TWebModule1.titleHTMLTag(Sender: TObject; Tag: TTag;
@@ -594,15 +622,15 @@ begin
   else if TagString = 'js' then
     ReplaceText := detail(TagString, TagParams.Values['id'])
   else if TagString = 'main' then
-    with DataModule1.FDQuery1 do
+    with DataModule1.FDTable1 do
     begin
-      Open;
+      First;
       while Eof = false do
       begin
+        setLastArticle;
         ReplaceText := ReplaceText + ti.Content;
         Next;
       end;
-      Close;
     end;
 end;
 
@@ -630,7 +658,8 @@ begin
         continue;
       end;
       DataModule1.FDTable2.Last;
-      if Now - DataModule1.FDTable2.FieldByName('date').AsDateTime < 1 then
+      if (Now - DataModule1.FDTable2.FieldByName('date').AsDateTime < 1) and
+        (DataModule1.FDTable2.RecordCount > 0) then
         t := 'background-color:aqua;';
       if DataModule1.FDTable2.RecordCount >= 10 *
         DataModule1.FDTable3.FieldByName('count').AsInteger then
@@ -876,16 +905,12 @@ begin
   if s <> '' then
     DataModule1.FDTable1.Locate('dbnum', s, []);
   i := StrToIntDef(Request.QueryFields.Values['num'], -1);
+  isInfo;
   pages(DataModule1.FDTable2.RecordCount, i);
   index.Tag := i;
   tagstr := '/index';
   Self.Tag := Integer(@tagstr);
   Response.ContentType := 'text/html; charset="utf-8"';
-  s := DataModule1.FDTable2.IndexFieldNames;
-  if isInfo = true then
-    DataModule1.FDTable2.IndexFieldNames := Copy(s, 1, Length(s) - 2) + 'DN'
-  else
-    DataModule1.FDTable2.IndexFieldNames := Copy(s, 1, Length(s) - 2) + 'AN';
   if mente = false then
     Response.Content := index.Content;
 end;
@@ -1037,7 +1062,6 @@ procedure TWebModule1.WebModule1registAction(Sender: TObject;
 var
   number, i: Integer;
   title, na, raw, pass, kotoba, error: string;
-  s: string;
   comment: TStringList;
   function scan(Text: string): string;
   var
@@ -1063,18 +1087,12 @@ var
   end;
 
 begin
-  error := '';
   kotoba := Request.ContentFields.Values['aikotoba'];
+  error := '';
   if kotoba <> '\82°\82ñ\82«' then
-    error := '<section style=color:red><p>\8d\87\8c¾\97t\82ª\82¿\82ª\82¢\82Ü\82·.';
-  with DataModule1.FDTable2 do
-  begin
-    if isInfo = true then
-      First
-    else
-      Last;
-    number := FieldByName('number').AsInteger + 1;
-  end;
+    error := error + '<p>\8d\87\8c¾\97t\82ª\82¿\82ª\82¢\82Ü\82·.';
+  setLastArticle;
+  number := DataModule1.FDTable2.FieldByName('number').AsInteger + 1;
   with Request.ContentFields do
   begin
     title := Values['title'];
@@ -1104,32 +1122,25 @@ begin
   try
     comment.Text := raw;
     strsCheck(error, comment);
-    Request.ContentFields.Values['show'] := 'false';
     Request.ContentFields.Values['raw'] := raw;
     if error <> '' then
-      Request.ContentFields.Values['preview'] := error + '</section>'
+      Request.ContentFields.Values['preview'] := '<section style=color:red>' +
+        error + '</section>'
     else if Request.ContentFields.Values['show'] = 'true' then
     begin
       error := '<p style=font-size:2.3em;color:blue>\81«\81«\83v\83\8c\83r\83\85\81[\81«\81«<p>' +
         comment.Text;
       Request.ContentFields.Values['preview'] := error;
+      Request.ContentFields.Values['show'] := 'false';
     end
     else
     begin
-      s := DataModule1.FDTable2.IndexFieldNames;
-      if s[Length(s)] = 'N' then
-      begin
-        s := Copy(s, 1, Length(s) - 3);
-        DataModule1.FDTable2.IndexFieldNames := s;
-      end;
+      if isInfo(false) = true then
+        DataModule1.FDTable2.IndexFieldNames := '';
       i := DataModule1.FDTable1.FieldByName('dbnum').AsInteger;
       DataModule1.FDTable2.AppendRecord([i, number, title, na, comment.Text,
         raw, Now, pass]);
-      if isInfo = true then
-        s := s + ':DN'
-      else
-        s := s + ':AN';
-      DataModule1.FDTable2.IndexFieldNames := s;
+      isInfo;
       Response.SendRedirect('index?db=' + i.ToString + '#article');
       Exit;
     end;