aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Misc fixes

Browse source 
ucfirst(setCode): requires oracle re-run
reorder columns
rename the “short name“ column as “set code“
ensure proper casting for releaseDate and sortKey fields (refs 00a5ed0)
This commit is contained in:
Fabio Bas 2014-12-05 08:48:33 +01:00
parent 0ba351c955
commit 9cc8d8b86c
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cockatrice/src/setsmodel.cpp
View file

@ -25,11 +25,11 @@ QVariant SetsModel::data(const QModelIndex &index, int role) const
CardSet *set = sets[index.row()]; CardSet *set = sets[index.row()];
switch (index.column()) { switch (index.column()) {
case SortKeyCol: return set->getSortKey(); case SortKeyCol: return QString("%1").arg(set->getSortKey(), 4, 10, QChar('0'));
case SetTypeCol: return set->getSetType(); case SetTypeCol: return set->getSetType();
case ShortNameCol: return set->getShortName(); case ShortNameCol: return set->getShortName();
case LongNameCol: return set->getLongName(); case LongNameCol: return set->getLongName();
case ReleaseDateCol: return set->getReleaseDate(); case ReleaseDateCol: return set->getReleaseDate().toString(Qt::ISODate);
default: return QVariant(); default: return QVariant();
} }
} }
@ -41,7 +41,7 @@ QVariant SetsModel::headerData(int section, Qt::Orientation orientation, int rol
switch (section) { switch (section) {
case SortKeyCol: return tr("Key"); case SortKeyCol: return tr("Key");
case SetTypeCol: return tr("Set type"); case SetTypeCol: return tr("Set type");
case ShortNameCol: return tr("Short name"); case ShortNameCol: return tr("Set code");
case LongNameCol: return tr("Long name"); case LongNameCol: return tr("Long name");
case ReleaseDateCol: return tr("Release date"); case ReleaseDateCol: return tr("Release date");
default: return QVariant(); default: return QVariant();

2
cockatrice/src/setsmodel.h
View file

@ -24,7 +24,7 @@ private:
static const int NUM_COLS = 5; static const int NUM_COLS = 5;
SetList sets; SetList sets;
public: public:
enum SetsColumns { SortKeyCol, SetTypeCol, ShortNameCol, LongNameCol, ReleaseDateCol }; enum SetsColumns { SortKeyCol, LongNameCol, ShortNameCol, SetTypeCol, ReleaseDateCol };
SetsModel(CardDatabase *_db, QObject *parent = 0); SetsModel(CardDatabase *_db, QObject *parent = 0);
~SetsModel(); ~SetsModel();

5
oracle/src/oracleimporter.cpp
View file

@ -40,6 +40,9 @@ bool OracleImporter::readSetsFromByteArray(const QByteArray &data)
editionLong = map.value("name").toString(); editionLong = map.value("name").toString();
editionCards = map.value("cards"); editionCards = map.value("cards");
setType = map.value("type").toString(); setType = map.value("type").toString();
// capitalize set type
if(setType.length() > 0)
setType[0] = setType[0].toUpper();
releaseDate = map.value("releaseDate").toDate(); releaseDate = map.value("releaseDate").toDate();
// core and expansion sets are marked to be imported by default // core and expansion sets are marked to be imported by default
@ -236,7 +239,7 @@ int OracleImporter::startImport()
const SetToDownload * curSet; const SetToDownload * curSet;
// add an empty set for tokens // add an empty set for tokens
CardSet *tokenSet = new CardSet(TOKENS_SETNAME, tr("Dummy set containing tokens"), "tokens"); CardSet *tokenSet = new CardSet(TOKENS_SETNAME, tr("Dummy set containing tokens"), "Tokens");
sets.insert(TOKENS_SETNAME, tokenSet); sets.insert(TOKENS_SETNAME, tokenSet);
while (it.hasNext()) while (it.hasNext())