表の結合をとりやめました

diff --git a/Unit1.dfm b/Unit1.dfm
index 9340309..261fc66 100644 (file)
--- a/Unit1.dfm
+++ b/Unit1.dfm
@@ -6,8 +6,8 @@ object DataModule1: TDataModule1
     Active = True
     IndexFieldNames = 'DBNUM'
     Connection = FDConnection1
-    UpdateOptions.UpdateTableName = 'DBNAME'
-    TableName = 'DBNAME'
+    UpdateOptions.UpdateTableName = 'dbname'
+    TableName = 'dbname'
     Left = 32
     Top = 88
     object FDTable1DBNUM: TIntegerField
@@ -42,8 +42,8 @@ object DataModule1: TDataModule1
     Connection = FDConnection1
     FetchOptions.AssignedValues = [evLiveWindowParanoic]
     FetchOptions.LiveWindowParanoic = True
-    UpdateOptions.UpdateTableName = 'ARTICLE'
-    TableName = 'ARTICLE'
+    UpdateOptions.UpdateTableName = 'article'
+    TableName = 'article'
     Left = 96
     Top = 88
     object FDTable2DBNUM: TIntegerField
@@ -92,8 +92,8 @@ object DataModule1: TDataModule1
   object FDTable3: TFDTable
     Active = True
     Connection = FDConnection1
-    UpdateOptions.UpdateTableName = 'SETTING'
-    TableName = 'SETTING'
+    UpdateOptions.UpdateTableName = 'setting'
+    TableName = 'setting'
     Left = 160
     Top = 88
     object FDTable3TITLE: TWideStringField
@@ -142,8 +142,8 @@ object DataModule1: TDataModule1
   object FDTable4: TFDTable
     Active = True
     Connection = FDConnection1
-    UpdateOptions.UpdateTableName = 'REQ'
-    TableName = 'REQ'
+    UpdateOptions.UpdateTableName = 'req'
+    TableName = 'req'
     Left = 224
     Top = 88
     object FDTable4ID: TIntegerField
@@ -174,8 +174,8 @@ object DataModule1: TDataModule1
     Active = True
     IndexFieldNames = 'ID'
     Connection = FDConnection1
-    UpdateOptions.UpdateTableName = 'IMAGES'
-    TableName = 'IMAGES'
+    UpdateOptions.UpdateTableName = 'images'
+    TableName = 'images'
     Left = 224
     Top = 144
     object FDTable5ID: TIntegerField
@@ -197,8 +197,7 @@ object DataModule1: TDataModule1
   object FDQuery1: TFDQuery
     Connection = FDConnection1
     SQL.Strings = (
-      'select "database", title, name, date from'
-      ' dbname inner join article on dbname.dbnum = article.dbnum'
+      'select dbnum,number,title,date from article'
       ' where number = 1 order by date;')
     Left = 160
     Top = 144

diff --git a/Unit1.pas b/Unit1.pas
index 1548ed1..15413ce 100644 (file)
--- a/Unit1.pas
+++ b/Unit1.pas
@@ -46,8 +46,8 @@ type
     FDTable5ID: TIntegerField;
     FDTable5NAME: TWideStringField;
     FDTable5SOURCE: TBlobField;
-    FDQuery1: TFDQuery;
     FDTable1DATABASE: TWideStringField;
+    FDQuery1: TFDQuery;
   private
     { Private \90é\8c¾ }
   public

diff --git a/WebModuleUnit1.dfm b/WebModuleUnit1.dfm
index e9a5ba8..46d836f 100644 (file)
--- a/WebModuleUnit1.dfm
+++ b/WebModuleUnit1.dfm
@@ -1922,7 +1922,6 @@ object TWebModule1: TTWebModule1
       '<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.FDQuery1
     OnHTMLTag = tiHTMLTag
     Left = 48
     Top = 320

