Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Qt5: Fixed the code that initializes the 'NEXUS_STATIONS' table in rddbmgr(8). #646

Open
wants to merge 1 commit into
base: qt5
Choose a base branch
from
Open

Qt5: Fixed the code that initializes the 'NEXUS_STATIONS' table in rddbmgr(8). #646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21258,3 +21258,7 @@
2021-03-08 Fred Gleason <[email protected]>
* Fixed a regression rdxport.cgi that caused early termination
of CGI processes.
2021-03-18 Patrick Linstruth <[email protected]>
* Fixed the code that initializes the 'NEXUS_STATIONS' table in
rddbmgr(8).
* Fixed a regression in rdxport.cgi that broke the build.
22 changes: 13 additions & 9 deletions utils/rddbmgr/updateschema.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9805,15 +9805,19 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg)
return false;
}

// q=new RDSqlQuery("select NAME from SERVICES",false);
// while(q->next()) {
// sql=QString("insert into NEXUS_STATIONS set ")+
// "RD_SERVICE=\""+RDEscapeString(q->value(0).toString())+"\"";
// if(!RDSqlQuery::apply(sql,err_msg)) {
// return false;
// }
// }
// delete q;
q=new RDSqlQuery("select NAME from SERVICES",false);
while(q->next()) {
sql=QString("insert into NEXUS_STATIONS set ")+
"STATION=\"\","+
"CATEGORY=\"\","+
"RD_GROUP_NAME=\"\","+
"RD_SCHED_CODE=\"\","+
"RD_SERVICE=\""+RDEscapeString(q->value(0).toString())+"\"";
if(!RDSqlQuery::apply(sql,err_msg)) {
return false;
}
}
delete q;

sql=QString("insert into IMPORT_TEMPLATES set ")+
"NAME='MusicMaster Nexus',"+
Expand Down
2 changes: 1 addition & 1 deletion web/rdxport/rdxport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ void Xport::XmlExit(const QString &str,int code,const QString &srcfile,
RDXMLResult(str.toUtf8(),code,err);
}
#else
RDXMLResult(str,code,err);
RDXMLResult(str.toUtf8(),code,err);
#endif // RDXPORT_DEBUG
exit(0);
}
Expand Down