From 9680068ed1eee6cab4367714213f8052145529b6 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 12 Aug 2014 00:11:35 -0400 Subject: v5 v6: hub, organisation & loose ends * tweak triggers * split file further * remove mod --- lib/sisu/v6/ao_doc_objects.rb | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'lib/sisu/v6/ao_doc_objects.rb') diff --git a/lib/sisu/v6/ao_doc_objects.rb b/lib/sisu/v6/ao_doc_objects.rb index 44660469..f32f28c8 100644 --- a/lib/sisu/v6/ao_doc_objects.rb +++ b/lib/sisu/v6/ao_doc_objects.rb @@ -472,19 +472,21 @@ module SiSU_AO_DocumentStructure end end class ObjectFlag - attr_accessor :obj,:is,:of,:flag,:mod,:tmp + attr_accessor :obj,:is,:of,:flag,:act,:selections,:tmp def initialize @of=:flag - @is=@obj=@flag=@mod=@tmp=nil + @is=@obj=@flag=@act=@selections=@tmp=nil end def flag(h,o=nil) of= @of #Symbol, classification - group is= :flag #Symbol, classification - specific type obj= nil #String, text content flag= h[:flag] || ((defined? o.flag) ? o.flag : nil) #String, text content - mod= h[:mod] || ((defined? o.mod) ? o.mod : nil) #String, text content + act= h[:act] || ((defined? o.act) ? o.act : nil) #String, text content + selections= h[:selections] || ((defined? o.selections) ? o.selections : nil) #String, text content tmp= h[:flag] || ((defined? o.tmp) ? o.tmp : nil) #available for processing, empty after use - @of,@is,@obj,@flag,@mod,@tmp=of,is,obj,flag,mod,tmp + @of, @is,@obj,@flag,@act,@selections,@tmp= + of,is, obj, flag, act, selections, tmp self end def flag_ocn(h,o=nil) @@ -492,9 +494,11 @@ module SiSU_AO_DocumentStructure is= :flag_ocn #Symbol, classification - specific type obj= nil #String, text content flag= h[:flag] || ((defined? o.flag) ? o.flag : nil) #String, text content - mod= h[:mod] || ((defined? o.mod) ? o.mod : nil) #String, text content + act= h[:act] || ((defined? o.act) ? o.act : nil) #String, text content + selections= h[:selections] || ((defined? o.selections) ? o.selections : nil) #String, text content tmp= h[:flag] || ((defined? o.tmp) ? o.tmp : nil) #available for processing, empty after use - @of,@is,@obj,@flag,@mod,@tmp=of,is,obj,flag,mod,tmp + @of, @is,@obj,@flag,@act,@selections,@tmp= + of,is, obj, flag, act, selections,tmp self end end -- cgit v1.2.3