2019-08-28 Fred Gleason <fredg@paravelsystems.com>

* Added the '%l' wildcard (unpadded month 1-12) to the filepath
	wildcards.
This commit is contained in:
Fred Gleason 2019-08-28 18:01:35 -04:00
parent e655f8a597
commit ac68d3c030
3 changed files with 12 additions and 1 deletions

View File

@ -19042,3 +19042,6 @@
2019-08-29 Patrick Linstruth <patrick@deltecent.com> 2019-08-29 Patrick Linstruth <patrick@deltecent.com>
* Modified caed(8) to skip JACK startup, rather than crash, if * Modified caed(8) to skip JACK startup, rather than crash, if
no command line is specified in rdadmin(1). no command line is specified in rdadmin(1).
2019-08-28 Fred Gleason <fredg@paravelsystems.com>
* Added the '%l' wildcard (unpadded month 1-12) to the filepath
wildcards.

View File

@ -239,7 +239,7 @@
<term><userinput>l</userinput></term> <term><userinput>l</userinput></term>
<listitem> <listitem>
<para> <para>
[unassigned] Month, unpadded (1-12)
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>

View File

@ -114,6 +114,10 @@ QString RDDateDecode(QString str,const QDate &date,RDStation *station,
field=QString().sprintf("%03d",date.dayOfYear()); field=QString().sprintf("%03d",date.dayOfYear());
break; break;
case 'l': // Unpadded Month (1 - 12)
field=QString().sprintf("%d",date.month());
break;
case 'm': // Month (01 - 12) case 'm': // Month (01 - 12)
field=QString().sprintf("%02d",date.month()); field=QString().sprintf("%02d",date.month());
break; break;
@ -292,6 +296,10 @@ QString RDDateTimeDecode(QString str,const QDateTime &datetime,
field=QString().sprintf("%2d",datetime.time().hour()); field=QString().sprintf("%2d",datetime.time().hour());
break; break;
case 'l': // Unpadded Month (1 - 12)
field=QString().sprintf("%d",datetime.date().month());
break;
case 'M': // Minute, zero padded case 'M': // Minute, zero padded
field=QString().sprintf("%02d",datetime.time().minute()); field=QString().sprintf("%02d",datetime.time().minute());
break; break;