diff --git a/WebModuleUnit1.pas b/WebModuleUnit1.pas
index d93f981..3736a31 100644 (file)
--- a/WebModuleUnit1.pas
+++ b/WebModuleUnit1.pas
@@ -132,9 +132,9 @@ procedure TTWebModule1.adheadHTMLTag(Sender: TObject; Tag: TTag;
   const TagString: string; TagParams: TStrings; var ReplaceText: string);
 begin
   if TagString = 'pr' then
-    ReplaceText:=promotion
-  else if (TagString = 'mente') and (DataModule1.FDTable3.FieldByName('mente')
-    .AsBoolean = true) then
+    ReplaceText := promotion
+  else if (TagString = 'mente') and
+    (DataModule1.FDTable3.FieldByName('mente').AsBoolean = true) then
     ReplaceText := 'checked'
   else if TagString = 'password' then
     ReplaceText := Request.CookieFields.Values['user'];
@@ -262,7 +262,7 @@ procedure TTWebModule1.helpHTMLTag(Sender: TObject; Tag: TTag;
   const TagString: string; TagParams: TStrings; var ReplaceText: string);
 begin
   if TagString = 'pr' then
-    ReplaceText:=promotion;
+    ReplaceText := promotion;
 end;
 
 procedure TTWebModule1.indexHTMLTag(Sender: TObject; Tag: TTag;
@@ -348,14 +348,14 @@ procedure TTWebModule1.loginHTMLTag(Sender: TObject; Tag: TTag;
   const TagString: string; TagParams: TStrings; var ReplaceText: string);
 begin
   if TagString = 'pr' then
-    ReplaceText:=promotion;
+    ReplaceText := promotion;
 end;
 
 procedure TTWebModule1.masterHTMLTag(Sender: TObject; Tag: TTag;
   const TagString: string; TagParams: TStrings; var ReplaceText: string);
 begin
   if TagString = 'pr' then
-    Replacetext:=promotion
+    ReplaceText := promotion
   else if TagString = 'request' then
     with DataModule1.FDTable4 do
     begin
@@ -461,7 +461,7 @@ var
 
 begin
   if TagString = 'pr' then
-    ReplaceText:=promotion
+    ReplaceText := promotion
   else if (Request.MethodType = mtPost) and (TagString = 'items') then
   begin
     if Request.ContentFields.Values['type'] = 'OR' then
@@ -504,20 +504,23 @@ procedure TTWebModule1.tiHTMLTag(Sender: TObject; Tag: TTag;
 begin
   if TagString = 'count' then
   begin
-    DataModule1.FDTable1.Locate('database',
-      DataModule1.FDQuery1.FieldByName('database').AsString);
+    DataModule1.FDTable1.Locate('dbnum',
+      DataModule1.FDQuery1.FieldByName('dbnum').AsInteger);
     ReplaceText := DataModule1.FDTable2.RecordCount.ToString;
-  end;
+  end
+  else if TagString = 'database' then
+    ReplaceText := DataModule1.FDTable1.Lookup('dbnum',
+      DataModule1.FDQuery1.FieldByName('dbnum').AsInteger, 'database');
 end;
 
 procedure TTWebModule1.titleHTMLTag(Sender: TObject; Tag: TTag;
   const TagString: string; TagParams: TStrings; var ReplaceText: string);
 begin
   if TagString = 'pr' then
-    ReplaceText:=promotion
+    ReplaceText := promotion
   else if TagString = 'js' then
     ReplaceText := detail(TagString, TagParams.Values['id'])
-  else
+  else if TagString = 'main' then
     with DataModule1.FDQuery1 do
     begin
       Open;
@@ -834,7 +837,7 @@ begin
     Name := 'user';
     Value := Request.ContentFields.Values['password'];
     Expires := Now + 14;
-  //  Secure := true;
+    Secure := true;
   end;
   i := DataModule1.FDTable1.Lookup('database',
     Request.ContentFields.Values['record'], 'dbnum');