# HG changeset patch # User ymh # Date 1540220670 -7200 # Node ID d2d28468b410605239aa26f6c766b42e967e22e0 # Parent 2b510a3a0f7d65ff11b88157ee267cdcf2597fdb Add support for displaying new protocol diff -r 2b510a3a0f7d -r d2d28468b410 script/utils/export_twitter_alchemy.py --- a/script/utils/export_twitter_alchemy.py Sun Sep 23 17:14:07 2018 +0200 +++ b/script/utils/export_twitter_alchemy.py Mon Oct 22 17:04:30 2018 +0200 @@ -96,9 +96,34 @@ else: return None +def parse_polemics_3(tw, extended_mode): + """ + parse polemics in text and return a list of polemic code. None if not polemic found + """ + polemics = {} + for m in re.finditer("(\+\+|\?\?|\*\*|\=\=)",tw.text): + pol_link = { + '++' : u'OK', + '??' : u'KO', + '**' : u'REF', + '==' : u'Q'}[m.group(1)] + polemics[pol_link] = pol_link + + if extended_mode: + for entity in tw.entity_list: + if entity.type == "entity_url": + polemics["REF"] = "REF" + + if len(polemics) > 0: + return polemics.keys() + else: + return None + + protocol_version_map = { "1" : parse_polemics_1, - "2" : parse_polemics_2 + "2" : parse_polemics_2, + "3" : parse_polemics_3 } def get_options(): diff -r 2b510a3a0f7d -r d2d28468b410 web/marathon-serpentine-2018/config.php --- a/web/marathon-serpentine-2018/config.php Sun Sep 23 17:14:07 2018 +0200 +++ b/web/marathon-serpentine-2018/config.php Mon Oct 22 17:04:30 2018 +0200 @@ -160,7 +160,7 @@ 'additional_js' => ['reloader.php?a='.rand(),], // After the event - // 'metadata' => "fc62350e-69d9-11e1-9089-00145ea4a2be", + 'metadata' => "cf54e97c-d146-11e8-8451-00145ea4a2be", // 'duration' => 10876600, // 'player' => "res/metadataplayer/src/js/LdtPlayer.js", // 'div_height' => 740, diff -r 2b510a3a0f7d -r d2d28468b410 web/player_embed.php --- a/web/player_embed.php Sun Sep 23 17:14:07 2018 +0200 +++ b/web/player_embed.php Mon Oct 22 17:04:30 2018 +0200 @@ -35,7 +35,7 @@ ) ); -$protocol_level = min(3,max(0, $protocol_level)); +$protocol_level = min(4,max(0, $protocol_level)); ?> @@ -78,7 +78,7 @@ 1): ?> { type: "Polemic" - + , polemics: [] diff -r 2b510a3a0f7d -r d2d28468b410 web/polemicaltimeline.php --- a/web/polemicaltimeline.php Sun Sep 23 17:14:07 2018 +0200 +++ b/web/polemicaltimeline.php Mon Oct 22 17:04:30 2018 +0200 @@ -51,7 +51,7 @@ array_push($_SESSION['answered_events'], $rep); } -//$annotation_protocol_version = isset($config['annotation_protocol_version'])?$config['annotation_protocol_version']:"1"; +$annotation_protocol_version = isset($config['annotation_protocol_version'])?$config['annotation_protocol_version']:"1"; $annotations = get_default_annotations_config($config, $translate); ?> @@ -149,10 +149,9 @@ { type: "Polemic", max_elements: 60, - - polemics: [] - - polemics : [ + default_version: "1", + + polemics : { "":[ $annot_def): ?> " }, - ] + ]} },