--- a/rtags.py Mon May 11 12:03:52 2009 +0200
+++ b/rtags.py Mon May 11 16:08:53 2009 +0200
@@ -41,7 +41,7 @@
raise AssertionError('either stype or rtype should have the '
'role mark ("!")')
else:
- assert tagged in ('subject', 'object'), tagged
+ assert tagged in ('subject', 'object'), repr(tagged)
return stype, otype, tagged
def _get_keys(self, stype, rtype, otype, tagged=None):
--- a/web/views/autoform.py Mon May 11 12:03:52 2009 +0200
+++ b/web/views/autoform.py Mon May 11 16:08:53 2009 +0200
@@ -60,7 +60,7 @@
X, Y = tschema, eschema
card = rschema.rproperty(X, Y, 'cardinality')[1]
composed = rschema.rproperty(X, Y, 'composite') == 'subject'
- if not cls.rcategories.get(rschema, role, X, Y):
+ if not cls.rcategories.get(X, rschema, Y, role):
if eschema.is_metadata(rschema):
category = 'generated'
elif card in '1+':
--- a/web/views/boxes.py Mon May 11 12:03:52 2009 +0200
+++ b/web/views/boxes.py Mon May 11 16:08:53 2009 +0200
@@ -53,7 +53,7 @@
else:
X, Y = tschema, eschema
card = rschema.rproperty(X, Y, 'cardinality')[1]
- if not cls.rmode.get(rschema, role, X, Y):
+ if not cls.rmode.get(X, rschema, Y, role):
if card in '?1':
# by default, suppose link mode if cardinality doesn't allow
# more than one relation
--- a/web/views/primary.py Mon May 11 12:03:52 2009 +0200
+++ b/web/views/primary.py Mon May 11 16:08:53 2009 +0200
@@ -43,7 +43,7 @@
X, Y = tschema, eschema
card = rschema.rproperty(X, Y, 'cardinality')[1]
composed = rschema.rproperty(X, Y, 'composite') == 'subject'
- displayinfo = cls.rdisplay.get(rschema, role, X, Y)
+ displayinfo = cls.rdisplay.get(X, rschema, Y, role)
if displayinfo is None:
if rschema.is_final():
if rschema.meta or tschema.type in ('Password', 'Bytes'):