Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Link CINERGI Results to Original Repository #2169

Merged
merged 4 commits into from
Aug 22, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/mmw/apps/bigcz/clients/cinergi/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
from __future__ import unicode_literals
from __future__ import division

from apps.bigcz.models import Resource
from apps.bigcz.serializers import ResourceSerializer
from apps.bigcz.clients.cinergi.models import CinergiResource
from apps.bigcz.clients.cinergi.serializers import CinergiResourceSerializer

# Import catalog name and search function, so it can be exported from here
from apps.bigcz.clients.cinergi.search import CATALOG_NAME, search # NOQA

model = Resource
serializer = ResourceSerializer
model = CinergiResource
serializer = CinergiResourceSerializer
16 changes: 16 additions & 0 deletions src/mmw/apps/bigcz/clients/cinergi/models.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# -*- coding: utf-8 -*-
from __future__ import print_function
from __future__ import unicode_literals
from __future__ import division

from apps.bigcz.models import Resource


class CinergiResource(Resource):
def __init__(self, id, description, author, links, title,
created_at, updated_at, geom, cinergi_url):
super(CinergiResource, self).__init__(id, description, author, links,
title, created_at, updated_at,
geom)

self.cinergi_url = cinergi_url
20 changes: 16 additions & 4 deletions src/mmw/apps/bigcz/clients/cinergi/search.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,15 @@

from django.conf import settings

from apps.bigcz.models import Resource, ResourceLink, ResourceList, BBox
from apps.bigcz.models import ResourceLink, ResourceList, BBox
from apps.bigcz.utils import RequestTimedOutError

from apps.bigcz.clients.cinergi.models import CinergiResource


CINERGI_HOST = 'http://cinergi.sdsc.edu'
CATALOG_NAME = 'cinergi'
CATALOG_URL = 'http://cinergi.sdsc.edu/geoportal/opensearch'
CATALOG_URL = '{}/geoportal/opensearch'.format(CINERGI_HOST)
PAGE_SIZE = settings.BIGCZ_CLIENT_PAGE_SIZE


Expand Down Expand Up @@ -78,19 +81,28 @@ def parse_links(source):
return result


def parse_cinergi_url(fileid):
"""
Convert fileid to URL in CINERGI Portal
"""

return '{}/geoportal/?filter=%22{}%22'.format(CINERGI_HOST, fileid)


def parse_record(item):
source = item['_source']
geom = parse_geom(source)
links = parse_links(source)
return Resource(
return CinergiResource(
id=item['_id'],
title=source['title'],
description=source.get('description'),
author=None,
links=links,
created_at=parse_date(source.get('sys_created_dt')),
updated_at=parse_date(source.get('src_lastupdate_dt')),
geom=geom)
geom=geom,
cinergi_url=parse_cinergi_url(source.get('fileid')))


def prepare_bbox(value):
Expand Down
12 changes: 12 additions & 0 deletions src/mmw/apps/bigcz/clients/cinergi/serializers.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# -*- coding: utf-8 -*-
from __future__ import print_function
from __future__ import unicode_literals
from __future__ import division

from rest_framework.serializers import CharField

from apps.bigcz.serializers import ResourceSerializer


class CinergiResourceSerializer(ResourceSerializer):
cinergi_url = CharField()
8 changes: 8 additions & 0 deletions src/mmw/js/src/data_catalog/templates/resultDetails.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,12 @@ <h2>
<p>
{{ description }}
</p>
<p>
{% if activeCatalog == 'cinergi' %}
<a class="btn btn-secondary" href="{{ cinergi_url }}"
target="_blank" rel="noreferrer noopener">
<i class="fa fa-external-link-square"></i>&nbsp;Repository
</a>
{% endif %}
</p>
</div>