# HG changeset patch
# User verrierj
# Date 1319030585 -7200
# Node ID 8098939f93c2870cb800f2d47585888fdcaf3921
# Parent  49c9890dce4a88a9daad7f813b7edcaab0746b71# Parent  df7b98820ce1eeece0fcfc2c79fcbeb7793a1ec0
Merge with df7b98820ce1eeece0fcfc2c79fcbeb7793a1ec0

diff -r 49c9890dce4a -r 8098939f93c2 .hgtags
--- a/.hgtags	Wed Oct 19 11:57:09 2011 +0200
+++ b/.hgtags	Wed Oct 19 15:23:05 2011 +0200
@@ -24,3 +24,4 @@
 b31c24c70fbc553c43dbbb9f2ed9113e3a5961c2 V00.16
 250bc62f2ead14544042d791ab88696a6e111ed4 V00.17
 fd591c597e6ddf78de8f41451a8d44bf25705a8b V00.18
+fe7868acd5611d3e9c8b9b07f1bd6ccf092bfbb5 V00.19
diff -r 49c9890dce4a -r 8098939f93c2 src/ldt/ldt/__init__.py
--- a/src/ldt/ldt/__init__.py	Wed Oct 19 11:57:09 2011 +0200
+++ b/src/ldt/ldt/__init__.py	Wed Oct 19 15:23:05 2011 +0200
@@ -1,4 +1,4 @@
-VERSION = (0, 18, 0, "final", 0)
+VERSION = (0, 19, 0, "final", 0)
 
 
 def get_version():
diff -r 49c9890dce4a -r 8098939f93c2 src/ldt/ldt/ldt_utils/urls.py
--- a/src/ldt/ldt/ldt_utils/urls.py	Wed Oct 19 11:57:09 2011 +0200
+++ b/src/ldt/ldt/ldt_utils/urls.py	Wed Oct 19 15:23:05 2011 +0200
@@ -8,7 +8,6 @@
 urlpatterns = patterns('ldt.ldt_utils',
     url(r'^searchInit/(?P<field>.*)/(?P<query>.*)$', 'views.search_init'),
     url(r'^searchForm/$', 'views.search_form'),
-    url(r'^import_rs/$', 'views.import_rs'),
     url(r'^published/$', 'views.published_project'),
     url(r'^groups/$', 'views.groups'),
     url(r'^get_group_projects/$', 'views.get_group_projects'),
diff -r 49c9890dce4a -r 8098939f93c2 src/ldt/ldt/ldt_utils/views.py
--- a/src/ldt/ldt/ldt_utils/views.py	Wed Oct 19 11:57:09 2011 +0200
+++ b/src/ldt/ldt/ldt_utils/views.py	Wed Oct 19 15:23:05 2011 +0200
@@ -39,44 +39,6 @@
 import re
 import datetime
 
-from django.db.backends.postgresql_psycopg2.base import psycopg2
-
-    
-def import_rs(request):
-    # Connexion
-    conn = psycopg2.connect(database="test_import_rs", user="admin", password="admin")
-    cur = conn.cursor()
-    # Get all "regarssignes" contents
-    cur.execute("SELECT * from ldt_content")
-    rows = cur.fetchall()
-    s = "Show me the databases:\n"
-    for row in rows:
-        s += "\n   " + str(row)
-        # (id-0, u'iri_id'-1, u'iri_url'-2, u'videopath'-3, datetime creation_date-4, datetime update_date-5, u'title'-6, description-7, eternal_id-8)
-        # (1, u'laurentcantet_entrelesmurs', u'laurentcantet_entrelesmurs/laurentcantet_entrelesmurs.iri', u'rtmp://media.iri.centrepompidou.fr/ddc_player/video/regardssignes/', datetime.datetime(2010, 2, 17, 5, 24, 13, 69794, tzinfo=psycopg2.tz.FixedOffsetTimezone(offset=60, name=None)), datetime.datetime(2010, 2, 17, 5, 24, 13, 91656, tzinfo=psycopg2.tz.FixedOffsetTimezone(offset=60, name=None)), u'Entre Les Murs', None, None)
-        # Get duration from the iri file
-        prePath = u"/Users/tc/dev/eclipse_workspace/regardssignes_svn/web/static/media/ldt/"
-        doc = lxml.etree.parse(prePath + row[2])
-        res = doc.xpath("/iri/body/medias/media[@id='video']/video")
-        if len(res) > 0:
-            try:
-                dur = int(res[0].get(u'dur', 0) or 0)
-            except:
-                dur = 3600000
-        else:
-            dur = 3600000
-        # Build platform media and platform content from "regarssignes" contents
-        media = Media.objects.create(external_id=row[8], creation_date=row[4], update_date=row[5], videopath=row[3], duration=dur,
-                                     description=row[7], title=row[6], src=(row[1] + u".flv"), mimetype_field="('video/x-flv', None)")
-        media.save()
-        
-        content = Content.objects.create(iri_id=row[1], iriurl=row[2], creation_date=row[4], update_date=row[5], title=row[6], description=row[7],
-                                     content_creation_date=row[4], duration=dur, media_obj=media)
-        content.save()
-    
-    return HttpResponse(s, mimetype="text/plain")
-    
-
 
 @login_required
 def workspace(request):
diff -r 49c9890dce4a -r 8098939f93c2 src/ldt/ldt/static/ldt/swf/player.swf
Binary file src/ldt/ldt/static/ldt/swf/player.swf has changed
diff -r 49c9890dce4a -r 8098939f93c2 virtualenv/res/lib/lib_create_env.py
--- a/virtualenv/res/lib/lib_create_env.py	Wed Oct 19 11:57:09 2011 +0200
+++ b/virtualenv/res/lib/lib_create_env.py	Wed Oct 19 15:23:05 2011 +0200
@@ -45,7 +45,7 @@
         'PSYCOPG2': {'setup': 'psycopg2','url': 'http://www.psycopg.org/psycopg/tarballs/PSYCOPG-2-4/psycopg2-2.4.tar.gz', 'local':"psycopg2-2.4.tar.gz"},
         'PYLUCENE': {'setup': 'pylucene', 'url': 'http://apache.crihan.fr/dist//lucene/pylucene/pylucene-3.1.0-1-src.tar.gz', 'local':"pylucene-3.1.0-1-src.tar.gz"},
         'PIL': {'setup': 'pil', 'url': 'http://effbot.org/downloads/Imaging-1.1.7.tar.gz', 'local':"Imaging-1.1.7.tar.gz"},
-        'LXML': {'setup': 'lxml', 'url':"lxml-2.3.tar.bz2", 'local':"lxml-2.3.tar.bz2"}
+        'LXML': {'setup': 'lxml', 'url':"lxml-2.3.1.tar.bz2", 'local':"lxml-2.3.1.tar.bz2"}
     })
 
 
diff -r 49c9890dce4a -r 8098939f93c2 virtualenv/res/src/lxml-2.3.1.tar.bz2
Binary file virtualenv/res/src/lxml-2.3.1.tar.bz2 has changed
diff -r 49c9890dce4a -r 8098939f93c2 virtualenv/res/src/lxml-2.3.tar.bz2
Binary file virtualenv/res/src/lxml-2.3.tar.bz2 has changed