Merge branch 'develop' into 5013-add-requestor-to-submit-ds-notification

IQSS · Oct 10, 2018 · 192686f · 192686f
2 parents d12505c + 8c01a38
commit 192686f
Show file tree

Hide file tree

Showing 63 changed files with 1,835 additions and 700 deletions.
diff --git a/.gitignore b/.gitignore
@@ -44,3 +44,7 @@ conf/docker-aio/dv/install/dvinstall.zip
 conf/docker-aio/testdata/
 scripts/installer/default.config
 *.pem
+
+# do not track IntelliJ IDEA files
+.idea
+**/*.iml
diff --git a/conf/docker-dcm/0prep.sh b/conf/docker-dcm/0prep.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 
-wget https://github.com/sbgrid/data-capture-module/releases/download/0.2/dcm-0.2-0.noarch.rpm
+wget https://github.com/sbgrid/data-capture-module/releases/download/0.3/dcm-0.3-0.noarch.rpm
diff --git a/conf/docker-dcm/dcmsrv.dockerfile b/conf/docker-dcm/dcmsrv.dockerfile
@@ -1,7 +1,7 @@
 # build from repo root
 FROM centos:6
 RUN yum install -y epel-release
-ARG RPMFILE=dcm-0.2-0.noarch.rpm
+ARG RPMFILE=dcm-0.3-0.noarch.rpm
 COPY ${RPMFILE} /tmp/
 COPY bashrc /root/.bashrc
 COPY test_install.sh /root/

diff --git a/conf/docker/solr/solrconfig_master.xml b/conf/docker/solr/solrconfig_master.xml
@@ -686,13 +686,55 @@
        of SearchComponents (see below) and supports distributed
        queries across multiple shards
     -->
-  <requestHandler name="/select" class="solr.SearchHandler">
+   <requestHandler name="/select" class="solr.SearchHandler">
     <!-- default values for query parameters can be specified, these
          will be overridden by parameters in the request
       -->
     <lst name="defaults">
       <str name="echoParams">explicit</str>
       <int name="rows">10</int>
+      <str name="defType">edismax</str>
+      <float name="tie">0.075</float>
+        <str name="qf">
+            dvName^400
+            authorName^180
+            dvSubject^190
+            dvDescription^180
+            dvAffiliation^170
+            title^130
+            subject^120
+            keyword^110
+            topicClassValue^100
+            dsDescriptionValue^90
+            authorAffiliation^80
+            publicationCitation^60
+            producerName^50
+            fileName^30
+            fileDescription^30
+            variableLabel^20
+            variableName^10
+            text^1.0
+        </str>
+        <str name="pf">
+            dvName^200
+            authorName^100
+            dvSubject^100
+            dvDescription^100
+            dvAffiliation^100
+            title^75
+            subject^75
+            keyword^75
+            topicClassValue^75
+            dsDescriptionValue^75
+            authorAffiliation^75
+            publicationCitation^75
+            producerName^75
+        </str>
+        <!-- Even though this number is huge it only seems to apply a boost of ~1.5x to final result -MAD 4.9.3 -->
+        <str name="bq">
+            isHarvested:false^25000
+        </str>
+
       <!-- Default search field
          <str name="df">text</str> 
         -->
@@ -924,27 +966,6 @@
       <str name="spellcheck.collateExtendedResults">true</str>
       <str name="spellcheck.maxCollationTries">10</str>
       <str name="spellcheck.maxCollations">5</str>
-      <str name="defType">edismax</str>
-<str name="qf">
-dvName^170
-dvSubject^160
-dvDescription^150
-dvAffiliation^140
-title^130
-subject^120
-keyword^110
-topicClassValue^100
-dsDescriptionValue^90
-authorName^80
-authorAffiliation^70
-publicationCitation^60
-producerName^50
-fileName^40
-fileDescription^30
-variableLabel^20
-variableName^10
-text^1.0
-</str>
     </lst>
     <arr name="last-components">
       <str>spellcheck</str>

diff --git a/conf/docker/solr/solrconfig_slave.xml b/conf/docker/solr/solrconfig_slave.xml
@@ -686,13 +686,55 @@
        of SearchComponents (see below) and supports distributed
        queries across multiple shards
     -->
-  <requestHandler name="/select" class="solr.SearchHandler">
+   <requestHandler name="/select" class="solr.SearchHandler">
     <!-- default values for query parameters can be specified, these
          will be overridden by parameters in the request
       -->
     <lst name="defaults">
       <str name="echoParams">explicit</str>
       <int name="rows">10</int>
+      <str name="defType">edismax</str>
+      <float name="tie">0.075</float>
+        <str name="qf">
+            dvName^400
+            authorName^180
+            dvSubject^190
+            dvDescription^180
+            dvAffiliation^170
+            title^130
+            subject^120
+            keyword^110
+            topicClassValue^100
+            dsDescriptionValue^90
+            authorAffiliation^80
+            publicationCitation^60
+            producerName^50
+            fileName^30
+            fileDescription^30
+            variableLabel^20
+            variableName^10
+            text^1.0
+        </str>
+        <str name="pf">
+            dvName^200
+            authorName^100
+            dvSubject^100
+            dvDescription^100
+            dvAffiliation^100
+            title^75
+            subject^75
+            keyword^75
+            topicClassValue^75
+            dsDescriptionValue^75
+            authorAffiliation^75
+            publicationCitation^75
+            producerName^75
+        </str>
+        <!-- Even though this number is huge it only seems to apply a boost of ~1.5x to final result -MAD 4.9.3 -->
+        <str name="bq">
+            isHarvested:false^25000
+        </str>
+
       <!-- Default search field
          <str name="df">text</str> 
         -->
@@ -924,27 +966,6 @@
       <str name="spellcheck.collateExtendedResults">true</str>
       <str name="spellcheck.maxCollationTries">10</str>
       <str name="spellcheck.maxCollations">5</str>
-      <str name="defType">edismax</str>
-<str name="qf">
-dvName^170
-dvSubject^160
-dvDescription^150
-dvAffiliation^140
-title^130
-subject^120
-keyword^110
-topicClassValue^100
-dsDescriptionValue^90
-authorName^80
-authorAffiliation^70
-publicationCitation^60
-producerName^50
-fileName^40
-fileDescription^30
-variableLabel^20
-variableName^10
-text^1.0
-</str>
     </lst>
     <arr name="last-components">
       <str>spellcheck</str>

diff --git a/conf/solr/7.3.0/solrconfig.xml b/conf/solr/7.3.0/solrconfig.xml
@@ -693,6 +693,48 @@
     <lst name="defaults">
       <str name="echoParams">explicit</str>
       <int name="rows">10</int>
+      <str name="defType">edismax</str>
+      <float name="tie">0.075</float>
+        <str name="qf">
+            dvName^400
+            authorName^180
+            dvSubject^190
+            dvDescription^180
+            dvAffiliation^170
+            title^130
+            subject^120
+            keyword^110
+            topicClassValue^100
+            dsDescriptionValue^90
+            authorAffiliation^80
+            publicationCitation^60
+            producerName^50
+            fileName^30
+            fileDescription^30
+            variableLabel^20
+            variableName^10
+            text^1.0
+        </str>
+        <str name="pf">
+            dvName^200
+            authorName^100
+            dvSubject^100
+            dvDescription^100
+            dvAffiliation^100
+            title^75
+            subject^75
+            keyword^75
+            topicClassValue^75
+            dsDescriptionValue^75
+            authorAffiliation^75
+            publicationCitation^75
+            producerName^75
+        </str>
+        <!-- Even though this number is huge it only seems to apply a boost of ~1.5x to final result -MAD 4.9.3 -->
+        <str name="bq">
+            isHarvested:false^25000
+        </str>
+
       <!-- Default search field
          <str name="df">text</str> 
         -->
@@ -924,27 +966,6 @@
       <str name="spellcheck.collateExtendedResults">true</str>
       <str name="spellcheck.maxCollationTries">10</str>
       <str name="spellcheck.maxCollations">5</str>
-      <str name="defType">edismax</str>
-<str name="qf">
-dvName^170
-dvSubject^160
-dvDescription^150
-dvAffiliation^140
-title^130
-subject^120
-keyword^110
-topicClassValue^100
-dsDescriptionValue^90
-authorName^80
-authorAffiliation^70
-publicationCitation^60
-producerName^50
-fileName^40
-fileDescription^30
-variableLabel^20
-variableName^10
-text^1.0
-</str>
     </lst>
     <arr name="last-components">
       <str>spellcheck</str>

diff --git a/doc/sphinx-guides/source/api/native-api.rst b/doc/sphinx-guides/source/api/native-api.rst
@@ -513,11 +513,11 @@ Dataset Locks
 
 To check if a dataset is locked:: 
 
-    curl -H "$SERVER_URL/api/datasets/{database_id}/locks
+    curl "$SERVER_URL/api/datasets/{database_id}/locks
 
 Optionally, you can check if there's a lock of a specific type on the dataset:: 
 
-    curl -H "$SERVER_URL/api/datasets/{database_id}/locks?type={lock_type}
+    curl "$SERVER_URL/api/datasets/{database_id}/locks?type={lock_type}
 
 Currently implemented lock types are ``Ingest, Workflow, InReview, DcmUpload and pidRegister``. 
 

diff --git a/doc/sphinx-guides/source/developers/big-data-support.rst b/doc/sphinx-guides/source/developers/big-data-support.rst
@@ -25,7 +25,7 @@ Please note that S3 support for DCM is highly experimental. Files can be uploade
 Once you have installed a DCM, you will need to configure two database settings on the Dataverse side. These settings are documented in the :doc:`/installation/config` section of the Installation Guide:
 
 - ``:DataCaptureModuleUrl`` should be set to the URL of a DCM you installed.
-- ``:UploadMethods`` should be set to ``dcm/rsync+ssh``.
+- ``:UploadMethods`` should include ``dcm/rsync+ssh``.
 
 This will allow your Dataverse installation to communicate with your DCM, so that Dataverse can download rsync scripts for your users.
 
@@ -155,7 +155,7 @@ In order to see the rsync URLs, you must run this command:
 
 ``curl -X PUT -d 'rsal/rsync' http://localhost:8080/api/admin/settings/:DownloadMethods``
 
-TODO: Document these in the Installation Guide once they're final.
+..  TODO: Document these in the Installation Guide once they're final.
 
 To specify replication sites that appear in rsync URLs: