[Pli-devel] pli-devel/pli/tags tag.py,1.12,1.13 tree.py,1.13,1.14

[Alex A. N. <ale...@us...>]

Update of /cvsroot/pli/pli-devel/pli/tags
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17778/pli/tags

Modified Files:
	tag.py tree.py 
Log Message:


Index: tag.py
===================================================================
RCS file: /cvsroot/pli/pli-devel/pli/tags/tag.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** tag.py	2 Jan 2008 22:17:24 -0000	1.12
--- tag.py	7 Mar 2008 02:06:04 -0000	1.13
***************
*** 2,6 ****
  
  __version__ = '''0.0.01'''
! __sub_version__ = '''20080102022334'''
  __copyright__ = '''(c) Alex A. Naanou 2007'''
  
--- 2,6 ----
  
  __version__ = '''0.0.01'''
! __sub_version__ = '''20080307045457'''
  __copyright__ = '''(c) Alex A. Naanou 2007'''
  
***************
*** 123,126 ****
--- 123,130 ----
  		'''
  		return self.__tag_engine__.untag(self, obj, *tags)
+ 	def tags(self, obj):
+ 		'''
+ 		'''
+ 		return self.__tag_engine__.tags(self, obj)
  	def relatedtags(self, *tags):
  		'''
***************
*** 192,195 ****
--- 196,200 ----
  				t += (tag,)
  		return t, c
+ 	##!!!
  	def _addchains(self, *chains):
  		'''
***************
*** 200,205 ****
  				t = self.chain2tags(c)
  				if self.__chain_tag__ != None:
! 					t += (self.__chain_tag__,)
! 				self._rawtag(c, *(t+(tags.TAG_TAG,)))
  	
  	# tag interface...
--- 205,213 ----
  				t = self.chain2tags(c)
  				if self.__chain_tag__ != None:
! 					self._rawtag(c, *(t+(tags.TAG_TAG, self.__chain_tag__)))
! 				else:
! 					self._rawtag(c, *(t+(tags.TAG_TAG,)))
! 				##!!! is this correct???
! 				self.__tag_engine__.link(self, c, *t)
  	
  	# tag interface...
***************
*** 479,482 ****
--- 487,494 ----
  	print tss.addtags('x', 'y', 'z')
  
+ 	# chains...
+ 	ts.tag(o0, 'aaa:bbb')
+ 
+ 	print ts.select('aaa')
  	
  

Index: tree.py
===================================================================
RCS file: /cvsroot/pli/pli-devel/pli/tags/tree.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** tree.py	2 Feb 2008 18:04:34 -0000	1.13
--- tree.py	7 Mar 2008 02:06:04 -0000	1.14
***************
*** 2,6 ****
  
  __version__ = '''0.0.01'''
! __sub_version__ = '''20080128022947'''
  __copyright__ = '''(c) Alex A. Naanou 2003'''
  
--- 2,6 ----
  
  __version__ = '''0.0.01'''
! __sub_version__ = '''20080307044349'''
  __copyright__ = '''(c) Alex A. Naanou 2003'''
  
***************
*** 115,119 ****
  		# call the interface method...
  		if hasattr(res, self.__node_constructor_callback_name__):
! 			getattr(res, self.__node_constructor_callback_name__)(getoid(res), self.__tagset__, self.__object_tags__)
  		return res
  
--- 115,119 ----
  		# call the interface method...
  		if hasattr(res, self.__node_constructor_callback_name__):
! 			getattr(res, self.__node_constructor_callback_name__)(getoid(res), self.__tagset__, self.__object_tags__ + self._tags)
  		return res
  
***************
*** 434,438 ****
  	print tree.addtags('xxx', 'yyy')
  	print tree.xxx.keys()
! 		
  
  
--- 434,443 ----
  	print tree.addtags('xxx', 'yyy')
  	print tree.xxx.keys()
! 
! 	constructor('X', A, 'fff:ggg')
! 	tree.X()
! 
! 	print tree['fff:ggg']
! 	print tree['fff']