mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-06 10:49:17 +00:00
Code Issues 32 Releases Wiki Activity

gis: LayerMapping: Fixed bug that would occur when mapping OFTReal fields with precision > 0 to an IntegerField.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7024 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Justin Bronn 2008-01-18 15:52:37 +00:00
parent 730b1f6d7a
commit 3dd6b422ca
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
django/contrib/gis/utils/layermapping.py
View File

@ -124,6 +124,7 @@ from django.db import models, transaction
class LayerMapError(Exception): pass class LayerMapError(Exception): pass
class InvalidString(LayerMapError): pass class InvalidString(LayerMapError): pass
class InvalidDecimal(LayerMapError): pass class InvalidDecimal(LayerMapError): pass
class InvalidInteger(LayerMapError): pass
class MissingForeignKey(LayerMapError): pass class MissingForeignKey(LayerMapError): pass
class LayerMapping(object): class LayerMapping(object):
@ -406,12 +407,12 @@ class LayerMapping(object):
if len(val) > model_field.max_length: if len(val) > model_field.max_length:
raise InvalidString('%s model field maximum string length is %s, given %s characters.' % raise InvalidString('%s model field maximum string length is %s, given %s characters.' %
(model_field.name, model_field.max_length, len(val))) (model_field.name, model_field.max_length, len(val)))
elif isinstance(ogr_field, OFTReal): elif isinstance(ogr_field, OFTReal) and isinstance(model_field, models.DecimalField):
try: try:
# Creating an instance of the Decimal value to use. # Creating an instance of the Decimal value to use.
d = Decimal(str(ogr_field.value)) d = Decimal(str(ogr_field.value))
except: except:
raise InvalidDecimal('Could not construct decimal from: %s' % ogr_field) raise InvalidDecimal('Could not construct decimal from: %s' % ogr_field.value)
# Getting the decimal value as a tuple. # Getting the decimal value as a tuple.
dtup = d.as_tuple() dtup = d.as_tuple()
@ -434,6 +435,13 @@ class LayerMapping(object):
raise InvalidDecimal('A DecimalField with max_digits %d, decimal_places %d must round to an absolute value less than 10^%d.' % raise InvalidDecimal('A DecimalField with max_digits %d, decimal_places %d must round to an absolute value less than 10^%d.' %
(model_field.max_digits, model_field.decimal_places, max_prec)) (model_field.max_digits, model_field.decimal_places, max_prec))
val = d val = d
elif isinstance(ogr_field, OFTReal) and isinstance(model_field, models.IntegerField):
# If there's an OFTReal field with precision greater than 0 is mapped to
# an IntegerField, the decimal places will be truncated.
try:
val = int(ogr_field.value)
except:
raise InvalidInteger('Could not construct integer from: %s' % ogr_field.value)
else: else:
val = ogr_field.value val = ogr_field.value
return val return val