diff --git a/2011-28c3/questions.yaml b/2011-28c3/questions.yaml index 3a84be3..2f33730 100644 --- a/2011-28c3/questions.yaml +++ b/2011-28c3/questions.yaml @@ -116,7 +116,7 @@ media: question: - pix/q_hadopi.png explanation: - - pix/q_hadopi.jpg + - pix/a_hadopi.jpg --- !Question source: http://www.engadget.com/2011/09/23/scientists-reconstruct-images-from-our-brains-plan-to-do-the-sa/ @@ -164,7 +164,7 @@ media: question: - pix/q_hackspace.jpg explanation: - - pix/a_hackspace.jpg + - pix/a_hackerspace.jpg --- !Question source: http://torrentfreak.com/google-starts-censoring-bittorrent-rapidshare-and-more-110126/ @@ -583,7 +583,7 @@ media: question: - pix/q_miss_usa.jpg explanation: - - video/a_evolution.webm + - videos/a_miss_usa.webm --- !Question question: What mechanism wasn't used in Windows exploits in 2011? diff --git a/2011-28c3/round_1.json b/2011-28c3/round_1.json index 101db5a..2c6be26 100644 --- a/2011-28c3/round_1.json +++ b/2011-28c3/round_1.json @@ -1,9 +1,9 @@ [ { "text": "Who controls American drones in Afghanistan part time?", - "explanation": [ - "data/pix/a_drone_attack.jpg" - ], + "explanation": { + "image": "data/pix/a_drone_attack.jpg" + }, "answers": [ { "text": "Iran Army" @@ -20,14 +20,14 @@ } ], "source": "http://arstechnica.com/business/news/2011/10/exclusive-computer-virus-hits-drone-fleet.ars", - "tier": 3, + "tier": 45, "image": "data/pix/q_drone-dove.jpg" }, { "text": "What is the lethal dose of radioactivity that causes death with 100% probability within 14 days after exposition (LD100/14)? (1 Gray (Gy) == 1 Sievert (Sv))", - "explanation": [ - "data/pix/a_fukushima.jpg" - ], + "explanation": { + "image": "data/pix/a_fukushima.jpg" + }, "answers": [ { "text": "> 6 mGy" @@ -44,14 +44,14 @@ } ], "source": "http://de.wikipedia.org/wiki/Strahlenkrankheit", - "tier": 98, + "tier": 66, "image": "data/pix/q_fukushima.jpg" }, { "text": "Why did Saxony (German State) not use the Staatstrojaner (governmental trojan horse)?", - "explanation": [ - "data/pix/a_bundestrojaner.jpg" - ], + "explanation": { + "image": "data/pix/a_bundestrojaner.jpg" + }, "answers": [ { "text": "Technically not capable of doing so.", @@ -68,14 +68,14 @@ } ], "source": "http://www.justiz.sachsen.de/smj/content/2674.php Offizielle Pressemitteilung", - "tier": 21, + "tier": 17, "image": "data/pix/q_bundestrojaner.jpg" }, { "text": "Which of the following organizations has not yet been blocked by paypal?", - "explanation": [ - "data/pix/a_paypal.gif" - ], + "explanation": { + "image": "data/pix/a_paypal.gif" + }, "answers": [ { "text": "Wikileaks" @@ -92,15 +92,14 @@ } ], "source": "http://www.theregister.co.uk/2010/03/10/cryptome_paypal/", - "tier": 1, + "tier": 77, "image": "data/pix/q_paypal4.jpg" }, { "text": "Which of the following countries voted against loosening restrictions of cluster munition at the UN?", - "explanation": [ - "data/pix/a_cluster1.jpg", - "data/pix/a_cluster2.jpg" - ], + "explanation": { + "image": "data/pix/a_cluster1.jpg" + }, "answers": [ { "text": "Austria", @@ -117,14 +116,14 @@ } ], "source": "http://www.reuters.com/article/2011/11/25/us-weapons-clusterbombs-idUSTRE7AO1LF20111125 http://www.general-anzeiger-bonn.de/news/kommentare/Die-Rueckkehr-der-Streubomben-Spur-des-Todes-article567503.html http://www.krone.at/Welt/Oesterreich_kaempft_gegen_Comeback_der_Streubomben-Einsames_Vorhaben-Story-302663 http://taz.de/Abkommen-zu-Streumunition/!82648/", - "tier": 1, + "tier": 40, "image": "data/pix/q_cluster.jpg" }, { "text": "How many 1st notifications have been sent during the first 12 months of the French Three-Strikes-Law (Hadopi) being active?", - "explanation": [ - "data/pix/q_hadopi.jpg" - ], + "explanation": { + "image": "data/pix/a_hadopi.jpg" + }, "answers": [ { "text": "~600k", @@ -141,14 +140,14 @@ } ], "source": "http://www.heise.de/tp/blogs/8/150565", - "tier": 63, + "tier": 93, "image": "data/pix/q_hadopi.png" }, { "text": "What do you see on the picture?", - "explanation": [ - "data/pix/a_brain.jpg" - ], + "explanation": { + "image": "data/pix/a_brain.jpg" + }, "answers": [ { "text": "Reconstructed picture from brain activity", @@ -165,14 +164,14 @@ } ], "source": "http://www.engadget.com/2011/09/23/scientists-reconstruct-images-from-our-brains-plan-to-do-the-sa/", - "tier": 3, + "tier": 55, "image": "data/pix/q_brain.png" }, { "text": "How long did it take to bring kernel.org back on-line after they found out that it has been hacked August 2011?", - "explanation": [ - "data/pix/a_kernel.jpg" - ], + "explanation": { + "image": "data/pix/a_kernel.jpg" + }, "answers": [ { "text": "~ 1 week" @@ -189,14 +188,14 @@ } ], "source": "http://linux.slashdot.org/story/11/10/05/1920255/welcome-back-kernelorg", - "tier": 19, + "tier": 47, "image": "data/pix/q_kernel.gif" }, { "text": "Which of the following cities is helping to create 100 new hackerspaces in itself?", - "explanation": [ - "data/pix/a_hackspace.jpg" - ], + "explanation": { + "image": "data/pix/a_hackerspace.jpg" + }, "answers": [ { "text": "Berlin" @@ -213,14 +212,14 @@ } ], "source": "http://winfuture.de/news,66539.html", - "tier": 33, + "tier": 96, "image": "data/pix/q_hackspace.jpg" }, { "text": "Which of the following terms does not autocomplete anymore in Google search since January 2011?", - "explanation": [ - "data/pix/a_autocomplete.jpg" - ], + "explanation": { + "image": "data/pix/a_autocomplete.jpg" + }, "answers": [ { "text": "torrent", @@ -237,7 +236,7 @@ } ], "source": "http://torrentfreak.com/google-starts-censoring-bittorrent-rapidshare-and-more-110126/", - "tier": 77, + "tier": 56, "image": "data/pix/q_autocomplete.jpg" } ] \ No newline at end of file diff --git a/2011-28c3/round_2.json b/2011-28c3/round_2.json index b8543fb..bbd8e3a 100644 --- a/2011-28c3/round_2.json +++ b/2011-28c3/round_2.json @@ -1,9 +1,9 @@ [ { "text": "What was the main purpose of the Virus that infected the US Air Force drone fleet September 2011?", - "explanation": [ - "data/pix/a_drone.jpg" - ], + "explanation": { + "image": "data/pix/a_drone.jpg" + }, "answers": [ { "text": "Programming new false targets" @@ -20,14 +20,14 @@ } ], "source": "http://www.wired.com/dangerroom/2011/10/drone-virus-nuisance/", - "tier": 121, + "tier": 502, "image": "data/pix/q_drone.jpg" }, { "text": "How many female porn stars have their own WP article?", - "explanation": [ - "data/pix/a_wp_pornstar.jpg" - ], + "explanation": { + "image": "data/pix/a_wp_pornstar.jpg" + }, "answers": [ { "text": 448 @@ -44,14 +44,14 @@ } ], "source": "http://en.wikipedia.org/wiki/Category:Lists_of_pornographic_film_actors", - "tier": 361, + "tier": 479, "image": "data/pix/q_wp_pornstars.png" }, { "text": "How many user-related data records (name, address, birth date) did the Saxon State retrieve after it gathered > 1 million cell phone connection records at a anti-Nazi demonstration?", - "explanation": [ - "data/pix/a_handygate.jpg" - ], + "explanation": { + "image": "data/pix/a_handygate.jpg" + }, "answers": [ { "text": 540 @@ -68,14 +68,14 @@ } ], "source": "http://www.addn.me/freiraeume/handydatenskandal-nimmt-kein-ende/", - "tier": 214, + "tier": 850, "image": "data/pix/q_handygate.jpg" }, { "text": "Which company delivers software that could be rebooted by an IPv6 ping in 2011?", - "explanation": [ - "data/pix/a_ipv6_ping.jpg" - ], + "explanation": { + "image": "data/pix/a_ipv6_ping.jpg" + }, "answers": [ { "text": "Microsoft" @@ -92,14 +92,14 @@ } ], "source": "http://tools.cisco.com/security/center/content/CiscoSecurityAdvisory/cisco-sa-20110928-ipv6mpls", - "tier": 550, + "tier": 355, "image": "data/pix/q_ipv6_ping.jpg" }, { "text": "How much money has HP spent in CEO pay-offs since 2005?", - "explanation": [ - "data/pix/a_hp-money.jpg" - ], + "explanation": { + "image": "data/pix/a_hp-money.jpg" + }, "answers": [ { "text": "$100 mio" @@ -116,14 +116,14 @@ } ], "source": "http://www.internetevolution.com/author.asp?section_id=852&doc_id=233780&", - "tier": 757, + "tier": 809, "image": "data/pix/q_hp_money.jpg" }, { "text": "Which network protocol was used to demonstrate a PoC to control the engines of a Boing 747 starting from the video entertainment system?", - "explanation": [ - "data/pix/q_747.jpg" - ], + "explanation": { + "image": "data/pix/q_747.jpg" + }, "answers": [ { "text": "ssh" @@ -140,14 +140,14 @@ } ], "source": "https://www.infosecisland.com/blogview/16696-FACT-CHECK-SCADA-Systems-Are-Online-Now.html", - "tier": 295, + "tier": 899, "image": "data/pix/q_747.jpg" }, { "text": "Which of the following companies announced via Twitter that they will tell the police details about London rioters?", - "explanation": [ - "data/pix/a_london.jpg" - ], + "explanation": { + "image": "data/pix/a_london.jpg" + }, "answers": [ { "text": "Cash and Carry (by publishing video footage)" @@ -164,14 +164,14 @@ } ], "source": "http://netzpolitik.org/2011/blackberry-kundigt-an-londoner-plunderer-auszuliefern/", - "tier": 331, + "tier": 873, "image": "data/pix/q_london.jpg" }, { "text": "How did Russian bloggers try to raise attention for their demonstrations against fraud during the recent elections in Russia?", - "explanation": [ - "data/pix/a_russian.jpg" - ], + "explanation": { + "image": "data/pix/a_russian.jpg" + }, "answers": [ { "text": "Multi-Million-Rubel-Ad-Campain." @@ -188,14 +188,14 @@ } ], "source": "http://www.spiegel.de/politik/ausland/0,1518,802967,00.html", - "tier": 485, + "tier": 600, "image": "data/pix/q_russian.jpg" }, { "text": "What is the definition of the measurement unit one Uhl?", - "explanation": [ - "data/pix/a_uhl.jpg" - ], + "explanation": { + "image": "data/pix/a_uhl.jpg" + }, "answers": [ { "text": "Unit of a scale that describes the need of censorship for a certain website." @@ -212,14 +212,14 @@ } ], "source": "http://www.piratenpartei-soest.de/2011/11/das-piraten-abc/", - "tier": 345, + "tier": 829, "image": "data/pix/q_uhl.jpg" }, { "text": "Which new investigation tool did Henrik Kaspersen (one of the founders of the Convention on Cybercrime) demand during its 10th birthday to improve the work against cyber crime?", - "explanation": [ - "data/pix/a_cybercrime.jpg" - ], + "explanation": { + "image": "data/pix/a_cybercrime.jpg" + }, "answers": [ { "text": "E-mail bombs" @@ -236,7 +236,7 @@ } ], "source": "http://www.h-online.com/security/news/item/Tenth-anniversary-of-the-Convention-on-Cybercrime-1384180.html", - "tier": 277, + "tier": 534, "image": "data/pix/q_cybercrime.png" } ] \ No newline at end of file diff --git a/2011-28c3/round_3.json b/2011-28c3/round_3.json index 6fc71a6..2ff7da4 100644 --- a/2011-28c3/round_3.json +++ b/2011-28c3/round_3.json @@ -1,9 +1,9 @@ [ { "text": "How did the US Airforce cyber security departement learn about the virus that infected drones?", - "explanation": [ - "data/pix/a_drone2.jpg" - ], + "explanation": { + "image": "data/pix/a_drone2.jpg" + }, "answers": [ { "text": "Intrusion detection mechanisms" @@ -20,14 +20,14 @@ } ], "source": "http://arstechnica.com/tech-policy/news/2011/10/get-hacked-dont-tell-drone-base-didnt-report-virus.ars", - "tier": 38748, + "tier": 17436, "image": "data/pix/q_drone2.jpg" }, { "text": "Which App was pulled off the Apple app store this year after massive protests?", - "explanation": [ - "data/videos/phonestory.webm" - ], + "explanation": { + "video": "data/videos/phonestory.webm" + }, "answers": [ { "text": "Phone Story" @@ -44,14 +44,14 @@ } ], "source": "http://www.truthwinsout.org/news/2011/03/15155/", - "tier": 59672, + "tier": 86858, "image": "data/pix/van_gogh_ipad.jpg" }, { "text": "Why does the German SPD politician Sebastian Edathy want the data retention law?", - "explanation": [ - "data/pix/a_edathy.jpg" - ], + "explanation": { + "image": "data/pix/a_edathy.jpg" + }, "answers": [ { "text": "to catch who send him a plastic pussy", @@ -68,14 +68,14 @@ } ], "source": "https://pentamedia.c3d2.de/submit/2011/09/13/abgeordnetenwatchdesebastianedathy/", - "tier": 47655, + "tier": 33878, "image": "data/pix/q_edathy.jpg" }, { "text": "What is not patented (to our knowledge)?", - "explanation": [ - "data/pix/a_snowman.jpg" - ], + "explanation": { + "image": "data/pix/a_snowman.jpg" + }, "answers": [ { "text": "Snowman", @@ -92,14 +92,14 @@ } ], "source": "http://www.improbable.com/2011/09/07/new-patent-granted-for-building-a-snow-manwoman/", - "tier": 70527, + "tier": 51367, "image": "data/pix/q_snowman.jpg" }, { "text": "Which country did not get its copyright law dictated by the US?", - "explanation": [ - "data/pix/a_copyright.jpg" - ], + "explanation": { + "image": "data/pix/a_copyright.jpg" + }, "answers": [ { "text": "Canada" @@ -116,14 +116,14 @@ } ], "source": "http://www.michaelgeist.ca/content/view/5765/125/", - "tier": 58357, + "tier": 60790, "image": "data/pix/q_copyright.jpg" }, { "text": "What vendor/project did not violate the GPL?", - "explanation": [ - "data/pix/a_gpl.png" - ], + "explanation": { + "image": "data/pix/a_gpl.png" + }, "answers": [ { "text": "AVM" @@ -140,14 +140,14 @@ } ], "source": "https://pentamedia.c3d2.de/submit/2011/08/01/emacsverstotseitjahrengegendiegplheiseo/", - "tier": 37718, + "tier": 33852, "image": "data/pix/q_gpl.png" }, { "text": "What was the reason for human loss at Pukkelpop music festival in Belgium?", - "explanation": [ - "data/pix/a_p2p.jpg" - ], + "explanation": { + "image": "data/pix/a_p2p.jpg" + }, "answers": [ { "text": "stormy wind" @@ -164,14 +164,14 @@ } ], "source": "https://pentamedia.c3d2.de/submit/2011/09/16/illegaledownloadsschuldantoumldlichemfesti/", - "tier": 55973, + "tier": 12989, "image": "data/pix/q_p2p.jpg" }, { "text": "Which of the following CAs did not publish news about security problems yet?", - "explanation": [ - "data/pix/q_ca4.jpg" - ], + "explanation": { + "image": "data/pix/q_ca4.jpg" + }, "answers": [ { "text": "Diginotar" @@ -188,14 +188,14 @@ } ], "source": "http://www.theregister.co.uk/2011/09/07/globalsign_suspends_ssl_cert_biz/ http://www.heise.de/security/meldung/Falsches-Google-Zertifikat-ist-Folge-eines-Hacks-1333588.html http://www.heise.de/security/meldung/Zertifikatsausgabestopp-nach-Einbruch-auf-einem-KPN-Server-1372279.html", - "tier": 60357, + "tier": 99874, "image": "data/pix/q_ca4.jpg" }, { "text": "What is the new TLD for \"The Republic of South Sudan\"?", - "explanation": [ - "data/pix/a_sudan.png" - ], + "explanation": { + "image": "data/pix/a_sudan.png" + }, "answers": [ { "text": ".su" @@ -212,14 +212,14 @@ } ], "source": "http://en.wikipedia.org/wiki/South_Sudan", - "tier": 35852, + "tier": 77707, "image": "data/pix/q_sudan.png" }, { "text": "What did Google do after it received a secret court order to hand over Jacob Applebaums e-mails?", - "explanation": [ - "data/pix/a_google_mail.jpg" - ], + "explanation": { + "image": "data/pix/a_google_mail.jpg" + }, "answers": [ { "text": "handed the data over", @@ -236,7 +236,7 @@ } ], "source": "http://online.wsj.com/article/SB10001424052970203476804576613284007315072.html", - "tier": 39084, + "tier": 54525, "image": "data/pix/q_dont_be_evil.jpg" } ] \ No newline at end of file diff --git a/2011-28c3/round_4.json b/2011-28c3/round_4.json index 51e6971..2724051 100644 --- a/2011-28c3/round_4.json +++ b/2011-28c3/round_4.json @@ -1,9 +1,9 @@ [ { "text": "What company is represented by this org chart?", - "explanation": [ - "data/pix/organigram.png" - ], + "explanation": { + "image": "data/pix/organigram.png" + }, "answers": [ { "text": "Google" @@ -20,14 +20,14 @@ } ], "source": "http://www.bonkersworld.net/wp-content/uploads/2011/06/2011.06.27_organizational_charts.png", - "tier": 5, + "tier": 26, "image": "data/pix/orgchart-ms.png" }, { "text": "What programming language Fefe isn't able to read?", - "explanation": [ - "data/pix/a_fefe.png" - ], + "explanation": { + "image": "data/pix/a_fefe.png" + }, "answers": [ { "text": "C" @@ -44,14 +44,14 @@ } ], "source": "http://www.heise.de/newsticker/meldung/Chaos-Communication-Camp-Vom-Ausbeuten-des-guten-Rufes-2-Update-1323234.html", - "tier": 19, + "tier": 42, "image": "data/pix/q_fefe.png" }, { "text": "Who did not die this year?", - "explanation": [ - "data/pix/anonymous-sun.jpg" - ], + "explanation": { + "image": "data/pix/anonymous-sun.jpg" + }, "answers": [ { "text": "Steve Jobs" @@ -68,14 +68,14 @@ } ], "source": "http://cache.gawkerassets.com/assets/images/4/2011/07/sunpage-2.jpg", - "tier": 21, + "tier": 15, "image": "data/pix/q_death_people.jpg" }, { "text": "How many Mrs USA finalists believe in the evolution theory when asked if it should be taught in school (out of 51)?", - "explanation": [ - "data/video/a_evolution.webm" - ], + "explanation": { + "video": "data/videos/a_miss_usa.webm" + }, "answers": [ { "text": 1, @@ -92,14 +92,14 @@ } ], "source": "http://themoderatevoice.com/114102/americas-rejection-of-evolution-reflected-in-miss-usa-pageant/", - "tier": 25, + "tier": 6, "image": "data/pix/q_miss_usa.jpg" }, { "text": "What mechanism wasn't used in Windows exploits in 2011?", - "explanation": [ - "data/pix/q_win_exploit.jpg" - ], + "explanation": { + "image": "data/pix/q_win_exploit.jpg" + }, "answers": [ { "text": "Text file" @@ -116,14 +116,14 @@ } ], "source": "http://themoderatevoice.com/114102/americas-rejection-of-evolution-reflected-in-miss-usa-pageant/", - "tier": 16, + "tier": 36, "image": "data/pix/q_win_exploit.jpg" }, { "text": "What answers Siri when you ask it \"Can you call me an ambulance?\"", - "explanation": [ - "data/pix/a_ambulance.jpg" - ], + "explanation": { + "image": "data/pix/a_ambulance.jpg" + }, "answers": [ { "text": "no emergancy calls" @@ -140,14 +140,14 @@ } ], "source": "http://toaskornottoask.com/to/shit-that-siri-says/page/2/", - "tier": 17, + "tier": 33, "image": "data/pix/q_siri.jpg" }, { "text": "Who was awarded the Pwnie award for Most Epic FAIL this year?", - "explanation": [ - "data/pix/a_sony.jpg" - ], + "explanation": { + "image": "data/pix/a_sony.jpg" + }, "answers": [ { "text": "Sony", @@ -167,14 +167,14 @@ } ], "source": "http://pwnies.com/winners/", - "tier": 12, + "tier": 11, "image": "data/pix/q_sony.jpg" }, { "text": "What happened when Vladimir Komarov on board of Soyuz-1 had serious problems in 1967?", - "explanation": [ - "data/pix/a_komarov.jpg" - ], + "explanation": { + "image": "data/pix/a_komarov.jpg" + }, "answers": [ { "text": "He was landed by Huston Control Center" @@ -191,11 +191,11 @@ } ], "source": "http://pentamedia.c3d2.de/submit/2011/12/22/usinterceptedrussiancosmonautvladimirkomarov/", - "tier": 9, + "tier": 17, "image": "data/pix/q_soyuz.jpg" }, { - "tier": 38, + "tier": 27, "text": "To what degree Libre Office is compatible to MS Office documents?", "image": "data/pix/q_office.jpg", "answers": [ @@ -217,9 +217,9 @@ }, { "text": "How much money makes MS by patent bribing Android manufactures a year?", - "explanation": [ - "data/pix/a_android_ms.jpg" - ], + "explanation": { + "image": "data/pix/a_android_ms.jpg" + }, "answers": [ { "text": "$1 billion" @@ -236,14 +236,14 @@ } ], "source": "http://www.heise.de/newsticker/meldung/Bericht-Microsoft-verdient-knapp-eine-halbe-Milliarde-an-Android-1351900.html", - "tier": 19, + "tier": 16, "image": "data/pix/q_android_ms.jpg" }, { "text": "How many babies were stolen after birth in Spain by doctors, priests and nuns between 50s and the 90s?", - "explanation": [ - "data/pix/a_spain.jpg" - ], + "explanation": { + "image": "data/pix/a_spain.jpg" + }, "answers": [ { "text": 300 @@ -260,14 +260,14 @@ } ], "source": "http://www.guardian.co.uk/tv-and-radio/2011/oct/18/tv-review-spains-stolen-babies", - "tier": 21, + "tier": 13, "image": "data/pix/q_pope.jpg" }, { "text": "How many intelligence violations the FBI may have committed since 9/11 according to the EFF?", - "explanation": [ - "data/pix/a_fbi.jpg" - ], + "explanation": { + "image": "data/pix/a_fbi.jpg" + }, "answers": [ { "text": "40k", @@ -284,7 +284,7 @@ } ], "source": "https://pentamedia.c3d2.de/submit/2011/01/30/efffbimayhavecommittedmorethan40kintellig/", - "tier": 13, + "tier": 32, "image": "data/pix/q_fbi.jpg" } ] \ No newline at end of file diff --git a/2011-28c3/round_5.json b/2011-28c3/round_5.json index 4c2765d..e53e4d2 100644 --- a/2011-28c3/round_5.json +++ b/2011-28c3/round_5.json @@ -1,9 +1,9 @@ [ { "text": "How many days in a row has Belgium been run by a caretaker administration since the last government resigned in April 2010?", - "explanation": [ - "data/pix/a_belgium.jpg" - ], + "explanation": { + "image": "data/pix/a_belgium.jpg" + }, "answers": [ { "text": "415 days" @@ -20,14 +20,14 @@ } ], "source": "http://en.wikipedia.org/wiki/2010\u20132011_Belgian_government_formation", - "tier": 67, + "tier": 44, "image": "data/pix/q_belgium.gif" }, { "text": "Which country does not have a net neutrality law?", - "explanation": [ - "data/pix/a_netneutrality.jpg" - ], + "explanation": { + "image": "data/pix/a_netneutrality.jpg" + }, "answers": [ { "text": "Belgium" @@ -44,14 +44,14 @@ } ], "source": "http://www.theregister.co.uk/2011/09/13/belgium_headed_for_net_neutrality/", - "tier": 42, + "tier": 62, "image": "data/pix/q_netneutrality.jpg" }, { "text": "What is the improvement of transmission time by the new $300 mio EU-US cable (first in 10 years)?", - "explanation": [ - "data/pix/a_300mdollar.png" - ], + "explanation": { + "image": "data/pix/a_300mdollar.png" + }, "answers": [ { "text": "6s" @@ -68,14 +68,14 @@ } ], "source": "http://www.telegraph.co.uk/technology/news/8753784/The-300m-cable-that-will-save-traders-milliseconds.html", - "tier": 51, + "tier": 23, "image": "data/pix/q_300mdollar.jpg" }, { "text": "Which programming language hangs on certain fp numbers?", - "explanation": [ - "data/pix/a_php-java.jpg" - ], + "explanation": { + "image": "data/pix/a_php-java.jpg" + }, "answers": [ { "text": "PHP" @@ -92,14 +92,14 @@ } ], "source": "http://www.exploringbinary.com/php-hangs-on-numeric-value-2-2250738585072011e-308/", - "tier": 78, + "tier": 14, "image": "data/pix/q_php.png" }, { "text": "What animal did the US army use in West Berlin for intruder alarm?", - "explanation": [ - "data/pix/a_goose.jpg" - ], + "explanation": { + "image": "data/pix/a_goose.jpg" + }, "answers": [ { "text": "goose", @@ -116,14 +116,14 @@ } ], "source": "http://www.schneier.com/blog/archives/2011/08/alarm_geese.html", - "tier": 69, + "tier": 21, "image": "data/pix/q_berlin_wall.jpg" }, { "text": "Why the godfather of the content mafia Warner Brothers was recently sued wrt. the movie Hangover II.", - "explanation": [ - "data/pix/a_bag.jpg" - ], + "explanation": { + "image": "data/pix/a_bag.jpg" + }, "answers": [ { "text": "Trademark issue, sued by Budweiser" @@ -140,7 +140,7 @@ } ], "source": "http://recordingindustryvspeople.blogspot.com/2011/12/warner-brothers-sued-for-trademark.html", - "tier": 48, + "tier": 53, "image": "data/pix/q_bag.jpg" } ] \ No newline at end of file diff --git a/tools/questions2json.py b/tools/questions2json.py index bc85b23..6d6cc1f 100755 --- a/tools/questions2json.py +++ b/tools/questions2json.py @@ -151,8 +151,21 @@ class Question(yaml.YAMLObject): )] = os.sep.join([self.web_root, f]) return q_data def gen_explanation(): - return {'explanation': [os.sep.join([self.web_root, expl]) \ - for expl in self.media['explanation']]} + """Sorry, hacky. Quick fix required only 1st element is taken""" + f = self.media['explanation'][0] + k = self.__type_by_extension(os.path.sep.join( + os.path.join([self.media_path, f]))) + v = [os.sep.join([self.web_root, expl]) \ + for expl in self.media['explanation']] + if v: + v = v[0] + else: + v = "" + return {'explanation': {k: v}} + #): os.sep.join([self.web_root, f]) + + #[os.sep.join([self.web_root, expl]) \ + # for expl in self.media['explanation']]} def k_not_found(): raise KeyError("Media keyword not found")