COMMENT field is exported to eQSL server

2024-09-21 10:27:17 +00:00 · 2014-01-03 19:11:14 +01:00 · 2014-01-03 19:11:14 +01:00 · 00e7819db0
commit 00e7819db0
parent 5228906fe8
4 changed files with 37 additions and 28 deletions
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@ -4,12 +4,15 @@ Legend:
  - bugfix
 --------------------

-1.6.2
+1.7.0
  + improved QSL managers import, should be faster a bit
  + in Rotor Control 'Long Path' button added (Darek, SP2MKI)
+  + COMMENT field is exported to eQSL server
  - LoTW QSL RCVD was not imported when ADIF didn't include LOTW_QSLRDATE value  
  - CONTESTIA mode was saved as CONSTESTI (increased max length of mode to 10 characters) 
  - ReverseBeacon support in gray line didn't work - fixed 
+  - after click to OK button in Preferences, bandmap stopped deleting old spots - fixed
+

 1.6.1
  + 630M band added
--- a/src/feQSLUpload.lfm
+++ b/src/feQSLUpload.lfm
@ -1,14 +1,14 @@
 object frmeQSLUpload: TfrmeQSLUpload
  Left = 509
  Height = 481
-  Top = 267
+  Top = 265
  Width = 575
  Caption = 'Upload QSO to eQSL.cc'
  ClientHeight = 481
  ClientWidth = 575
  OnClose = FormClose
  OnShow = FormShow
-  LCLVersion = '0.9.30'
+  LCLVersion = '0.9.30.2'
  object grbWebExport: TGroupBox
    Left = 0
    Height = 64
@ -20,17 +20,17 @@ object frmeQSLUpload: TfrmeQSLUpload
    TabOrder = 0
    object rbWebExportAll: TRadioButton
      Left = 14
-      Height = 24
+      Height = 22
      Top = 6
-      Width = 134
+      Width = 113
      Caption = ' Export all QSOs'
      TabOrder = 0
    end
    object rbWebExportNotExported: TRadioButton
      Left = 14
-      Height = 24
+      Height = 22
      Top = 31
-      Width = 361
+      Width = 303
      Caption = 'Export only QSOs which have never been uploaded'
      Checked = True
      TabOrder = 1
@ -48,15 +48,15 @@ object frmeQSLUpload: TfrmeQSLUpload
    TabOrder = 1
    object Label1: TLabel
      Left = 14
-      Height = 18
+      Height = 16
      Top = 14
-      Width = 104
+      Width = 87
      Caption = 'QTH Nickname:'
      ParentColor = False
    end
    object edtQTH: TEdit
      Left = 174
-      Height = 27
+      Height = 25
      Top = 9
      Width = 174
      TabOrder = 0
@ -69,12 +69,12 @@ object frmeQSLUpload: TfrmeQSLUpload
    Width = 575
    Align = alClient
    Caption = ' Upload '
-    ClientHeight = 342
+    ClientHeight = 344
    ClientWidth = 571
    TabOrder = 2
    object mStat: TMemo
      Left = 0
-      Height = 304
+      Height = 306
      Top = 0
      Width = 571
      Align = alClient
@ -88,7 +88,7 @@ object frmeQSLUpload: TfrmeQSLUpload
    object pnlUpload: TPanel
      Left = 0
      Height = 38
-      Top = 304
+      Top = 306
      Width = 571
      Align = alBottom
      BevelOuter = bvNone
