Skip to content

Commit

Permalink
Merge pull request #1491 from NCEAS/develop
Browse files Browse the repository at this point in the history 
Second Merge for 2.14.1 from Develop
  • Loading branch information
@taojing2002
taojing2002 authored Mar 12, 2021
2 parents 9206a8a + 2bb225f commit 39eb3a7
Show file tree
Hide file tree
Showing 8 changed files with 77 additions and 50 deletions.
2 changes: 1 addition & 1 deletion metacat-index/src/test/resources/collection/collection-1.1.0-example-fieldsOperator.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<field>abstract</field>
<field>keywordsText</field>
<operator>AND</operator>
<fieldsOperator>OR</fieldsOperator>
<value>salmon</value>
<value>climate</value>
<fieldsOperator>OR</fieldsOperator>
</filter>
</definition>
</col:collection>
2 changes: 1 addition & 1 deletion ...cat-index/src/test/resources/collection/collection-1.1.0-example-filterGroup-operator.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
<filter>
<field>identifier</field>
<operator>OR</operator>
<exclude>true</exclude>
<value>urn:uuid:a843239b-6d04-4019-9835-6e3c8e3418c8</value>
<value>urn:uuid:30a28104-6814-497a-8f72-7fecb36cb721</value>
<value>urn:uuid:83b718dd-d709-466e-bf0d-0710a71e7a20</value>
<exclude>true</exclude>
</filter>
<operator>AND</operator>
</filterGroup>
Expand Down
4 changes: 2 additions & 2 deletions metacat-index/src/test/resources/collection/collection-1.1.0-example-filterGroup.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
<filter>
<field>keywords</field>
<field>attribute</field>
<value>soil layer</value>
<fieldsOperator>AND</fieldsOperator>
<value>soil layer</value>
</filter>
<dateFilter>
<field>dateUploaded</field>
<field>beginDate</field>
<fieldsOperator>AND</fieldsOperator>
<min>1800-01-01T00:00:00Z</min>
<max>2009-01-01T00:00:00Z</max>
<fieldsOperator>AND</fieldsOperator>
</dateFilter>
<booleanFilter>
<field>isPublic</field>
Expand Down
4 changes: 2 additions & 2 deletions metacat-index/src/test/resources/collection/collection-1.1.0-example2-filterGroup.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<definition>
<filter>
<field>siteText</field>
<value>America</value>
<matchSubstring>true</matchSubstring>
<value>America</value>
</filter>
<filter>
<field>keywordsText</field>
Expand All @@ -30,8 +30,8 @@
<field>westBoundCoord</field>
<max>-79</max>
</numericFilter>
<exclude>true</exclude>
<operator>AND</operator>
<exclude>true</exclude>
</filterGroup>
<operator>AND</operator>
</definition>
Expand Down
2 changes: 1 addition & 1 deletion metacat-index/src/test/resources/collection/collectionQuery-result-portal-1.1.0.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
((text:"*soil carbon*" AND ((keywords:soil AND keywords:nitrogen) OR (attribute:soil AND attribute:nitrogen)) AND (dateUploaded:[2000-01-01T00:00:00Z TO 2018-01-01T00:00:00Z] AND beginDate:[2000-01-01T00:00:00Z TO 2018-01-01T00:00:00Z]) AND isPublic:true AND numberReplicas:[1 TO *] AND -(datasource:urn\:node\:TERN OR datasource:urn\:node\:ARCTIC)) AND (-obsoletedBy:* AND formatType:METADATA))
((text:"*soil carbon*" AND (keywords:"soil layer" OR attribute:"soil layer") AND (dateUploaded:[1800-01-01T00:00:00Z TO 2009-01-01T00:00:00Z] AND beginDate:[1800-01-01T00:00:00Z TO 2009-01-01T00:00:00Z]) AND isPublic:true AND numberReplicas:[1 TO *] AND -(datasource:urn\:node\:TERN OR datasource:urn\:node\:ARCTIC)) AND (-obsoletedBy:* AND formatType:METADATA))
48 changes: 29 additions & 19 deletions metacat-index/src/test/resources/collection/portal-1.1.0-example-negation-only.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<filter>
<label>Datasets not about fish</label>
<field>abstract</field>
<value>fish</value>
<matchSubstring>true</matchSubstring>
<exclude>true</exclude>
<matchSubstring>true</matchSubstring>
<value>fish</value>
</filter>
</definition>
<logo>
Expand Down Expand Up @@ -287,45 +287,55 @@ shinyUI(fluidPage(
<label>Salmon species</label>
<field>species</field>
<operator>OR</operator>
<fieldsOperator>OR</fieldsOperator>
<exclude>false</exclude>
<fieldsOperator>OR</fieldsOperator>
<filterOptions>
<description>Salmon species, by common name</description>
</filterOptions>
<choice>
<label>Sockeye</label>
<value>Oncorhynchus nerka</value>
<image>
<identifier>urn:uuid:735dddde-d0a9-4db7-980b-491ca22a5f06</identifier>
</image>
<choiceOptions>
<image>
<identifier>urn:uuid:735dddde-d0a9-4db7-980b-491ca22a5f06</identifier>
</image>
</choiceOptions>
</choice>
<choice>
<label>Chinook</label>
<value>Oncorhynchus tshawytscha</value>
<image>
<identifier>urn:uuid:11b12b9a-5d21-4402-9d9e-42a515a38559</identifier>
</image>
<choiceOptions>
<image>
<identifier>urn:uuid:11b12b9a-5d21-4402-9d9e-42a515a38559</identifier>
</image>
</choiceOptions>
</choice>
<choice>
<label>Coho</label>
<value>Oncorhynchus kisutch</value>
<image>
<identifier>urn:uuid:1dbd6fcb-7768-4c76-8479-002cee08cd34</identifier>
</image>
<choiceOptions>
<image>
<identifier>urn:uuid:1dbd6fcb-7768-4c76-8479-002cee08cd34</identifier>
</image>
</choiceOptions>
</choice>
<choice>
<label>Chum</label>
<value>Oncorhynchus keta</value>
<image>
<identifier>urn:uuid:c463f608-6f72-404c-9796-f994411b89dd</identifier>
</image>
<choiceOptions>
<image>
<identifier>urn:uuid:c463f608-6f72-404c-9796-f994411b89dd</identifier>
</image>
</choiceOptions>
</choice>
<choice>
<label>Pink</label>
<value>Oncorhynchus gorbuscha</value>
<image>
<identifier>urn:uuid:a7401fee-b9de-4c87-9e81-0b01f6f7985f</identifier>
</image>
<choiceOptions>
<image>
<identifier>urn:uuid:a7401fee-b9de-4c87-9e81-0b01f6f7985f</identifier>
</image>
</choiceOptions>
</choice>
<chooseMultiple>true</chooseMultiple>
</choiceFilter>
Expand All @@ -343,8 +353,8 @@ shinyUI(fluidPage(
<label>Waterbody</label>
<field>site</field>
<operator>AND</operator>
<fieldsOperator>AND</fieldsOperator>
<exclude>false</exclude>
<fieldsOperator>AND</fieldsOperator>
<filterOptions>
<placeholder>Choose a waterbody</placeholder>
<icon>water</icon>
Expand Down
63 changes: 40 additions & 23 deletions metacat-index/src/test/resources/collection/portal-1.1.0-example.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,37 @@
<filter>
<label>Datasets about soil</label>
<field>text</field>
<operator>AND</operator>
<exclude>false</exclude>
<fieldsOperator>AND</fieldsOperator>
<matchSubstring>true</matchSubstring>
<value>soil carbon</value>
</filter>
<filter>
<field>keywords</field>
<field>attribute</field>
<fieldsOperator>OR</fieldsOperator>
<value>soil</value>
<value>nitrogen</value>
<operator>AND</operator>
<fieldsOperator>OR</fieldsOperator>
<value>soil layer</value>
</filter>
<dateFilter>
<field>dateUploaded</field>
<field>beginDate</field>
<fieldsOperator>OR</fieldsOperator>
<min>2000-01-01T00:00:00Z</min>
<max>2018-01-01T00:00:00Z</max>
<operator>AND</operator>
<fieldsOperator>AND</fieldsOperator>
<min>1800-01-01T00:00:00Z</min>
<max>2009-01-01T00:00:00Z</max>
</dateFilter>
<booleanFilter>
<field>isPublic</field>
<operator>AND</operator>
<fieldsOperator>AND</fieldsOperator>
<value>true</value>
</booleanFilter>
<numericFilter>
<field>numberReplicas</field>
<operator>AND</operator>
<fieldsOperator>AND</fieldsOperator>
<min>1</min>
</numericFilter>
<filterGroup>
Expand Down Expand Up @@ -322,45 +329,55 @@ shinyUI(fluidPage(
<label>Salmon species</label>
<field>species</field>
<operator>OR</operator>
<fieldsOperator>OR</fieldsOperator>
<exclude>false</exclude>
<fieldsOperator>OR</fieldsOperator>
<filterOptions>
<description>Salmon species, by common name</description>
</filterOptions>
<choice>
<label>Sockeye</label>
<value>Oncorhynchus nerka</value>
<image>
<identifier>urn:uuid:735dddde-d0a9-4db7-980b-491ca22a5f06</identifier>
</image>
<choiceOptions>
<image>
<identifier>urn:uuid:735dddde-d0a9-4db7-980b-491ca22a5f06</identifier>
</image>
</choiceOptions>
</choice>
<choice>
<label>Chinook</label>
<value>Oncorhynchus tshawytscha</value>
<image>
<identifier>urn:uuid:11b12b9a-5d21-4402-9d9e-42a515a38559</identifier>
</image>
<choiceOptions>
<image>
<identifier>urn:uuid:11b12b9a-5d21-4402-9d9e-42a515a38559</identifier>
</image>
</choiceOptions>
</choice>
<choice>
<label>Coho</label>
<value>Oncorhynchus kisutch</value>
<image>
<identifier>urn:uuid:1dbd6fcb-7768-4c76-8479-002cee08cd34</identifier>
</image>
<choiceOptions>
<image>
<identifier>urn:uuid:1dbd6fcb-7768-4c76-8479-002cee08cd34</identifier>
</image>
</choiceOptions>
</choice>
<choice>
<label>Chum</label>
<value>Oncorhynchus keta</value>
<image>
<identifier>urn:uuid:c463f608-6f72-404c-9796-f994411b89dd</identifier>
</image>
<choiceOptions>
<image>
<identifier>urn:uuid:c463f608-6f72-404c-9796-f994411b89dd</identifier>
</image>
</choiceOptions>
</choice>
<choice>
<label>Pink</label>
<value>Oncorhynchus gorbuscha</value>
<image>
<identifier>urn:uuid:a7401fee-b9de-4c87-9e81-0b01f6f7985f</identifier>
</image>
<choiceOptions>
<image>
<identifier>urn:uuid:a7401fee-b9de-4c87-9e81-0b01f6f7985f</identifier>
</image>
</choiceOptions>
</choice>
<chooseMultiple>true</chooseMultiple>
</choiceFilter>
Expand All @@ -378,8 +395,8 @@ shinyUI(fluidPage(
<label>Waterbody</label>
<field>site</field>
<operator>AND</operator>
<fieldsOperator>AND</fieldsOperator>
<exclude>false</exclude>
<fieldsOperator>AND</fieldsOperator>
<filterOptions>
<placeholder>Choose a waterbody</placeholder>
<icon>water</icon>
Expand Down
2 changes: 1 addition & 1 deletion test/edu/ucsb/nceas/metacat/dataone/MNodeQueryTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public class MNodeQueryTest extends D1NodeServiceTest {
private int tryAcccounts = 50;

private static final String collectionResult = "<str name=\"collectionQuery\">((text:*soil* AND (keywords:\"soil layer\" AND attribute:\"soil layer\") AND (dateUploaded:[1800-01-01T00:00:00Z TO 2009-01-01T00:00:00Z] AND beginDate:[1800-01-01T00:00:00Z TO 2009-01-01T00:00:00Z]) AND isPublic:true AND numberReplicas:[1 TO *]) AND (-obsoletedBy:* AND formatType:METADATA))</str>";
private static final String collectionQueryPortal110 = "((text:\"*soil carbon*\" AND ((keywords:soil AND keywords:nitrogen) OR (attribute:soil AND attribute:nitrogen)) AND (dateUploaded:[2000-01-01T00:00:00Z TO 2018-01-01T00:00:00Z] AND beginDate:[2000-01-01T00:00:00Z TO 2018-01-01T00:00:00Z]) AND isPublic:true AND numberReplicas:[1 TO *] AND -(datasource:urn\\:node\\:TERN OR datasource:urn\\:node\\:ARCTIC)) AND (-obsoletedBy:* AND formatType:METADATA))";
private static final String collectionQueryPortal110 = "((text:\"*soil carbon*\" AND (keywords:\"soil layer\" OR attribute:\"soil layer\") AND (dateUploaded:[1800-01-01T00:00:00Z TO 2009-01-01T00:00:00Z] AND beginDate:[1800-01-01T00:00:00Z TO 2009-01-01T00:00:00Z]) AND isPublic:true AND numberReplicas:[1 TO *] AND -(datasource:urn\\:node\\:TERN OR datasource:urn\\:node\\:ARCTIC)) AND (-obsoletedBy:* AND formatType:METADATA))";
private static final String collectionQueryCollection110 = "<str name=\"collectionQuery\">(((authorLastName:Kim AND -(identifier:urn\\:uuid\\:a843239b-6d04-4019-9835-6e3c8e3418c8 OR identifier:urn\\:uuid\\:30a28104-6814-497a-8f72-7fecb36cb721 OR identifier:urn\\:uuid\\:83b718dd-d709-466e-bf0d-0710a71e7a20)) OR (projectText:\"My Project\" AND keywordsText:\"Special Word\") OR (awardNumber:123 AND (beginDate:[2013-01-01T00:00:00Z TO 2020-12-31T23:59:59Z] AND endDate:[2013-01-01T00:00:00Z TO 2020-12-31T23:59:59Z]))) AND (-obsoletedBy:* AND formatType:METADATA))</str>";
private static final String baseURI = "https://cn.dataone.org/cn/v2/resolve";
private static final String longQueryFile = "test/test-queries/long-solr-query-partial.txt";
Expand Down

0 comments on commit 39eb3a7

Please sign in to comment.