From 7dc25633900f2b24f710976ec610261c60066118 Mon Sep 17 00:00:00 2001
From: Max-Wilhelm Bruker <max.bruker@tu-dortmund.de>
Date: Sat, 12 Nov 2011 00:52:04 +0100
Subject: [PATCH] sets.xml updated; don't try to retrieve empty picture urls

---
 cockatrice/src/carddatabase.cpp |  6 ++++--
 oracle/sets.xml                 | 22 +++++++++++++++++-----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/cockatrice/src/carddatabase.cpp b/cockatrice/src/carddatabase.cpp
index d806c8e7..96918984 100644
--- a/cockatrice/src/carddatabase.cpp
+++ b/cockatrice/src/carddatabase.cpp
@@ -141,9 +141,11 @@ void PictureLoader::startNextPicDownload()
 	QString picUrl;
 	if (cardBeingDownloaded.getStripped())
 		picUrl = cardBeingDownloaded.getCard()->getPicURLSt(cardBeingDownloaded.getSetName());
-	else if (cardBeingDownloaded.getHq())
+	else if (cardBeingDownloaded.getHq()) {
 		picUrl = cardBeingDownloaded.getCard()->getPicURLHq(cardBeingDownloaded.getSetName());
-	else
+		if (picUrl.isEmpty())
+			picUrl = cardBeingDownloaded.getCard()->getPicURL(cardBeingDownloaded.getSetName());
+	} else
 		picUrl = cardBeingDownloaded.getCard()->getPicURL(cardBeingDownloaded.getSetName());
 	QUrl url(picUrl);
 	
diff --git a/oracle/sets.xml b/oracle/sets.xml
index 79346623..81e272e1 100644
--- a/oracle/sets.xml
+++ b/oracle/sets.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cockatrice_setdatabase version="20110126">
 	<picture_url>http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=!cardid!&amp;type=card</picture_url>
-	<picture_url_hq>http://mtgpics.chutography.com/!set!/!name!.full.jpg</picture_url_hq>
-	<picture_url_st>http://mtgpics.chutography.com/!set!/!name!.jpg</picture_url_st>
+<!--	<picture_url_hq>http://mtgpics.chutography.com/!set!/!name!.full.jpg</picture_url_hq>-->
+<!--	<picture_url_st>http://mtgpics.chutography.com/!set!/!name!.jpg</picture_url_st>-->
 	<set_url>http://gatherer.wizards.com/Pages/Search/Default.aspx?output=spoiler&amp;method=text&amp;set=[&quot;!longname!&quot;]&amp;special=true</set_url>
 	<set import="1">
 	    <name>ARB</name>
@@ -61,23 +61,35 @@
 	    <longname>Dissension</longname>
 	</set>
 	<set import="1">
-	    <name>DVD</name>
+	    <name>DDH</name>
+	    <longname>Duel Decks: Ajani vs. Nicol Bolas</longname>
+	</set>
+	<set import="1">
+	    <name>DDC</name>
 	    <longname>Duel Decks: Divine vs. Demonic</longname>
 	</set>
 	<set import="1">
-	    <name>DDE</name>
+	    <name>DDF</name>
 	    <longname>Duel Decks: Elspeth vs. Tezzeret</longname>
 	</set>
 	<set import="1">
 	    <name>EVG</name>
 	    <longname>Duel Decks: Elves vs. Goblins</longname>
 	</set>
+	<set import="1">
+	    <name>DDD</name>
+	    <longname>Duel Decks: Garruk vs. Liliana</longname>
+	</set>
 	<set import="1">
 	    <name>DD2</name>
 	    <longname>Duel Decks: Jace vs. Chandra</longname>
 	</set>
 	<set import="1">
-	    <name>DDD</name>
+	    <name>DDG</name>
+	    <longname>Duel Decks: Knights vs. Dragons</longname>
+	</set>
+	<set import="1">
+	    <name>DDE</name>
 	    <longname>Duel Decks: Phyrexia vs. the Coalition</longname>
 	</set>
 	<set import="1">