oship-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 529
fixes bug(s): https://launchpad.net/bugs/632606
committer: Eduardo César
branch nick: local
timestamp: Mon 2011-01-03 16:31:08 -0200
message:
  Invariant enforced.
modified:
  src/oship.openehr.rm/src/oship/openehr/rm/composition/content/entry/__init__.py


--
lp:oship
https://code.launchpad.net/~oship-dev/oship/devel

Your team OSHIP Development Team is subscribed to branch lp:oship.
To unsubscribe from this branch go to https://code.launchpad.net/~oship-dev/oship/devel/+edit-subscription

=== modified file 'src/oship.openehr.rm/src/oship/openehr/rm/composition/content/entry/__init__.py'
--- src/oship.openehr.rm/src/oship/openehr/rm/composition/content/entry/__init__.py	2010-12-04 00:30:48 +0000
+++ src/oship.openehr.rm/src/oship/openehr/rm/composition/content/entry/__init__.py	2011-01-03 18:31:08 +0000
@@ -152,17 +152,26 @@
 
     grok.implements(IInstruction)
 
-    def __init__(self,narr,act,exp,wfd,protocol,gid,lang,encod,subject,provider,opart,wfid,uid,atnodeid,name,atdetails,fdraudit,links,parent=None):
-        CareEntry.__init__(self,protocol,gid,lang,encod,subject,provider,opart,wfid,uid,atnodeid,name,atdetails,fdraudit,links,parent)
+    def __init__(self,narr,act=None,exp=None,wfd=None,protocol=None,gid=None,\
+                 lang=None,encod=None,subject=None,provider=None,opart=None,\
+                 wfid=None, uid=None,atnodeid=None,name=None,atdetails=None,\
+                 fdraudit=None,links=None,parent=None):
+        CareEntry.__init__(self,protocol,gid,lang,encod,subject,provider,opart,\
+                           wfid,uid,atnodeid,name,atdetails,fdraudit,links,parent)
         self.narrative=narr
         self.activities=act
         self.expiryTime=exp
         self.wfDefinition=wfd
         self.narrative_valid()
+        self.activities_valid()
 
     def narrative_valid(self):
         if self.narrative == None:
-            raise Invalid('Narrative invalid')
+            raise ValueError('Narrative invalid')
+            
+    def activities_valid(self):
+        if self.activities != None and len(self.activities) == 0:
+            raise ValueError('activities /= Void implies not activities.is_empty should be enforced.')
 
 
 class IsmTransition(Pathable):