From c27918c67e96083b0bd49fff6de1c79c716ed957 Mon Sep 17 00:00:00 2001
From: Maxmtg <maxmtg@cardforge.org>
Date: Sat, 28 Jan 2012 16:18:21 +0000
Subject: [PATCH] DeckRecognizer will try to get the latest edition for cards
 typed

---
 src/main/java/forge/deck/DeckRecognizer.java |  4 +--
 src/main/java/forge/item/CardDb.java         | 36 ++++++++++++++++++++
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/src/main/java/forge/deck/DeckRecognizer.java b/src/main/java/forge/deck/DeckRecognizer.java
index 54ffaf2667f..266cbbcbd94 100644
--- a/src/main/java/forge/deck/DeckRecognizer.java
+++ b/src/main/java/forge/deck/DeckRecognizer.java
@@ -186,7 +186,7 @@ public class DeckRecognizer {
            */
         else {
             if (CardDb.instance().isCardSupported(line)) {
-                return Token.knownCard(CardDb.instance().getCard(line), 1);
+                return Token.knownCard(CardDb.instance().getCardFromLatestSet(line), 1);
             }
             result = DeckRecognizer.recognizeNonCard(line, 1);
         }
@@ -195,7 +195,7 @@ public class DeckRecognizer {
 
     private static Token recognizePossibleNameAndNumber(final String name, final int n) {
         if (CardDb.instance().isCardSupported(name)) {
-            return Token.knownCard(CardDb.instance().getCard(name), n);
+            return Token.knownCard(CardDb.instance().getCardFromLatestSet(name), n);
         }
 
         final Token known = DeckRecognizer.recognizeNonCard(name, n);
diff --git a/src/main/java/forge/item/CardDb.java b/src/main/java/forge/item/CardDb.java
index fb9759a3f67..10e370e2a2f 100644
--- a/src/main/java/forge/item/CardDb.java
+++ b/src/main/java/forge/item/CardDb.java
@@ -26,11 +26,13 @@ import java.util.Map.Entry;
 import java.util.NoSuchElementException;
 
 import net.slightlymagic.braids.util.lambda.Lambda1;
+import net.slightlymagic.maxmtg.Predicate;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 
 import forge.Card;
+import forge.SetUtils;
 import forge.card.CardInSet;
 import forge.card.CardRules;
 import forge.card.MtgDataParser;
@@ -336,4 +338,38 @@ public final class CardDb {
         return this.allCardsFlat;
     }
 
+    /**
+     * TODO: Write javadoc for this method.
+     * @param name
+     * @return
+     */
+    public CardPrinted getCardFromLatestSet(String name) {
+        // Sometimes they read from decks things like "CardName|Set" - but we
+        // can handle it
+        final ImmutablePair<String, String> nameWithSet = CardDb.splitCardName(name);
+        if (nameWithSet.right != null) {
+            return this.getCard(nameWithSet.left, nameWithSet.right);
+        }
+        
+        // OK, plain name here
+        Predicate<CardPrinted> predicate = CardPrinted.Predicates.name(nameWithSet.left);
+        List<CardPrinted> namedCards = predicate.select(this.allCardsFlat);
+        if ( namedCards.isEmpty() )
+            throw new NoSuchElementException(String.format("Card '%s' not found in our database.", name));
+        
+        // Find card with maximal set index
+        CardPrinted result = namedCards.get(0);
+        int resIndex = SetUtils.getSetByCode((result).getSet()).getIndex();
+        for(CardPrinted card : namedCards)
+        {
+            int thisIndex = SetUtils.getSetByCode((card).getSet()).getIndex();
+            if ( thisIndex > resIndex ) {
+                result = card;
+                resIndex = thisIndex;
+            }
+        }
+        
+        return result;
+    }
+
 }