Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-06-01 16:42:34 +02:00
Code Issues Projects Releases Wiki Activity

2018-06-13 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in rddbmgr(8) that caused incorrect version strings
	to be generated when displaying current database status.
This commit is contained in:
Fred Gleason 2018-06-13 12:26:46 +00:00
parent 0b96766698
commit a96be157a2
2 changed files with 88 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -17062,3 +17062,6 @@
* Modified rdpanel(1) to enable metering explicitly.
2018-06-12 Fred Gleason <fredg@paravelsystems.com>
* Incremented the package version to v2.19.2vlog04.
2018-06-13 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rddbmgr(8) that caused incorrect version strings
to be generated when displaying current database status.

94
utils/rddbmgr/schemamap.cpp
View File

@ -18,14 +18,90 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <qmap.h>
#include <qstringlist.h>
#include "rddbmgr.h"
class VersionString : public QString
{
public:
VersionString();
VersionString(const char *str);
int major() const;
int minor() const;
int point() const;
bool operator<(const VersionString &rhs) const;
private:
int ver_major;
int ver_minor;
int ver_point;
};
VersionString::VersionString()
: QString()
{
ver_major=0;
ver_minor=0;
ver_point=0;
}
VersionString::VersionString(const char *str)
: QString(str)
{
QStringList f0=f0.split(".",str);
ver_major=f0[0].toInt();
ver_minor=f0[1].toInt();
ver_point=f0[2].toInt();
}
int VersionString::major() const
{
return ver_major;
}
int VersionString::minor() const
{
return ver_minor;
}
int VersionString::point() const
{
return ver_point;
}
bool VersionString::operator<(const VersionString &rhs) const
{
if(major()<rhs.major()) {
return true;
}
if(major()>rhs.major()) {
return false;
}
if(minor()<rhs.minor()) {
return true;
}
if(minor()>rhs.minor()) {
return false;
}
if(point()<rhs.point()) {
return true;
}
return false;
}
//
// Version -> Schema Map
//
std::map<QString,int> global_version_map;
QMap<VersionString,int> global_version_map;
void MainObject::InitializeSchemaMap() {
global_version_map["1.0"]=159;
@ -85,11 +161,11 @@ int MainObject::GetVersionSchema(const QString &ver) const
//
// Lookup Schema
//
if(global_version_map.count(f0[0]+"."+f0[1])==0) {
if(global_version_map.count(VersionString(f0[0]+"."+f0[1]))==0) {
return 0;
}
return global_version_map[f0[0]+"."+f0[1]];
return global_version_map[VersionString(f0[0]+"."+f0[1])];
}
@ -97,16 +173,16 @@ QString MainObject::GetSchemaVersion(int schema) const
{
QString prev_version="_preproduction";
for(std::map<QString,int>::const_iterator it=global_version_map.begin();
for(QMap<VersionString,int>::const_iterator it=global_version_map.begin();
it!=global_version_map.end();it++) {
if(it->second==schema) {
return "v"+it->first+".x";
if(it.data()==schema) {
return "v"+it.key()+".x";
}
if(it->second>schema) {
if(it.data()>schema) {
return tr("between")+" v"+prev_version+".x "+tr("and")+
" v"+it->first+".x";
" v"+it.key()+".x";
}
prev_version=it->first;
prev_version=it.key();
}
return QString("after")+" v"+prev_version+".x";
}