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.

Sign up for GitHub

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

CMR-7273 #69

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

CMR-7273 #69

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbb9350
CMR-7273
doug-newman-nasa Apr 9, 2021
b153c1b
Merge branch 'master' into CMR-7273
littleidiot40 Apr 13, 2021
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
4 changes: 2 additions & 2 deletions app/views/granules/eumetsat.xml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Description>The EUMETSAT EO Portal Clearinghouse OpenSearch EOP (EOPOS) Catalogue Service is the data cswDiscovery service for EUMETSAT EO Products, based on U-MARF (DataCentre).</Description>
<Tags>CEOS-OS-BP-V1.1/L1 EUMETSAT meteorology satellite weather climate OpenSearch EOP Catalogue Service EOPOS CSW catalogue service</Tags>
<Contact>[email protected]</Contact>
<Url type="application/atom+xml" template="https://eoportal.eumetsat.int/eopos?pi=<%= @dataset_id %>&amp;pw={startPage?}&amp;si={startIndex?}&amp;c={count?}&amp;bbox={geo:box?}&amp;dtstart={time:start?}&amp;dtend={time:end}&amp;iqd={eop:productQualityStatus?}<%
<Url type="application/atom+xml" template="https://navigator.eumetsat.int/eopos?pi=<%= @dataset_id %>&amp;pw={startPage?}&amp;si={startIndex?}&amp;c={count?}&amp;bbox={geo:box?}&amp;dtstart={time:start?}&amp;dtend={time:end}&amp;iqd={eop:productQualityStatus?}<%
if @client_id_model.valid? && !@client_id_model.clientId.blank? -%>&amp;clientId=<%= @client_id_model.clientId %><% end %>">
<param:Parameter name="c" value="{count}" minimum="0" minInclusive="1" maxExclusive="10001" title="Number of records to return"/>
<param:Parameter name="si" value="{startIndex}" minimum="0" minInclusive="1" maxExclusive="10001" title="Start index of records to return"/>
Expand All @@ -16,7 +16,7 @@
<param:Option value="DEGRADED" label="DEGRADED"/>
</param:Parameter>
</Url>
<Url type="application/atom+xml" template="https://eoportal.eumetsat.int/eopos?id={geo:uid}"/>
<Url type="application/atom+xml" template="https://navigator.eumetsat.int/eopos?id={geo:uid}"/>
<LongName>EUMETSAT EO Portal Clearinghouse OpenSearch Catalogue Service for Earth Observation Products (EOP)</LongName>
<Query role="example" geo:box="-170.00,-70.00,140.00,80.00" time:start="2016-05-04" time:end="2016-05-08" eop:parentIdentifier="urn:ogc:def:EOP:EUM:acronym:OASW025:fileid:EO:EUM:DAT:METOP:ASCAT25"/>
<Developer>con terra GmbH</Developer>
Expand Down
6 changes: 3 additions & 3 deletions spec/views/granules/descriptor_document_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,22 +187,22 @@
assign(:client_id_model, stub_client_id)

render
expect(rendered).to include("template=\"https://eoportal.eumetsat.int/eopos?pi=&amp;pw={startPage?}&amp;si={startIndex?}&amp;c={count?}&amp;bbox={geo:box?}&amp;dtstart={time:start?}&amp;dtend={time:end}&amp;iqd={eop:productQualityStatus?}&amp;clientId=foo\">")
expect(rendered).to include("template=\"https://navigator.eumetsat.int/eopos?pi=&amp;pw={startPage?}&amp;si={startIndex?}&amp;c={count?}&amp;bbox={geo:box?}&amp;dtstart={time:start?}&amp;dtend={time:end}&amp;iqd={eop:productQualityStatus?}&amp;clientId=foo\">")
end
it "is possible to create a collection-specific granule open search descriptor document with a blank client id" do
stub_client_id = stub_model(ClientId)
assign(:client_id_model, stub_client_id)

render
expect(rendered).to include("template=\"https://eoportal.eumetsat.int/eopos?pi=&amp;pw={startPage?}&amp;si={startIndex?}&amp;c={count?}&amp;bbox={geo:box?}&amp;dtstart={time:start?}&amp;dtend={time:end}&amp;iqd={eop:productQualityStatus?}\">")
expect(rendered).to include("template=\"https://navigator.eumetsat.int/eopos?pi=&amp;pw={startPage?}&amp;si={startIndex?}&amp;c={count?}&amp;bbox={geo:box?}&amp;dtstart={time:start?}&amp;dtend={time:end}&amp;iqd={eop:productQualityStatus?}\">")
end
it "is possible to create a collection-specific granule open search descriptor document with a whitespace client id" do
stub_client_id = stub_model(ClientId)
stub_client_id.clientId = ' '
assign(:client_id_model, stub_client_id)

render
expect(rendered).to include("template=\"https://eoportal.eumetsat.int/eopos?pi=&amp;pw={startPage?}&amp;si={startIndex?}&amp;c={count?}&amp;bbox={geo:box?}&amp;dtstart={time:start?}&amp;dtend={time:end}&amp;iqd={eop:productQualityStatus?}\">")
expect(rendered).to include("template=\"https://navigator.eumetsat.int/eopos?pi=&amp;pw={startPage?}&amp;si={startIndex?}&amp;c={count?}&amp;bbox={geo:box?}&amp;dtstart={time:start?}&amp;dtend={time:end}&amp;iqd={eop:productQualityStatus?}\">")
end
it "creates a collection-specific granule open search descriptor document with a temporal range limit of 30 days" do
stub_client_id = stub_model(ClientId)
Expand Down