Mercurial Mercurial > pub > hg > cubicweb / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[dataimport, migration] more fixes in the spirit of a6c32edabc8d:
authorDimitri Papadopoulos <dimitri.papadopoulos@cea.fr>
Thu, 13 Feb 2014 15:09:30 +0100
changeset 9515 b0dd5b57d2d8
parent 9514 29987849a435
child 9516 6e2244784b7d
[dataimport, migration] more fixes in the spirit of a6c32edabc8d: [entity, metadata] huuum, use resolvable url as cwuri... And fix existing ones. Closes #3390388
dataimport.py file | annotate | diff | comparison | revisions
misc/migration/bootstrapmigration_repository.py file | annotate | diff | comparison | revisions 
--- 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
--- 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)
cubicweb