223,228c223,229
<             try:
<                 link= visit_class.by_visit_key( visit_key )
<                 link.user_id= user.id
<             except SQLObjectNotFound:
<                 link= visit_class( visit_key=visit_key, user_id=user.id )
<             return SqlObjectIdentity( visit_key, user )
---
>             # try:
>             #    link= visit_class.by_visit_key( visit_key )
>             #    link.user_id= user.id
>             # except SQLObjectNotFound:
>             #    link= visit_class( visit_key=visit_key, user_id=user.id )
>             # return SqlObjectIdentity( visit_key, user )
>             self.link_identity(user, visit_key)
233a235,243
>     def link_identity(self, user, visit_key):
> 	# Link the user to the visit
>         try:
>             link= visit_class.by_visit_key( visit_key )
>             link.user_id= user.id
>         except SQLObjectNotFound:
>             link= visit_class( visit_key=visit_key, user_id=user.id )
>         return SqlObjectIdentity( visit_key, user )
>