Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
ce56e5f1
Commit
ce56e5f1
authored
Apr 02, 2016
by
Fabio Bas
Browse files
CardDb: be permissive when loading xmls
parent
f217551f
Changes
1
Hide whitespace changes
Inline
Side-by-side
cockatrice/src/carddatabase.cpp
View file @
ce56e5f1
...
@@ -463,6 +463,10 @@ void CardDatabase::loadSetsFromXml(QXmlStreamReader &xml)
...
@@ -463,6 +463,10 @@ void CardDatabase::loadSetsFromXml(QXmlStreamReader &xml)
setType
=
xml
.
readElementText
();
setType
=
xml
.
readElementText
();
else
if
(
xml
.
name
()
==
"releasedate"
)
else
if
(
xml
.
name
()
==
"releasedate"
)
releaseDate
=
QDate
::
fromString
(
xml
.
readElementText
(),
Qt
::
ISODate
);
releaseDate
=
QDate
::
fromString
(
xml
.
readElementText
(),
Qt
::
ISODate
);
else
if
(
xml
.
name
()
!=
""
)
{
qDebug
()
<<
"[XMLReader] Unknown set property"
<<
xml
.
name
()
<<
", trying to continue anyway"
;
xml
.
skipCurrentElement
();
}
}
}
CardSet
*
newSet
=
getSet
(
shortName
);
CardSet
*
newSet
=
getSet
(
shortName
);
...
@@ -530,6 +534,10 @@ void CardDatabase::loadCardsFromXml(QXmlStreamReader &xml)
...
@@ -530,6 +534,10 @@ void CardDatabase::loadCardsFromXml(QXmlStreamReader &xml)
loyalty
=
xml
.
readElementText
().
toInt
();
loyalty
=
xml
.
readElementText
().
toInt
();
else
if
(
xml
.
name
()
==
"token"
)
else
if
(
xml
.
name
()
==
"token"
)
isToken
=
xml
.
readElementText
().
toInt
();
isToken
=
xml
.
readElementText
().
toInt
();
else
if
(
xml
.
name
()
!=
""
)
{
qDebug
()
<<
"[XMLReader] Unknown card property"
<<
xml
.
name
()
<<
", trying to continue anyway"
;
xml
.
skipCurrentElement
();
}
}
}
addCard
(
new
CardInfo
(
name
,
isToken
,
manacost
,
cmc
,
type
,
pt
,
text
,
colors
,
relatedCards
,
reverseRelatedCards
,
upsideDown
,
loyalty
,
cipt
,
tableRow
,
sets
,
customPicURLs
,
muids
));
addCard
(
new
CardInfo
(
name
,
isToken
,
manacost
,
cmc
,
type
,
pt
,
text
,
colors
,
relatedCards
,
reverseRelatedCards
,
upsideDown
,
loyalty
,
cipt
,
tableRow
,
sets
,
customPicURLs
,
muids
));
...
@@ -559,7 +567,7 @@ LoadStatus CardDatabase::loadFromFile(const QString &fileName)
...
@@ -559,7 +567,7 @@ LoadStatus CardDatabase::loadFromFile(const QString &fileName)
return
Invalid
;
return
Invalid
;
int
version
=
xml
.
attributes
().
value
(
"version"
).
toString
().
toInt
();
int
version
=
xml
.
attributes
().
value
(
"version"
).
toString
().
toInt
();
if
(
version
<
versionNeeded
)
{
if
(
version
<
versionNeeded
)
{
qDebug
()
<<
"
loadFromFile():
Version too old: "
<<
version
;
qDebug
()
<<
"
[XMLReader]
Version too old: "
<<
version
;
return
VersionTooOld
;
return
VersionTooOld
;
}
}
while
(
!
xml
.
atEnd
())
{
while
(
!
xml
.
atEnd
())
{
...
@@ -569,6 +577,10 @@ LoadStatus CardDatabase::loadFromFile(const QString &fileName)
...
@@ -569,6 +577,10 @@ LoadStatus CardDatabase::loadFromFile(const QString &fileName)
loadSetsFromXml
(
xml
);
loadSetsFromXml
(
xml
);
else
if
(
xml
.
name
()
==
"cards"
)
else
if
(
xml
.
name
()
==
"cards"
)
loadCardsFromXml
(
xml
);
loadCardsFromXml
(
xml
);
else
if
(
xml
.
name
()
!=
""
)
{
qDebug
()
<<
"[XMLReader] Unknown item"
<<
xml
.
name
()
<<
", trying to continue anyway"
;
xml
.
skipCurrentElement
();
}
}
}
}
}
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment