Docserver: separate models for apps and extensions

chrome/common/extensions/docs/server2/reference_resolver.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from copy import copy
 import logging
 import re
 
 from file_system import FileNotFoundError
 from third_party.json_schema_compiler.model import PropertyType
@@ skipping 100 matching lines @@
     """Resolve $ref |ref| in namespace |namespace| if not None, returning None
     if it cannot be resolved.
     """
     db_key = _MakeKey(namespace, ref)
     link = self._object_store.Get(db_key).Get()
     if link is None:
       api_list = self._api_models.GetNames()
       link = self._GetRefLink(ref, api_list, namespace)
       if link is None and namespace is not None:
         # Try to resolve the ref in the current namespace if there is one.
-        link = self._GetRefLink('%s.%s' % (namespace, ref), api_list, namespace)
+        api_list = self._api_models.GetNames()
+        link = self._GetRefLink('%s.%s' % (namespace, ref),
+                                api_list,
+                                namespace)
       if link is None:
         return None
       self._object_store.Set(db_key, link)
 
     if title is not None:
       link = copy(link)
       link['text'] = title
 
     return link
 
-  def SafeGetLink(self, ref, namespace=None, title=None):
+  def SafeGetLink(self, ref, namespace=None, title=None, path=None):
     """Resolve $ref |ref| in namespace |namespace|, or globally if None. If it
     cannot be resolved, pretend like it is a link to a type.
     """
     ref_data = self.GetLink(ref, namespace=namespace, title=title)
     if ref_data is not None:
       return ref_data
-    logging.error('$ref %s could not be resolved in namespace %s.' %
-        (ref, namespace))
+    logging.warning('Could not resolve $ref %s in namespace %s on %s.' %
+        (ref, namespace, path))
     type_name = ref.rsplit('.', 1)[-1]
     return {
       'href': '#type-%s' % type_name,
       'text': title or ref,
       'name': ref
     }