External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-23 12:02:01 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed some card download problems.

Browse source
This commit is contained in:
LevelX2 2017-12-30 18:36:03 +01:00
parent 88b06137be
commit 529a38a96f
3 changed files with 68 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Mage/src/main/java/mage/cards/repository/CardCriteria.java
View file

@ -44,6 +44,7 @@ import mage.constants.Rarity;
public class CardCriteria {
private String name;
private String nameExact;
private String rules;
private final List<String> setCodes;
private final List<CardType> types;
@ -126,6 +127,11 @@ public class CardCriteria {
return this;
}
public CardCriteria nameExact(String nameExact) {
this.nameExact = nameExact;
return this;
}
public CardCriteria rules(String rules) {
this.rules = rules;
return this;
@ -205,6 +211,10 @@ public class CardCriteria {
where.like("name", new SelectArg('%' + name + '%'));
clausesCount++;
}
if (nameExact != null) {
where.like("name", new SelectArg(nameExact));
clausesCount++;
}
if (rules != null) {
where.like("rules", new SelectArg('%' + rules + '%'));
clausesCount++;
@ -231,7 +241,6 @@ public class CardCriteria {
clausesCount++;
}
if (types.size() != 7) { //if all types selected - no selection needed (Tribal and Conspiracy not selectable yet)
for (CardType type : types) {
where.like("types", new SelectArg('%' + type.name() + '%'));
@ -315,15 +324,13 @@ public class CardCriteria {
where.eq("cardNumber", new SelectArg(0));
}
if (start != null) {
qb.offset(start);
}
if (count != null) {
qb.limit(count);
}
if (sortBy != null) {
qb.orderBy(sortBy, true);
}