Changeset 7

Timestamp:

Feb 13, 2008, 8:31:25 AM (16 years ago)

Author:

KOBAYASHI, Shinji

Message:

demographic class added

Location:

ruby/trunk/models

Files:

• rm.rb (modified) (1 diff)
• rm/common/archetyped.rb (modified) (4 diffs)
• rm/demographic.rb (modified) (1 diff)

ruby/trunk/models/rm.rb

@@ -12 +12 @@
 module OpenEHR
   module RM
+    autoload :Demographic, "rm/demographic.rb"
     module Common
       autoload :Resource, "rm/common/resource.rb"

ruby/trunk/models/rm/common/archetyped.rb

@@ -30 +30 @@
             raise NotImplementError, "path_unique must be implemented"
           end
-        module
+        end
         class Locatable < Pathable
           include Locater_Constants
@@ -38 +38 @@
                          feeder_audit, links, parent)
             super(parent)
-            if archetype_node_id == nil
+            if archetype_node_id.nil?
               raise ArgumentError, "null archetype_node_id"
             end
-            if name == nil
+            if name.nil?
               raise ArgumentError, "name is empty"
             end
-            if links == nil
+            if links.nil?
               raise ArgumentError, "links is empty"
             end
@@ -54 +54 @@
           end
           def item_at_path(path)
-            if @path == nil
-
+            if !@path.nil?
+              if @path == ""
+                raise ArgumentError, "path is not valid"
+              end
+            end
           end
-          def items_at_path
+          def items_at_path(path)
             raise NotImplementError, "items_at_path must be implemented"
           end
@@ -69 +72 @@
           end
           def is_archetype_root?
-            archetype_details != nil
+            !archetype_details.nil?
           end
         end

ruby/trunk/models/rm/demographic.rb

@@ -2 +2 @@
   module RM
     module Demogrphic
-
+      class Party < OpenEHR::RM::Common::Archetyped::Locatable
+        attr_reader :details, :reverse_relationships, :uid
+        attr_reader :idetities, :contacts, :relationships
+        def type
+        end
+      end
     end # of Demographic
   end # of RM