Merge pull request #8 from VanNostrand/oracle-fixes

Oracle fixes

oracle/src/oracleimporter.cpp

@@ -44,7 +44,6 @@ bool OracleImporter::readSetsFromXml(QXmlStreamReader &xml)
 		if (xml.readNext() == QXmlStreamReader::EndElement)
 			break;
 		if (xml.name() == "set") {
-			QString shortName, longName;
 			bool import = xml.attributes().value("import").toString().toInt();
 			while (!xml.atEnd()) {
 				if (xml.readNext() == QXmlStreamReader::EndElement)
@@ -194,7 +193,7 @@ int OracleImporter::importTextSpoiler(CardSet *set, const QByteArray &data)
 					QString v1 = tds.at(0).toElement().text().simplified();
 					QString v2 = tds.at(1).toElement().text().replace(trUtf8("—"), "-");
 					
-					if (v1 == "Name:") {
+					if (v1 == "Name") {
 						QDomElement a = tds.at(1).toElement().elementsByTagName("a").at(0).toElement();
 						QString href = a.attributes().namedItem("href").nodeValue();
 						cardId = href.mid(href.indexOf("multiverseid=") + 13).toInt();
@@ -259,6 +258,7 @@ void OracleImporter::downloadNextFile()
 	if (urlString.isEmpty())
 		urlString = setUrl;
 	urlString = urlString.replace("!longname!", setsToDownload[setIndex].getLongName());
+
 	if (urlString.startsWith("http://")) {
 		QUrl url(urlString);
 		http->setHost(url.host(), QHttp::ConnectionModeHttp, url.port() == -1 ? 0 : url.port());

oracle/src/window_main.cpp

@@ -19,7 +19,7 @@
 #include "window_main.h"
 #include "oracleimporter.h"
 
-const QString WindowMain::defaultSetsUrl = QString("http://www.cockatrice.de/files/sets.xml");
+const QString WindowMain::defaultSetsUrl = QString("https://raw.github.com/Daenyth/Cockatrice/master/doc/sets.xml");
 
 WindowMain::WindowMain(QWidget *parent)
 	: QMainWindow(parent)