IQSS#9060 IQSS#7482 review + added i18n on license facet

Recherche-Data-Gouv · Jan 18, 2024 · 69bace8 · 69bace8
1 parent 07b1646
commit 69bace8
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 6 deletions.
diff --git a/conf/solr/9.3.0/schema.xml b/conf/solr/9.3.0/schema.xml
@@ -230,7 +230,6 @@
     <!-- incomplete datasets issue 8822 -->
     <field name="datasetValid" type="boolean" stored="true" indexed="true" multiValued="false"/>
 
-    <!-- license searchable and facetable issues 9060 and 7482 -->
     <field name="license" type="string" stored="true" indexed="true" multiValued="false"/>
 
     <!--

diff --git a/doc/release-notes/9060-7482-make-licenses-searchable-faceatable.md b/doc/release-notes/9060-7482-make-licenses-searchable-faceatable.md
@@ -1,6 +1,6 @@
 ### Search by License
 
-License facet has been added and will be displayed as long as there is more one license in datasets and datafiles the result page. This facet allow you to filter by license.
-Also, Search API does handle license filtering using `fq` parameter, for example : `/api/search?q=*&fq=license%3A%22CC0+1.0%22` for CC0 1.0. See PR #10204
+A browse/search facet called "License" has been added and will be displayed as long as there is more than one license in datasets and datafiles in browse/search results. This facet allow you to filter by license such as CC0, etc.
+Also, the Search API now handles license filtering using the `fq` parameter, for example : `/api/search?q=*&fq=license%3A%22CC0+1.0%22` for CC0 1.0. See PR #10204
 
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java
@@ -1617,8 +1617,12 @@ private List<String> getDataversePathsFromSegments(List<String> dataversePathSeg
     }
 
     private void addLicenseToSolrDoc(SolrInputDocument solrInputDocument, DatasetVersion datasetVersion) {
-        if (datasetVersion != null && datasetVersion.getTermsOfUseAndAccess() != null && datasetVersion.getTermsOfUseAndAccess().getLicense() != null) {
-            solrInputDocument.addField(SearchFields.DATASET_LICENSE, datasetVersion.getTermsOfUseAndAccess().getLicense().getName());
+        if (datasetVersion != null && datasetVersion.getTermsOfUseAndAccess() != null) {
+            String licenseName = "Custom Terms";
+            if(datasetVersion.getTermsOfUseAndAccess().getLicense() != null) {
+                licenseName = datasetVersion.getTermsOfUseAndAccess().getLicense().getName();
+            }
+            solrInputDocument.addField(SearchFields.DATASET_LICENSE, licenseName);
         }
     }
 

diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java b/src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java
@@ -1243,6 +1243,12 @@ public List<String> getFriendlyNamesFromFilterQuery(String filterQuery) {
                 friendlyNames.add(friendlyName.get());
                 return friendlyNames;
             }
+        } else if (key.equals(SearchFields.DATASET_LICENSE)) {
+            try {
+                friendlyNames.add(BundleUtil.getStringFromPropertyFile("license." + valueWithoutQuotes.toLowerCase().replace(" ","_") + ".name", "License"));
+            } catch (Exception e) {
+                logger.fine(String.format("action=getFriendlyNamesFromFilterQuery cannot find friendlyName for key=%s value=%s", key, value));
+            }
         }
 
         friendlyNames.add(valueWithoutQuotes);

diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java
@@ -754,7 +754,13 @@ public SolrQueryResponse search(
                         }
 
                         localefriendlyName = metadataBlockFacet.get().getMetadataBlock().getLocaleDisplayFacet();
-                        } else {
+                    } else if (facetField.getName().equals(SearchFields.DATASET_LICENSE)) {
+                        try {
+                            localefriendlyName = BundleUtil.getStringFromPropertyFile("license." + facetFieldCount.getName().toLowerCase().replace(" ","_") + ".name", "License");
+                        } catch (Exception e) {
+                            localefriendlyName = facetFieldCount.getName();
+                        }
+                    } else {
                         try {
                            localefriendlyName = BundleUtil.getStringFromPropertyFile(facetFieldCount.getName(), "Bundle");
                         } catch (Exception e) {

diff --git a/src/main/java/propertyFiles/License.properties b/src/main/java/propertyFiles/License.properties
@@ -2,3 +2,5 @@ license.cc0_1.0.description=Creative Commons CC0 1.0 Universal Public Domain Ded
 license.cc_by_4.0.description=Creative Commons Attribution 4.0 International License.
 license.cc0_1.0.name=CC0 1.0
 license.cc_by_4.0.name=CC BY 4.0
+license.custom_terms.name=Custom Terms
+