Merge branch 'tul/merge-into-clarin-dspace' into customer/TUL

dataquest-dev · Aug 7, 2023 · 49e8c93 · 49e8c93
2 parents c88354e + 0eb8d63
commit 49e8c93
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 17 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -6,7 +6,7 @@ name: Docker images
 on:
   push:
     branches:
-      - customer/TUL
+      - dtq-dev
   pull_request:
   workflow_dispatch:
 
@@ -170,11 +170,11 @@ jobs:
           labels: ${{ steps.meta_build_cli.outputs.labels }}
 
       - name: redeploy
-        if: '!cancelled()'
+        if: 'false'
         run: |
           curl -H "Accept: application/vnd.github.everest-preview+json" \
           -H "Authorization: token ${{ secrets.DEPLOY_DEV5_GH_ACTION_DISPATCH }}" \
           --request POST \
           https://api.github.com/repos/dataquest-dev/\
           dspace-angular/actions/workflows/deploy.yml/dispatches \
-          --data "{\"ref\":\"refs/heads/customer/TUL\"}"
+          --data "{\"ref\":\"refs/heads/dtq-dev\"}"
diff --git a/dspace-api/src/test/data/dspaceFolder/config/local.cfg b/dspace-api/src/test/data/dspaceFolder/config/local.cfg
@@ -264,3 +264,4 @@ webui.browse.link.2 = subject:dc.subject.*
 
 # If the versioning is disabled Versioning Integration Tests will fail - allow it for the tests
 versioning.enabled=true
+
diff --git a/...server-webapp/src/main/java/org/dspace/app/rest/ClarinDiscoJuiceFeedsDownloadService.java b/...server-webapp/src/main/java/org/dspace/app/rest/ClarinDiscoJuiceFeedsDownloadService.java
@@ -78,11 +78,11 @@ public void afterPropertiesSet() throws Exception {
                 service = new DatabaseReader.Builder(
                         new BufferedInputStream(Files.newInputStream(Paths.get(dbfile)))).build();
             } catch (IOException e) {
-                log.error("Unable to load GeoLite Database file (" + dbfile + ")! " +
+                log.debug("ERROR: Unable to load GeoLite Database file (" + dbfile + ")! " +
                         "You may need to reinstall it. See the DSpace installation instructions for more details.", e);
             }
         } else {
-            log.error("The required 'dbfile' configuration is missing in solr-statistics.cfg!");
+            log.debug("ERROR: The required 'dbfile' configuration is missing in solr-statistics.cfg!");
         }
         locationService = service;
 
