# HG changeset patch
# User Dimitri Papadopoulos <dimitri.papadopoulos@cea.fr>
# Date 1392300570 -3600
# Node ID b0dd5b57d2d84725eaf25820f45eca0146bc91cc
# Parent  29987849a43599a01dc7fb3c4d72d6c5def3300e
[dataimport, migration] more fixes in the spirit of a6c32edabc8d:

[entity, metadata] huuum, use resolvable url as cwuri... And fix existing ones.

Closes #3390388

diff -r 29987849a435 -r b0dd5b57d2d8 dataimport.py
--- a/dataimport.py	Thu Feb 06 15:04:57 2014 +0100
+++ b/dataimport.py	Thu Feb 13 15:09:30 2014 +0100
@@ -873,7 +873,7 @@
         return getattr(self, 'gen_%s' % rtype)(entity)
 
     def gen_cwuri(self, entity):
-        return u'%seid/%s' % (self.baseurl, entity.eid)
+        return u'%s%s' % (self.baseurl, entity.eid)
 
     def gen_creation_date(self, entity):
         return self.time
diff -r 29987849a435 -r b0dd5b57d2d8 misc/migration/bootstrapmigration_repository.py
--- a/misc/migration/bootstrapmigration_repository.py	Thu Feb 06 15:04:57 2014 +0100
+++ b/misc/migration/bootstrapmigration_repository.py	Thu Feb 13 15:09:30 2014 +0100
@@ -157,7 +157,7 @@
             type, source, extid = session.describe(eid)
             if source == 'system':
                 rql('SET X cwuri %(u)s WHERE X eid %(x)s',
-                    {'x': eid, 'u': base_url + u'eid/%s' % eid})
+                    {'x': eid, 'u': u'%s%s' % (base_url, eid)})
         isession.commit()
         session.set_shared_data('do-not-insert-cwuri', False)