Django

Code

Changeset 6966

Show
Ignore:
Timestamp:
12/21/07 15:36:54 (8 months ago)
Author:
jbronn
Message:

gis: Fixed #6246 (Thanks jos3ph); removed unnecessary commented debugging code.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis/django/contrib/gis/db/models/query.py

    r6919 r6966  
    3939        # for the selection format of the geometry column. 
    4040        if GEOM_SELECT: 
    41             #if oracle and hasattr(self, '_ewkt'): 
    4241            # Transformed geometries in Oracle use EWKT so that the SRID 
    4342            # on the transformed lazy geometries is set correctly). 
    44             #print '-=' * 20 
    45             #print self._ewkt, GEOM_SELECT 
    46             #self._geo_fmt = "'SRID=%d;'||%s" % (self._ewkt, GEOM_SELECT) 
    47             #self._geo_fmt = GEOM_SELECT 
    48             #else: 
    49             #print '-=' * 20 
    5043            self._geo_fmt = GEOM_SELECT 
    5144        else: 

  • django/branches/gis/django/contrib/gis/utils/ogrinspect.py

    r6688 r6966  
    111111    # Setting up the SRID parameter string. 
    112112    if srid is None: 
    113         srid = layer.srs.srid 
    114         if srid is None: 
     113        if layer.srs is None: 
    115114            srid_str = 'srid=-1' 
    116         elif srid == 4326: 
    117             # WGS84 is the default. 
    118             srid_str = '' 
    119115        else: 
    120             srid_str = 'srid=%s' % srid 
     116            srid = layer.srs.srid 
     117            if srid is None: 
     118                srid_str = 'srid=-1' 
     119            elif srid == 4326: 
     120                # WGS84 is the default. 
     121                srid_str = '' 
     122            else: 
     123                srid_str = 'srid=%s' % srid 
    121124    else: 
    122125        srid_str = 'srid=%s' % srid