@@ -100,7 +100,7 @@ public void afterPropertiesSet() throws Exception {
     }
 
     public String createFeedsContent() {
-        log.info("Going to create feeds content.");
+        log.debug("Going to create feeds content.");
         String[] feedsConfig = configurationService.getArrayProperty("discojuice.feeds");
         String shibbolethDiscoFeedUrl = configurationService.getProperty("shibboleth.discofeed.url");
 

diff --git a/...server-webapp/src/main/java/org/dspace/app/rest/ClarinDiscoJuiceFeedsUpdateScheduler.java b/...server-webapp/src/main/java/org/dspace/app/rest/ClarinDiscoJuiceFeedsUpdateScheduler.java
@@ -53,8 +53,7 @@ public void cronJobSch() {
         if (!isAllowed) {
             return;
         }
-
-        log.info("CRON Job - going to download the discojuice feeds.");
+        log.debug("CRON Job - going to download the discojuice feeds.");
         String newFeedsContent = clarinDiscoJuiceFeedsDownloadService.createFeedsContent();
         if (isNotBlank(newFeedsContent)) {
             feedsContent = newFeedsContent;

diff --git a/dspace/config/clarin-dspace.cfg b/dspace/config/clarin-dspace.cfg
@@ -125,7 +125,8 @@ featured.service.teitok.description = A web-based platform for viewing, creating
 
 ##### Shibboleth #####
 # Turn off the discofeed, it is allowed by default
-shibboleth.discofeed.allowed = false
+# shibboleth.discofeed.allowed = false
+
 # File where is DiscoJuiceFeed response
 shibboleth.discofeed.url = https://lindat.mff.cuni.cz/Shibboleth.sso/DiscoFeed
 
@@ -148,29 +149,29 @@ statistics.cache-server.uri = http://cache-server.none
 
 
 ##### Citacepro config #####
-citace.pro.url = https://www.citacepro.com/api/dspace/citace/oai
-citace.pro.university = dspace.tul.cz
+# citace.pro.url = https://www.citacepro.com/api/dspace/citace/oai
+# citace.pro.university = dspace.tul.cz
 
 # only use true or false for the value of citace pro allowed
-citace.pro.allowed = true
+# citace.pro.allowed = true
 
 #google config
-google.analytics.key=UA-134956309-1
+# google.analytics.key =
 
 # The max number of events held in the GA buffer (default: 256)
-google.analytics.buffer.limit=256
+# google.analytics.buffer.limit = 256
 
 # Define cron for how frequently events tracked in the DSpace backend will be sent to Google Analytics
 # This MUST be enabled if you wish to use `google.analytics.api-secret` to track bitstream download statistics (and similar)
 # Cron syntax is defined at https://www.quartz-scheduler.org/api/2.3.0/org/quartz/CronTrigger.html
 # Keep in mind, changing the schedule requires rebooting your servlet container, e.g. Tomcat.
 # The below example will run this task daily, every 5 minutes
-google.analytics.cron = 0 0/1 * * * ?
+# google.analytics.cron = 0 0/1 * * * ?
 
 # Defines a Measurement Protocol API Secret to be used to track interactions which occur outside of the user's browser.
 # For example , this is required to track downloads of bitstreams. This setting is only used by Google Analytics 4.
 # For more details see https://developers.google.com/analytics/devguides/collection/protocol/ga4
-# google.analytics.api-secret = EvBfmLs_QPaKei9XRibauw
+# google.analytics.api-secret =
 
 ##### Importing #####
 import.metadata.field.not.update = dc.description.provenance, dc.date.available, dc.date.accessioned, dc.identifier.uri

diff --git a/dspace/config/dspace.cfg b/dspace/config/dspace.cfg
@@ -265,7 +265,7 @@ identifier.doi.user = username
 identifier.doi.password = password
 
 # URL for the DOI resolver.  This will be the stem for generated DOIs.
-identifier.doi.resolver = https://doi.org
+#identifier.doi.resolver = https://doi.org
 
 # DOI prefix used to mint DOIs. All DOIs minted by DSpace will use this prefix.
 # The Prefix will be assigned by the registration agency.

diff --git a/dspace/config/modules/rest.cfg b/dspace/config/modules/rest.cfg
@@ -70,6 +70,7 @@ rest.properties.exposed = citace.pro.university
 rest.properties.exposed = citace.pro.allowed
 
 
+
 #---------------------------------------------------------------#
 # These configs are used by the deprecated REST (v4-6) module   #
 #---------------------------------------------------------------#

diff --git a/dspace/config/spring/api/discovery.xml b/dspace/config/spring/api/discovery.xml
@@ -44,6 +44,9 @@
     <!-- Additional indexing plugin enables searching by supervised (true,false) -->
     <bean id="solrServiceSupervisionOrderIndexingPlugin" class="org.dspace.discovery.SolrServiceSupervisionOrderIndexingPlugin"/>
 
+    <!-- Additional indexing plugin enables searching by supervised (true,false) -->
+    <bean id="solrServiceSupervisionOrderIndexingPlugin" class="org.dspace.discovery.SolrServiceSupervisionOrderIndexingPlugin"/>
+
     <!--Bean that is used for mapping communities/collections to certain discovery configurations.-->
     <bean id="org.dspace.discovery.configuration.DiscoveryConfigurationService" class="org.dspace.discovery.configuration.DiscoveryConfigurationService">
         <property name="map">

diff --git a/dspace/config/submission-forms.xml b/dspace/config/submission-forms.xml
@@ -785,6 +785,37 @@
                     <externalsources/>
                 </relation-field>
             </row>
+            <row>
+                <relation-field>
+                    <relationship-type>isProjectOfPerson</relationship-type>
+                    <search-configuration>person</search-configuration>
+                    <repeatable>true</repeatable>
+                    <label>Investigator</label>
+                    <hint>Enter the investigator's name (Family name, Given names).</hint>
+                    <linked-metadata-field>
+                        <dc-schema>project</dc-schema>
+                        <dc-element>investigator</dc-element>
+                        <input-type>onebox</input-type>
+                    </linked-metadata-field>
+                    <externalsources>orcid</externalsources>
+                </relation-field>
+            </row>
+            <row>
+                <relation-field>
+                    <relationship-type>isProjectOfOrgUnit</relationship-type>
+                    <search-configuration>orgunit</search-configuration>
+                    <repeatable>false</repeatable>
+                    <label>Organization</label>
+                    <hint>Enter the organization's name</hint>
+                    <linked-metadata-field>
+                        <dc-schema>project</dc-schema>
+                        <dc-element>funder</dc-element>
+                        <dc-qualifier>name</dc-qualifier>
+                        <input-type>onebox</input-type>
+                    </linked-metadata-field>
+                    <externalsources/>
+                </relation-field>
+            </row>
             <row>
                 <field>
                     <dc-schema>dc</dc-schema>