Gvsd 7703

elasticsearch_app/search.py

@@ -180,6 +180,42 @@ def prepare_has_time(resource):
         return False
 
 
+def prepare_license(resource):
+    if resource.license and resource.license.name:
+        return resource.license.name
+    else:
+        return None
+
+
+def prepare_classification(layer):
+    if layer.service and layer.service.classification:
+        return layer.service.classification
+    else:
+        return None
+
+
+def prepare_caveat(layer):
+    if layer.service and layer.service.caveat:
+        return layer.service.caveat
+    else:
+        return None
+
+
+def prepare_provenance(layer):
+    if layer.service and layer.service.provenance:
+        return layer.service.provenance
+    else:
+        return None
+
+
+def prepare_poc_name(layer):
+    if layer.exchangelayer and layer.exchangelayer.exchange_service and \
+            layer.exchangelayer.exchange_service.poc_name:
+        return layer.exchangelayer.exchange_service.poc_name
+    else:
+        return None
+
+
 class LayerIndex(DocType):
     id = Integer()
     abstract = Text(
@@ -277,6 +313,37 @@ class LayerIndex(DocType):
     num_comments = Integer()
     geogig_link = Keyword()
     has_time = Boolean()
+    license = Keyword(
+        fields={
+            'text': field.Text(),
+            'english': field.Text(analyzer='english')
+        }
+    )
+    classification = Keyword(
+        fields={
+            'text': field.Text(),
+            'english': field.Text(analyzer='english')
+        }
+    )
+    caveat = Keyword(
+        fields={
+            'text': field.Text(),
+            'english': field.Text(analyzer='english')
+        }
+    )
+    provenance = Keyword(
+        fields={
+            'text': field.Text(),
+            'english': field.Text(analyzer='english')
+        }
+    )
+    poc_name = Keyword(
+        fields={
+            'text': field.Text(),
+            'english': field.Text(analyzer='english')
+        }
+    )
+
 
     class Meta:
         index = 'layer-index'
@@ -324,7 +391,12 @@ def create_layer_index(layer):
         geogig_link=layer.geogig_link,
         has_time=prepare_has_time(layer),
         references=prepare_references(layer),
-        source_host=prepare_source_host(layer)
+        source_host=prepare_source_host(layer),
+        license=prepare_license(layer),
+        classification=prepare_classification(layer),
+        caveat=prepare_caveat(layer),
+        provenance=prepare_provenance(layer),
+        poc_name=prepare_poc_name(layer),
     )
     obj.save()
     return obj.to_dict(include_meta=True)
@@ -394,6 +466,12 @@ class MapIndex(DocType):
     )
     num_ratings = Integer()
     num_comments = Integer()
+    license = Keyword(
+        fields={
+            'text': field.Text(),
+            'english': field.Text(analyzer='english')
+        }
+    )
 
     class Meta:
         index = 'map-index'
@@ -432,6 +510,7 @@ def create_map_index(map):
         regions=map.region_name_list(),
         num_ratings=prepare_num_ratings(map),
         num_comments=prepare_num_comments(map),
+        license=prepare_license(map),
     )
     obj.save()
     return obj.to_dict(include_meta=True)
@@ -501,6 +580,12 @@ class DocumentIndex(DocType):
     )
     num_ratings = Integer()
     num_comments = Integer()
+    license = Keyword(
+        fields={
+            'text': field.Text(),
+            'english': field.Text(analyzer='english')
+        }
+    )
 
     class Meta:
         index = 'document-index'
@@ -539,6 +624,7 @@ def create_document_index(document):
         regions=document.region_name_list(),
         num_ratings=prepare_num_ratings(document),
         num_comments=prepare_num_comments(document),
+        license=prepare_license(document),
     )
     obj.save()
     return obj.to_dict(include_meta=True)

elasticsearch_app/views.py

@@ -100,7 +100,12 @@ def get_facet_settings():
         'type': {'open': True, 'display': 'Type'},
         'subtype': {'open': True, 'display': 'Data Type'},
         'keywords': {'show': True},
-        'references.scheme': {'show': True, 'display': 'Service Type'}
+        'references.scheme': {'show': True, 'display': 'Service Type'},
+        'license': {'show:': True, 'display': 'License'},
+        'classification': {'show:': True, 'display': 'Classification'},
+        'caveat': {'show:': True, 'display': 'Caveat'},
+        'provenance': {'show:': True, 'display': 'Provenance'},
+        'poc_name': {'show:': True, 'display': 'PoC Name'}
     }
 
     if additional_facets:
@@ -163,7 +168,12 @@ def get_facet_fields():
         'keywords',
         'category',
         'source_host',
-        'references.scheme'
+        'references.scheme',
+        'license',
+        'classification',
+        'caveat',
+        'provenance',
+        'poc_name'
     ]
 
     if additional_facets:
@@ -264,7 +274,12 @@ def get_main_query(search, query):
         'type.text',
         'type.english',
         'references.scheme.text',
-        'references.scheme.pattern'
+        'references.scheme.pattern',
+        'license.english',
+        'classification.english',
+        'caveat.english',
+        'provenance.english',
+        'poc_name.english'
     ]
 
     # Build main query to search in fields[]