大手術の前に

diff --git a/Unit1.pas b/Unit1.pas
index f09424e..fe7e6fb 100644 (file)
--- a/Unit1.pas
+++ b/Unit1.pas
@@ -65,7 +65,7 @@ type
     procedure custView(id: integer; out Data: TJSONObject);
     procedure deleteMagazine(id: integer);
     procedure deleteNumber(id, num: integer);
-    procedure deleteWriter(id: integer);
+    procedure deleteWriter(var id: integer);
     procedure getView(id, num: integer; out Data: TJSONObject); overload;
     procedure getView(id: integer; out Data: TJSONObject); overload;
     procedure viewList(id: integer; out Data: TJSONObject);
@@ -226,9 +226,10 @@ procedure TDataModule1.deleteMagazine(id: integer);
   end;
 
 begin
-  main(mag);
+  if mag.Locate('magId',id) = true then
+    mag.Delete;
   main(news);
-//    main('database');
+//  main(database);
   main(indexTable);
 end;
 
@@ -254,15 +255,16 @@ begin
     indexTable.Delete;
 end;
 
-procedure TDataModule1.deleteWriter(id: integer);
+procedure TDataModule1.deleteWriter(var id: integer);
 begin
   if writer.Locate('writerid',id) = true then
     writer.Delete;
-  while maglist.Locate('writerid',id) = true do
+  while magList.Locate('writerid',id) = true do
   begin
     deleteMagazine(magList.FieldByName('magid').AsInteger);
     magList.Delete;
   end;
+  id:=0;
 end;
 
 function TDataModule1.existsMail(mail: string): Boolean;
@@ -490,7 +492,10 @@ begin
     js.AddPair('count',v);
     v:=magList.Lookup('magId',i,'writerId');
     v:=writer.Lookup('writerId',v,'writer');
-    js.AddPair('writer',v);
+    if VarIsNull(v) = true then
+      js.AddPair('writer',TJSONFalse.Create)
+    else
+      js.AddPair('writer',v);
     if (id = 0)or(indexTable.Locate('readerId;magid',VarArrayOf([id,i])) = false) then
       js.AddPair('fun',TJSONFalse.Create)
     else

diff --git a/tool/Unit1.dfm b/tool/Unit1.dfm
index b510429..50027aa 100644 (file)
--- a/tool/Unit1.dfm
+++ b/tool/Unit1.dfm
@@ -35,22 +35,13 @@ object Form2: TForm2
     Align = alRight
     Caption = 'Panel1'
     TabOrder = 1
-    object Button1: TButton
-      Left = 56
-      Top = 136
-      Width = 75
-      Height = 25
-      Caption = 'Button1'
-      TabOrder = 0
-      OnClick = Button1Click
-    end
     object Button2: TButton
       Left = 54
-      Top = 184
+      Top = 138
       Width = 75
       Height = 25
-      Caption = 'Button2'
-      TabOrder = 1
+      Caption = 'execute'
+      TabOrder = 0
       OnClick = Button2Click
     end
     object Button3: TButton
@@ -58,8 +49,8 @@ object Form2: TForm2
       Top = 32
       Width = 75
       Height = 25
-      Caption = 'Button3'
-      TabOrder = 2
+      Caption = 'clear'
+      TabOrder = 1
       OnClick = Button3Click
     end
     object Edit1: TEdit
@@ -67,7 +58,16 @@ object Form2: TForm2
       Top = 248
       Width = 121
       Height = 21
+      TabOrder = 2
+    end
+    object Button4: TButton
+      Left = 56
+      Top = 79
+      Width = 75
+      Height = 25
+      Caption = 'refresh'
       TabOrder = 3
+      OnClick = Button4Click
     end
   end
   object NewstableConnection: TFDConnection

diff --git a/tool/Unit1.pas b/tool/Unit1.pas
index 528ccb7..6321e4b 100644 (file)
--- a/tool/Unit1.pas
+++ b/tool/Unit1.pas
@@ -25,7 +25,6 @@ type
     FDTable1comment: TWideStringField;
     FDTable1day: TDateField;
     Panel1: TPanel;
-    Button1: TButton;
     FDQuery1: TFDQuery;
     FDGUIxWaitCursor1: TFDGUIxWaitCursor;
     FDTable1lastDay: TDateField;
@@ -44,9 +43,10 @@ type
     BindSourceDB1: TBindSourceDB;
     BindingsList1: TBindingsList;
     LinkControlToField1: TLinkControlToField;
-    procedure Button1Click(Sender: TObject);
+    Button4: TButton;
     procedure Button2Click(Sender: TObject);
     procedure Button3Click(Sender: TObject);
+    procedure Button4Click(Sender: TObject);
   private
     { Private \90é\8c¾ }
   public
@@ -60,7 +60,7 @@ implementation
 
 {$R *.dfm}
 
-procedure TForm2.Button1Click(Sender: TObject);
+procedure TForm2.Button2Click(Sender: TObject);
 var
   i, j: Integer;
 begin
@@ -69,20 +69,11 @@ begin
   for i := 1 to 100 do
   begin
     FDTable1.AppendRecord([j,'MG'+j.ToString,'jiro'+j.ToString,'this is comment',Date,Date,true]);
+    FDTable2.AppendRecord([1,FDTable1.FieldByName('magid').AsInteger]);
     inc(j);
   end;
-end;
-
-procedure TForm2.Button2Click(Sender: TObject);
-begin
   if (FDTable3.Bof = true)and(FDTable3.Eof = true) then
     FDTable3.AppendRecord([1,'masasi','mail','pass']);
-  FDTable1.First;
-  while FDTable1.Eof = false do
-  begin
-    FDTable2.AppendRecord([1,FDTable1.FieldByName('magid').AsInteger]);
-    FDTable1.Next;
-  end;
 end;
 
 procedure TForm2.Button3Click(Sender: TObject);
@@ -93,4 +84,11 @@ begin
     FDTable2.Delete;
 end;
 
+procedure TForm2.Button4Click(Sender: TObject);
+begin
+  FDTable1.Refresh;
+  FDTable2.Refresh;
+  FDTable3.Refresh;
+end;
+
 end.