[Zxsync-commits] zXSync/plugins/zaurus/util datebook.py,1.6,1.7

[<gb...@us...>]

Update of /cvsroot/zxsync/zXSync/plugins/zaurus/util
In directory sc8-pr-cvs1:/tmp/cvs-serv14983/util

Modified Files:
	datebook.py 
Log Message:
more field fixes required to land iCal support.


Index: datebook.py
===================================================================
RCS file: /cvsroot/zxsync/zXSync/plugins/zaurus/util/datebook.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** datebook.py	13 May 2003 17:58:15 -0000	1.6
--- datebook.py	5 Nov 2003 02:43:28 -0000	1.7
***************
*** 188,191 ****
--- 188,192 ----
  def xmlFromICAL( entry, rid, zaurus ):
  	"""Return a zaurus-style XML entry from a representation of an icalendar entry"""
+ 	# XXX TODO: map UIDs properly!
  	uid = entry.getField("UID")
  	startdt = entry.getField("DTSTART")
***************
*** 205,209 ****
  	# this doesn't look elegant, but it's because I don't know of any c-style assignment shortcut
  	# and I wish to avoid multiple costly getField calls
! 	zcat = entry.getField("X-ZAURUS-CATEGORY")
  	icalendar = None
  	catField = None
--- 206,210 ----
  	# this doesn't look elegant, but it's because I don't know of any c-style assignment shortcut
  	# and I wish to avoid multiple costly getField calls
! 	zcat = entry.getField("X-ZXSYNC-ZAURUS-CATEGORY")
  	icalendar = None
  	catField = None
***************
*** 212,216 ****
  	else:
  		# XXX: TODO: make this field configurable
! 		icalendar = entry.getField("X-ICAL-CALENDAR") 
  	if( icalendar ):
  		catField = " categories=\"" + str(zaurus.categories[zaurus.categoryMap[icalendar]]) + "\""
--- 213,217 ----
  	else:
  		# XXX: TODO: make this field configurable
! 		icalendar = entry.getField("X-ZXSYNC-ICAL-CALENDAR") 
  	if( icalendar ):
  		catField = " categories=\"" + str(zaurus.categories[zaurus.categoryMap[icalendar]]) + "\""
***************
*** 225,229 ****
  	xmlEntry += " uid=\""+str(uid)+"\""
  	xmlEntry += " rid=\""+str(rid)+"\""
! 	rinfo = entry.getField("X-ZAURUS-RINFO")
  	if( rinfo ):
  		xmlEntry += " rinfo=\"" + str( rinfo ) + "\""
--- 226,230 ----
  	xmlEntry += " uid=\""+str(uid)+"\""
  	xmlEntry += " rid=\""+str(rid)+"\""
! 	rinfo = entry.getField("X-ZXSYNC-ZAURUS-RINFO")
  	if( rinfo ):
  		xmlEntry += " rinfo=\"" + str( rinfo ) + "\""