--- a/src/feQSLUpload.lrs
+++ b/src/feQSLUpload.lrs
@ -2,27 +2,27 @@

 LazarusResources.Add('TfrmeQSLUpload','FORMDATA',[
  'TPF0'#14'TfrmeQSLUpload'#13'frmeQSLUpload'#4'Left'#3#253#1#6'Height'#3#225#1
-  +#3'Top'#3#11#1#5'Width'#3'?'#2#7'Caption'#6#21'Upload QSO to eQSL.cc'#12'Cli'
-  +'entHeight'#3#225#1#11'ClientWidth'#3'?'#2#7'OnClose'#7#9'FormClose'#6'OnSho'
-  +'w'#7#8'FormShow'#10'LCLVersion'#6#6'0.9.30'#0#9'TGroupBox'#12'grbWebExport'
-  +#4'Left'#2#0#6'Height'#2'@'#3'Top'#2#0#5'Width'#3'?'#2#5'Align'#7#5'alTop'#12
+  +#3'Top'#3#9#1#5'Width'#3'?'#2#7'Caption'#6#21'Upload QSO to eQSL.cc'#12'Clie'
+  +'ntHeight'#3#225#1#11'ClientWidth'#3'?'#2#7'OnClose'#7#9'FormClose'#6'OnShow'
+  +#7#8'FormShow'#10'LCLVersion'#6#8'0.9.30.2'#0#9'TGroupBox'#12'grbWebExport'#4
+  +'Left'#2#0#6'Height'#2'@'#3'Top'#2#0#5'Width'#3'?'#2#5'Align'#7#5'alTop'#12
  +'ClientHeight'#2'<'#11'ClientWidth'#3';'#2#8'TabOrder'#2#0#0#12'TRadioButton'
-  +#14'rbWebExportAll'#4'Left'#2#14#6'Height'#2#24#3'Top'#2#6#5'Width'#3#134#0#7
-  +'Caption'#6#16' Export all QSOs'#8'TabOrder'#2#0#0#0#12'TRadioButton'#22'rbW'
-  +'ebExportNotExported'#4'Left'#2#14#6'Height'#2#24#3'Top'#2#31#5'Width'#3'i'#1
+  +#14'rbWebExportAll'#4'Left'#2#14#6'Height'#2#22#3'Top'#2#6#5'Width'#2'q'#7'C'
+  +'aption'#6#16' Export all QSOs'#8'TabOrder'#2#0#0#0#12'TRadioButton'#22'rbWe'
+  +'bExportNotExported'#4'Left'#2#14#6'Height'#2#22#3'Top'#2#31#5'Width'#3'/'#1
  +#7'Caption'#6'/Export only QSOs which have never been uploaded'#7'Checked'#9
  +#8'TabOrder'#2#1#7'TabStop'#9#0#0#0#9'TGroupBox'#9'GroupBox1'#4'Left'#2#0#6
  +'Height'#2'8'#3'Top'#2'@'#5'Width'#3'?'#2#5'Align'#7#5'alTop'#12'ClientHeigh'
  +'t'#2'4'#11'ClientWidth'#3';'#2#8'TabOrder'#2#1#0#6'TLabel'#6'Label1'#4'Left'
-  +#2#14#6'Height'#2#18#3'Top'#2#14#5'Width'#2'h'#7'Caption'#6#13'QTH Nickname:'
-  +#11'ParentColor'#8#0#0#5'TEdit'#6'edtQTH'#4'Left'#3#174#0#6'Height'#2#27#3'T'
+  +#2#14#6'Height'#2#16#3'Top'#2#14#5'Width'#2'W'#7'Caption'#6#13'QTH Nickname:'
+  +#11'ParentColor'#8#0#0#5'TEdit'#6'edtQTH'#4'Left'#3#174#0#6'Height'#2#25#3'T'
  +'op'#2#9#5'Width'#3#174#0#8'TabOrder'#2#0#0#0#0#9'TGroupBox'#9'GroupBox6'#4
  +'Left'#2#0#6'Height'#3'i'#1#3'Top'#2'x'#5'Width'#3'?'#2#5'Align'#7#8'alClien'
-  +'t'#7'Caption'#6#8' Upload '#12'ClientHeight'#3'V'#1#11'ClientWidth'#3';'#2#8
-  +'TabOrder'#2#2#0#5'TMemo'#5'mStat'#4'Left'#2#0#6'Height'#3'0'#1#3'Top'#2#0#5
+  +'t'#7'Caption'#6#8' Upload '#12'ClientHeight'#3'X'#1#11'ClientWidth'#3';'#2#8
+  +'TabOrder'#2#2#0#5'TMemo'#5'mStat'#4'Left'#2#0#6'Height'#3'2'#1#3'Top'#2#0#5
  +'Width'#3';'#2#5'Align'#7#8'alClient'#13'Lines.Strings'#1#6#0#0#8'ReadOnly'#9
  +#10'ScrollBars'#7#10'ssAutoBoth'#8'TabOrder'#2#0#0#0#6'TPanel'#9'pnlUpload'#4
-  +'Left'#2#0#6'Height'#2'&'#3'Top'#3'0'#1#5'Width'#3';'#2#5'Align'#7#8'alBotto'
+  +'Left'#2#0#6'Height'#2'&'#3'Top'#3'2'#1#5'Width'#3';'#2#5'Align'#7#8'alBotto'
  +'m'#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'&'#11'ClientWidth'#3';'#2#8
  +'TabOrder'#2#1#0#7'TButton'#9'btnUpload'#4'Left'#3#158#1#6'Height'#2#25#3'To'
  +'p'#2#11#5'Width'#2'F'#7'Anchors'#11#5'akTop'#7'akRight'#0#7'Caption'#6#6'Up'
--- a/src/feQSLUpload.pas
+++ b/src/feQSLUpload.pas
@ -86,13 +86,13 @@ begin
  dmData.Q.Close;
  if dmData.trQ.Active then dmData.trQ.Rollback;
  if rbWebExportNotExported.Checked then
-    dmData.Q.SQL.Text := 'select id_cqrlog_main,qsodate,time_on,callsign,mode,band,freq,rst_s,rst_r '+
+    dmData.Q.SQL.Text := 'select id_cqrlog_main,qsodate,time_on,callsign,mode,band,freq,rst_s,rst_r,remarks '+
                         'from cqrlog_main where eqsl_qslsdate is null'
  else begin
    if dmData.IsFilter then
      dmData.Q.SQL.Text := dmData.qCQRLOG.SQL.Text
    else
-      dmData.Q.SQL.Text := 'select id_cqrlog_main,qsodate,time_on,callsign,mode,band,freq,rst_s,rst_r '+
+      dmData.Q.SQL.Text := 'select id_cqrlog_main,qsodate,time_on,callsign,mode,band,freq,rst_s,rst_r,remarks '+
                           'from cqrlog_main'
  end;
  dmData.Q.Open;
@ -122,7 +122,7 @@ begin
    Writeln(f);
    Writeln(f,'<EQSL_USER'+dmUtils.StringToADIF(cqrini.ReadString('LoTW','eQSLName','')));
    Writeln(f,'<EQSL_PSWD'+dmUtils.StringToADIF(cqrini.ReadString('LoTW','eQSLPass','')));
-    Writeln(f, '<EOH>');
+    Writeln(f,'<EOH>');
    while not dmData.Q.Eof do
    begin
      lblInfo.Caption := 'Exporting QSO nr. ' + IntToStr(Nr);
@ -154,6 +154,12 @@ begin
      tmp := '<RST_RCVD' + dmUtils.StringToADIF(dmData.Q.FieldByName('rst_r').AsString);
      Writeln(f,tmp);

+      if (dmData.Q.FieldByName('remarks').AsString<>'') then
+      begin
+        tmp := '<COMMENT' + dmUtils.StringToADIF(dmData.Q.FieldByName('remarks').AsString);
+        Writeln(f,tmp)
+      end;
+
      tmp := '<APP_EQSL_QTH_NICKNAME'+dmUtils.StringToADIF(edtQTH.Text);
      Writeln(f,tmp);