oship-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 516
committer: Eduardo César
branch nick: local
timestamp: Fri 2010-12-03 22:30:48 -0200
message:
  Corrections to "is_empty" attribute
modified:
  src/oship/openehr/rm/common/change_control/__init__.py
  src/oship/openehr/rm/composition/content/entry/__init__.py
  src/oship/openehr/rm/composition/content/entry/tests/instruction.txt


--
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/common/change_control/__init__.py'
--- src/oship/openehr/rm/common/change_control/__init__.py	2010-11-21 03:20:28 +0000
+++ src/oship/openehr/rm/common/change_control/__init__.py	2010-12-04 00:30:48 +0000
@@ -18,11 +18,11 @@
         self.uid=uid
         self.versions=versions
         self.audit=audit
-        self.versionsValid()
+        self.versions_valid()
         
-    def versionsValid(self):
-        if self.versions != None and bool(self.versions.isEmpty):
-            raise "self.version is not valid"
+    def versions_valid(self):
+        if self.versions is None or len(self.versions) == 0:
+            raise ValueError(u'versions /= Void and then not versions.is_empty')
         
     def __repr__(self):
         return "Contribution(uid=%s, version=%s, audit=%s)" % (self.uid, self.versions, self.audit)

=== modified file 'src/oship/openehr/rm/composition/content/entry/__init__.py'
--- src/oship/openehr/rm/composition/content/entry/__init__.py	2010-11-15 13:13:11 +0000
+++ src/oship/openehr/rm/composition/content/entry/__init__.py	2010-12-04 00:30:48 +0000
@@ -115,7 +115,7 @@
     grok.implements(IActivity)
 
 
-    def __init__(self,description,timing,atid,uid,atnodeid,name,atdetails,fdraudit,links):
+    def __init__(self,description,timing,atid,uid=None,atnodeid=None,name=None,atdetails=None,fdraudit=None,links=None):
         Locatable.__init__(self,uid,atnodeid,name,atdetails,fdraudit,links)
         self.description=description
         self.timing=timing
@@ -123,8 +123,8 @@
         self.actionArchetypeIdValid()
 
     def actionArchetypeIdValid(self):
-        if self.actionArchetypeId != None and self.actionArchetypeId.isEmpty:
-            raise Invalid("actionArchetypeId not valid")
+        if self.actionArchetypeId is None or len(self.actionArchetypeId) == 0:
+            raise ValueError(u'action_archetype_id /= Void and action_archetype_ids.is_empty')
 
 class InstructionDetails(Pathable):
     """
@@ -141,8 +141,8 @@
         self.activityPathValid()
 
     def activityPathValid(self):
-        if self.activityId != None and bool(self.activityId.isEmpty):
-            raise Invalid("activityId is not valid")
+        if self.activityId is None or len(self.activityId) == 0:
+            raise ValueError(u'activity_id /= Void and then not activity_id.is_empty')
 
 
 class Instruction(CareEntry):

=== modified file 'src/oship/openehr/rm/composition/content/entry/tests/instruction.txt'
--- src/oship/openehr/rm/composition/content/entry/tests/instruction.txt	2010-09-17 18:25:54 +0000
+++ src/oship/openehr/rm/composition/content/entry/tests/instruction.txt	2010-12-04 00:30:48 +0000
@@ -9,7 +9,8 @@
 >>> from oship.openehr.rm.data_structures.history import History
 >>> from oship.openehr.rm.data_structures.item_structure import ItemSingle
 >>> from oship.openehr.rm.common.generic import PartySelf
->>> tid1 = TerminologyId(u'ISO_639-1') 
+>>> tid1 = TerminologyId(u'ISO_639-1')
+>>> somestring = u'some data'
 >>> encod = CodePhrase(tid1,u'en')
 >>> lang = CodePhrase(tid1,u'UTF-8')
 >>> partySelf = PartySelf(None)
@@ -32,7 +33,7 @@
 >>> origin_date = DvDateTime(u'2009-09-09T00:00:00',0,None,None,None,None)
 >>> activityDescription = History(origin_date, ItemSingle)
 >>> activityName = DvText(u"Activity", None, u"font-family:Arial", None, None, None)
->>> activity = Activity(activityDescription,activityTiming,None,None,u'at0005',activityName,None,None,None)
+>>> activity = Activity(activityDescription,activityTiming,somestring,None,u'at0005',activityName,None,None,None)
 >>> basicInstruction = Instruction(basicInstructionNarrative,[activity],None,None,None,None,lang,encod,partySelf,None,None,None,None,u'at0004',basicInstructionName,None,None,None)
 >>> basicInstruction.narrative.value
 u'A basic instruction. It has a narrative and computable activities.'