Mercurial Repository: p/roundup/code: roundup/cgi/client.py comparison

comparison roundup/cgi/client.py @ 1384:a87f59436895 maint-0.5

ported CGI fixes from HEAD

author	Richard Jones <richard@users.sourceforge.net>
date	Wed, 15 Jan 2003 22:38:14 +0000
parents	83f33642d220
children	3c9bd1faddd8

comparison

equal deleted inserted replaced

-:56c5b4509378
+:a87f59436895
-# $Id: client.py,v 1.65 2003-01-08 04:39:36 richard Exp $
+# $Id: client.py,v 1.65.2.1 2003-01-15 22:38:14 richard Exp $
 __doc__ = """
 WWW request handler (also used in the stand-alone server).
 """
 endings. Our solution is to convert all line endings to LF.
 '''
 text = text.replace('\r\n', '\n')
 return text.replace('\r', '\n')
 def parsePropsFromForm(db, cl, form, nodeid=0, num_re=re.compile('^\d+$')):
 ''' Pull properties for the given class out of the form.
 If a ":required" parameter is supplied, then the names property values
 must be supplied or a ValueError will be raised.
 required = [i.strip() for i in value.value.split(',')]
 props = {}
 keys = form.keys()
 properties = cl.getprops()
-existing_cache = {}
 for key in keys:
 # see if we're performing a special multilink action
 mlaction = 'set'
 if key.startswith(':remove:'):
 propname = key[8:]
 else:
 propname = key
 # does the property exist?
 if not properties.has_key(propname):
-if mlaction == 'remove':
+if mlaction != 'set':
-raise ValueError, 'You have submitted a remove action for'\
+raise ValueError, 'You have submitted a %s action for'\
-' the property "%s" which doesn\'t exist'%propname
+' the property "%s" which doesn\'t exist'%(mlaction,
+propname)
 continue
 proptype = properties[propname]
 # Get the form value. This value may be a MiniFieldStorage or a list
 # of MiniFieldStorages.
 value = [i.value.strip() for i in value]
 else:
 # it's a MiniFieldStorage, but may be a comma-separated list
 # of values
 value = [i.strip() for i in value.value.split(',')]
+# filter out the empty bits
+value = filter(None, value)
 else:
 # multiple values are not OK
 if isinstance(value, type([])):
 raise ValueError, 'You have submitted more than one value'\
 ' for the %s property'%propname
 # we've got a MiniFieldStorage, so pull out the value and strip
 # surrounding whitespace
 value = value.value.strip()
 if isinstance(proptype, hyperdb.String):
-if not value:
-continue
 # fix the CRLF/CR -> LF stuff
 value = fixNewlines(value)
 elif isinstance(proptype, hyperdb.Password):
 if not value:
 # ignore empty password values
 value = date.Interval(value)
 else:
 value = None
 elif isinstance(proptype, hyperdb.Link):
 # see if it's the "no selection" choice
-if value == '-1':
+if value == '-1' or not value:
 # if we're creating, just don't include this property
 if not nodeid:
 continue
 value = None
 else:
 'for property "%(propname)s": %(message)s')%{
 'propname': propname, 'message': message}
 elif isinstance(proptype, hyperdb.Multilink):
 # perform link class key value lookup if necessary
 link = proptype.classname
+link_cl = db.classes[link]
 l = []
 for entry in value:
 if not entry: continue
 if not num_re.match(entry):
 try:
-entry = db.classes[link].lookup(entry)
+entry = link_cl.lookup(entry)
 except KeyError:
 raise ValueError, _('property "%(propname)s": '
 '"%(value)s" not an entry of %(classname)s')%{
 'propname': propname, 'value': entry,
 'classname': link}
 value = l
 else:
 # we're modifying the list - get the current list of ids
 if props.has_key(propname):
 existing = props[propname]
+elif nodeid:
+existing = cl.get(nodeid, propname, [])
 else:
-existing = cl.get(nodeid, propname, [])
+existing = []
 # now either remove or add
 if mlaction == 'remove':
 # remove - handle situation where the id isn't in the list
 for entry in l:
 # this might be a new property for which there is no existing
 # value
 if not properties.has_key(propname):
 raise
+# existing may be None, which won't equate to empty strings
+if not existing and not value:
+continue
+# existing will come out unsorted in some cases
+if isinstance(proptype, hyperdb.Multilink):
+existing.sort()
 # if changed, set it
 if value != existing:
 props[propname] = value
 else:
+# don't bother setting empty/unset values
+if not value:
+continue
 props[propname] = value
 # see if all the required properties have been supplied
 if required:
 if len(required) > 1:
 else:
 p = 'property'
 raise ValueError, 'Required %s %s not supplied'%(p, ', '.join(required))
 return props

Mercurial > p > roundup > code

comparison roundup/cgi/client.py @ 1384:a87f59436895 maint-0.5