浏览代码

HUE-1341 [search] Support for dynamic fields

Romain Rigaux 11 年之前
父节点
当前提交
f691b82
共有 2 个文件被更改,包括 9 次插入13 次删除
  1. 7 8
      apps/search/src/search/models.py
  2. 2 5
      apps/search/src/search/search_controller.py

+ 7 - 8
apps/search/src/search/models.py

@@ -15,15 +15,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-try:
-  import json
-except ImportError:
-  import simplejson as json
+
+import itertools
+import json
+import logging
+import re
 
 from datetime import datetime
 from lxml import etree
-import re
-import logging
 
 from django.db import models
 from django.utils.translation import ugettext as _, ugettext_lazy as _t
@@ -33,8 +32,8 @@ from mako.template import Template
 from search.api import SolrApi
 from search.conf import SOLR_URL
 
-LOG = logging.getLogger(__name__)
 
+LOG = logging.getLogger(__name__)
 
 
 class Facet(models.Model):
@@ -293,7 +292,7 @@ class Collection(models.Model):
     schema = etree.fromstring(solr_schema)
 
     return sorted([{'name': field.get('name'), 'type': field.get('type')}
-                   for fields in schema.iter('fields') for field in fields.iter('field')])
+                   for fields in schema.iter('fields') for field in itertools.chain(fields.iter('field'), fields.iter('dynamicField'))])
 
   @property
   def properties_dict(self):

+ 2 - 5
apps/search/src/search/search_controller.py

@@ -16,11 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-try:
-  import json
-except ImportError:
-  import simplejson as json
-
+import json
 import logging
 
 from desktop.lib.exceptions_renderable import PopupException
@@ -30,6 +26,7 @@ from search.conf import SOLR_URL
 from search.models import Collection
 from django.utils.translation import ugettext as _
 
+
 LOG = logging.getLogger(__name__)