Introduce dynamic scope_path regexps Instead of relying on scope_path's being "one slash deep", we should instead allow for either: 1. scope_paths that have a pre-defined depth 2. scope_paths that can be arbitrarily deep We achieve 1 by setting an entities scope_logic to another logic module. We then recursively call getScopeDepth until we get to the topmost entity (that is, an unscoped entity). A little different is the solution to 2, since some entities can have an arbitrarily deep scope (such as Documents), we need to have some way of signaling this to getScopePattern. A clean solution is to return None, rather than a number. If None is returned, the SCOPE_PATH_ARG_PATTERN is returned as regexp instead, which will match an arbitrarily deeply nested scope. The solution for 2 requires that we return None somewhere in the scope_logic chain, the most straight forward method to do so is to override getScopeDepth anywhere such a scope is needed and make it return None. A more elegant solution however, is to set the scope_logic to that module in all entities that require it. Patch by: Sverre Rabbelier

     1

"""

     2

 This module contains useful utilities for GeoDjango.

     3

"""

     4

# Importing the utilities that depend on GDAL, if available.

     5

from django.contrib.gis.gdal import HAS_GDAL

     6

if HAS_GDAL:

     7

    from django.contrib.gis.utils.ogrinfo import ogrinfo, sample

     8

    from django.contrib.gis.utils.ogrinspect import mapping, ogrinspect

     9

    from django.contrib.gis.utils.srs import add_postgis_srs

    10

    try:

    11

        # LayerMapping requires DJANGO_SETTINGS_MODULE to be set, 

    12

        # so this needs to be in try/except.

    13

        from django.contrib.gis.utils.layermapping import LayerMapping

    14

    except:

    15

        pass

    16

    17

# Attempting to import the GeoIP class.

    18

try:

    19

    from django.contrib.gis.utils.geoip import GeoIP, GeoIPException

    20

    HAS_GEOIP = True

    21

except:

    22

    HAS_GEOIP = False

    23

    24

from django.contrib.gis.utils.wkt import precision_wkt

    25