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

#!/usr/bin/env python

     2

#

     3

# Copyright 2007 Google Inc.

     4

#

     5

# Licensed under the Apache License, Version 2.0 (the "License");

     6

# you may not use this file except in compliance with the License.

     7

# You may obtain a copy of the License at

     8

#

     9

#     http://www.apache.org/licenses/LICENSE-2.0

    10

#

    11

# Unless required by applicable law or agreed to in writing, software

    12

# distributed under the License is distributed on an "AS IS" BASIS,

    13

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    14

# See the License for the specific language governing permissions and

    15

# limitations under the License.

    16

#