# HG changeset patch
# User Raphael Velt <raph.velt@gmail.com>
# Date 1329225684 -3600
# Node ID 8b035663863ba24c762a4fe2cac3ef5983c01d12
# Parent  f7fd2458fc5ca4749bef4dcaecb2b9ce59605d78# Parent  9642981510f4dcf3a177a5a8a6ff47b5c6e31b61
Merge with 6a5051b23cf3f3cfd7141747b3a1f4237bbf901f

diff -r f7fd2458fc5c -r 8b035663863b script/utils/export_twitter_alchemy.py
--- a/script/utils/export_twitter_alchemy.py	Tue Feb 14 14:17:43 2012 +0100
+++ b/script/utils/export_twitter_alchemy.py	Tue Feb 14 14:21:24 2012 +0100
@@ -331,7 +331,7 @@
                     
                 
                 
-                output_data = etree.tostring(root, encoding="utf-8", method="xml", pretty_print=True, xml_declaration=True)  
+                output_data = etree.tostring(root, encoding="utf-8", method="xml", pretty_print=False, xml_declaration=True)  
                 
                 if content_file and content_file.find("http") == 0:
                     
@@ -342,6 +342,9 @@
                     h = httplib2.Http()
                     resp, content = h.request(content_file, "PUT", headers={'content-type':'application/json'}, body=body)
                     get_logger().debug("write http " + repr(resp) + " content " + content) #@UndefinedVariable
+                    if resp.status != 200:
+                        get_logger().error("Error http " + repr(resp) + " content " + content) #@UndefinedVariable
+                        raise Exception("Error writing content : %d : %s"%(resp.status, resp.reason))                        
                 else:
                     if content_file and os.path.exists(content_file):
                         dest_file_name = content_file 
diff -r f7fd2458fc5c -r 8b035663863b web/common.php
--- a/web/common.php	Tue Feb 14 14:17:43 2012 +0100
+++ b/web/common.php	Tue Feb 14 14:21:24 2012 +0100
@@ -22,6 +22,7 @@
 array("fens_FabLab_Design_Metadata","designmd"), array("mashup","conference"), array("mashup","tableronde"),
 	"sig-chi-paris-2011", "rwd-meetup-patrimoine", "2011-2012-museo-ouverture"/*, "JaneMcGonigal-gameDesign"*/,
 	"iii-catastrophe", "edito-inaugurale", "2011-2012-museo-structured-data",
+	"edito-intelligence",
 );
 
 
diff -r f7fd2458fc5c -r 8b035663863b web/edito-intelligence/config.php
--- a/web/edito-intelligence/config.php	Tue Feb 14 14:17:43 2012 +0100
+++ b/web/edito-intelligence/config.php	Tue Feb 14 14:21:24 2012 +0100
@@ -49,8 +49,8 @@
  	'archive_description' => 'par <a href="http://www.sens-public.org" target="_blank">Sens Public</a> et l\'<a href="http://www.iri.centrepompidou.fr" target="_blank">IRI</a><br/>au Centre Pompidou le jeudi 19 janvier 2012 17:30 - 19:30',
 
     // After the event
-	'metadata'    => "http://www.iri.centrepompidou.fr/dev/ldt/ldtplatform/ldt/cljson/id/0911926e-093a-11e1-996f-00145ea49a02",
-	'duration'   => 8357400,
+	'metadata'    => "http://www.iri.centrepompidou.fr/dev/ldt/ldtplatform/ldt/cljson/id/8287b1ea-4766-11e1-91fc-00145ea49a02",
+	'duration'   => 6640378,
 	'player'        => "res/metadataplayer/src/js/LdtPlayer.js",
 	'div_height'    => 700,
 	'player_width'  => 650,