2020-01-27 Fred Gleason <fredg@paravelsystems.com>

* Fixed a bug in 'datdecode_test' that made it impossible to
	test empty strings.
This commit is contained in:
Fred Gleason 2020-01-27 17:37:41 -05:00
parent 0bc1268b00
commit 8f5716eaa9
2 changed files with 9 additions and 6 deletions

View File

@ -19426,3 +19426,6 @@
2020-01-27 Fred Gleason <fredg@paravelsystems.com> 2020-01-27 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in 'RDCmdSwitch' that caused empty argument values * Fixed a bug in 'RDCmdSwitch' that caused empty argument values
to be returned as a null QString. to be returned as a null QString.
2020-01-27 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in 'datdecode_test' that made it impossible to
test empty strings.

View File

@ -33,8 +33,8 @@
MainObject::MainObject(QObject *parent) MainObject::MainObject(QObject *parent)
:QObject(parent) :QObject(parent)
{ {
QString date=""; QString date;
QString datetime=""; QString datetime;
QString service=""; QString service="";
int schema=0; int schema=0;
@ -63,12 +63,12 @@ MainObject::MainObject(QObject *parent)
exit(256); exit(256);
} }
} }
if((!date.isEmpty())&&(!datetime.isEmpty())) { if((!date.isNull())&&(!datetime.isNull())) {
fprintf(stderr, fprintf(stderr,
"datedecode_test: --date and --datetime are mutually exclusive\n"); "datedecode_test: --date and --datetime are mutually exclusive\n");
exit(256); exit(256);
} }
if(date.isEmpty()&&datetime.isEmpty()) { if(date.isNull()&&datetime.isNull()) {
fprintf(stderr, fprintf(stderr,
"datedecode_test: you must specify either --date or --datetime\n"); "datedecode_test: you must specify either --date or --datetime\n");
exit(256); exit(256);
@ -94,12 +94,12 @@ MainObject::MainObject(QObject *parent)
// //
// Process Code // Process Code
// //
if(!date.isEmpty()) { if(!date.isNull()) {
printf("%s\n", printf("%s\n",
(const char *)RDDateDecode(date,QDate::currentDate(),station,config, (const char *)RDDateDecode(date,QDate::currentDate(),station,config,
service)); service));
} }
if(!datetime.isEmpty()) { if(!datetime.isNull()) {
printf("%s\n",(const char *)RDDateTimeDecode(datetime, printf("%s\n",(const char *)RDDateTimeDecode(datetime,
QDateTime(QDate::currentDate(),QTime::currentTime()),station, QDateTime(QDate::currentDate(),QTime::currentTime()),station,
config,service)); config,service));