Merge pull request #1515 from NCEAS/develop

Merge the develop branch to main branch for 2.15.0 (third time)

CONTRIBUTING.md

@@ -45,12 +45,12 @@ In short:
 
 Development is managed through the git repository at https://github.com/NCEAS/metacat.  The repository is organized into several branches, each with a specific purpose.  
 
-**master**. The `master` branch represents a stable branch that is constantly maintained in a state ready for release. Any unreleased code changes on the master branch represent changes that have been tested and staged for the next release. When a set of features are mature and tested and ready for release, they are merged onto the `master` branch to await the next release.  The tip of the master branch always represents the set of features that have been staged for the next release. The version number in all configuration files and the README on the master branch follows [semantic versioning](https://semver.org/) and should always be set to either:
+**main**. The `main` branch represents a stable branch that is constantly maintained in a state ready for release. Any unreleased code changes on the main branch represent changes that have been tested and staged for the next release. When a set of features are mature and tested and ready for release, they are merged onto the `main` branch to await the next release.  The tip of the main branch always represents the set of features that have been staged for the next release. The version number in all configuration files and the README on the main branch follows [semantic versioning](https://semver.org/) and should always be set to either:
 
-- the current release version, if the HEAD of `master` still matches the HEAD of `releases`. For example, `2.8.5`.
+- the current release version, if the HEAD of `main` still matches the HEAD of `releases`. For example, `2.8.5`.
 - the planned next release number with a `beta` designator or release candidate `rc` designator appended as appropriate.  For example, `2.8.6-beta1` or `2.9.0-rc1`.
 
-**releases**. Releases are merged from the `master` branch to the `releases` branch, and the resulting commit is tagged with the release tag (e.g., `2.4.0`). The tip of the `releases` branch always reflects the most recent release of the software.
+**releases**. Releases are merged from the `main` branch to the `releases` branch, and the resulting commit is tagged with the release tag (e.g., `2.4.0`). The tip of the `releases` branch always reflects the most recent release of the software.
 
 **develop**. Development takes place on a single branch for integrated development and testing of the set of features
 targeting a particular release. Commits should only be pushed to this branch once they are ready to be deployed to
@@ -87,17 +87,17 @@ changes that are desired in a release are merged into the `develop` branch, we r
 the full set of tests on a clean checkout of the `develop` branch.
 
 Second, create a pull request to merge those changes from the `metacat/develop` branch
-to the `metacat/master` branch.  This pull request should be done from the `develop`
+to the `metacat/main` branch.  This pull request should be done from the `develop`
 branch within the Metacat repository in order to make it simple for others to
 review the changes, and to maintain a record of the development branch commits.
 This pull request will be reviewed by another developer, and, after issues and
-feedback have been resolved, the pull request can be merged into master.  This
+feedback have been resolved, the pull request can be merged into main.  This
 cycle can be repeated multiple times until all features have been tested and
-merged into master.  At this point, if all features for the planned release
-have been merged to master, then the master branch can be merged to the
+merged into main.  At this point, if all features for the planned release
+have been merged to main, then the main branch can be merged to the
 `releases` branch, and tagged with the new release tag for that release. At
 this point, the tip of the `releases` branch will reflect the new release and
-the master branch is ready for work on the next release.
+the main branch is ready for work on the next release.
 
 ## Testing
 
@@ -107,12 +107,12 @@ Any new code developed should include a robust set of unit tests for each public
 method, as well as integration tests from new feature sets.  Tests should fully
 exercise the feature to ensure that it responds correctly to both good data inputs
 as well as various classes of corrupt or bad data.  All tests should pass before
-a `develop` branch is merged to master, and all tests should pass before the `master`
+a `develop` branch is merged to main, and all tests should pass before the `main`
 branch is merged to `releases` and tagged for a release.
 
 **Continuous integration**. Metacat is built upon every commit through the Jenkins
 system for [continuous integration at DataONE](https://purl.dataone.org/integration).  
-Both the `releases` and `master` branch are built and tested, and the current
+Both the `releases` and `main` branch are built and tested, and the current
 development branch is built as well.
 
 ## Code style

docs/user/metacat/source/install.rst

@@ -152,9 +152,9 @@ code to live and type::
 
   git clone https://github.com/nceas/metacat metacat
 
-The entire Metacat repository will be cloned to your local machine and the current branch is the master branch which is constantly maintained in a state ready for release. Detailed information about the code contribution please see:
+The entire Metacat repository will be cloned to your local machine and the current branch is the `main` branch which is constantly maintained in a state ready for release. Detailed information about the code contribution please see:
 
-https://github.com/NCEAS/metacat/blob/master/CONTRIBUTING.md
+https://github.com/NCEAS/metacat/blob/main/CONTRIBUTING.md
 
 Note that you do not need to create the WAR file directly because the Ant
 build-file has an "install" target that will build and deploy the WAR for you. 

metacat-index/src/main/resources/application-context-schema-org.xml

@@ -12,16 +12,21 @@
                 <![CDATA[
                 PREFIX rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
                 PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+                PREFIX list: <http://jena.hpl.hp.com/ARQ/list#>
                 PREFIX SO:   <http://schema.org/>
 
-                SELECT ( str(?description) as ?abstract )
+                SELECT (str(?member) as ?abstract)
                 WHERE {
-                    ?datasetId rdf:type       SO:Dataset .
-                    ?datasetId SO:description ?description   .
+                    ?datasetId rdf:type SO:Dataset .
+                    ?datasetId SO:description ?list .
+                    ?list list:index (?pos ?member) .
                     # Don't include referenced sub-Datasets (i.e. a Dataset in a 'hasPart' property)
                     FILTER NOT EXISTS { ?id SO:hasPart ?datasetId . }
                 }
-                    limit 1
+                order by (?pos)
+                limit 1
+
+
                 ]]>
             </value>
         </constructor-arg>
@@ -782,10 +787,19 @@
 
                     WHERE {
                         ?datasetId rdf:type SO:Dataset .
-                        ?datasetId SO:url ?url .
-                        # Don't include referenced sub-Datasets (i.e. a Dataset in a 'hasPart' property)
-                        FILTER NOT EXISTS { ?id SO:hasPart ?datasetId . }
-                    }
+                        {
+                          ?datasetId SO:url ?url .
+                          # Don't include referenced sub-Datasets (i.e. a Dataset in a 'hasPart' property)
+                          FILTER NOT EXISTS { ?id SO:hasPart ?datasetId . }
+                        }
+                        UNION
+                        {
+                          ?datasetId SO:distribution ?distribution .
+                          ?distribution rdf:type SO:DataDownload .
+                          ?distribution SO:contentUrl ?url .
+                          FILTER NOT EXISTS { ?id SO:hasPart ?datasetId . }
+                        }
+                    }    
                 ]]>
             </value>
         </constructor-arg>

metacat-index/src/main/resources/contexts/jsonldcontext_http_list.jsonld

@@ -1682,7 +1682,7 @@
         "departureTime": { "@id": "schema:departureTime"},
         "dependencies": { "@id": "schema:dependencies"},
         "depth": { "@id": "schema:depth"},
-        "description": { "@id": "schema:description"},
+        "description": { "@id": "schema:description", "@container": "@list"},    
         "device": { "@id": "schema:device"},
         "diagnosis": { "@id": "schema:diagnosis"},
         "diagram": { "@id": "schema:diagram"},