file tags searchable from advanced search and dataset page #7194

doc/release-notes/7194-file-tags-search.md

@@ -0,0 +1,5 @@
+### File Tags Searchable from Advanced Search and Dataset Search.
+
+File tags ("Documentation", "Data", "Code", etc.) now appear on the Advanced Search page.
+
+Performing a search for files on the dataset page now includes file tags. (Previously, only file name and file description were searched.)

src/main/java/edu/harvard/iq/dataverse/DatasetPage.java

@@ -808,6 +808,7 @@ public Set<Long> getFileIdsInVersionFromSolr(Long datasetVersionId, String patte
             // searching on the file name ("label") and description:
             queryStrings.add(SearchUtil.constructQuery(SearchFields.FILE_NAME, pattern + "*"));
             queryStrings.add(SearchUtil.constructQuery(SearchFields.FILE_DESCRIPTION, pattern + "*"));
+            queryStrings.add(SearchUtil.constructQuery(SearchFields.FILE_TAG_SEARCHABLE, pattern + "*"));
 
             solrQuery.setQuery(SearchUtil.constructQuery(queryStrings, false));
         } else {

src/main/java/edu/harvard/iq/dataverse/search/AdvancedSearchPage.java

@@ -57,6 +57,7 @@ public class AdvancedSearchPage implements java.io.Serializable {
     private String fileFieldFiletype;
     private String fileFieldVariableName;
     private String fileFieldVariableLabel;
+    private String fileFieldFileTags;
 
     public void init() {
 
@@ -174,6 +175,10 @@ private String constructFileQuery() {
             queryStrings.add(constructQuery(SearchFields.VARIABLE_LABEL, fileFieldVariableLabel));
         }
 
+        if (StringUtils.isNotBlank(fileFieldFileTags)) {
+            queryStrings.add(constructQuery(SearchFields.FILE_TAG_SEARCHABLE, fileFieldFileTags));
+        }
+
         return constructQuery(queryStrings, true);
     }
 
@@ -319,4 +324,12 @@ public void setFileFieldVariableLabel(String fileFieldVariableLabel) {
         this.fileFieldVariableLabel = fileFieldVariableLabel;
     }
 
+    public String getFileFieldFileTags() {
+        return fileFieldFileTags;
+    }
+
+    public void setFileFieldFileTags(String fileFieldFileTags) {
+        this.fileFieldFileTags = fileFieldFileTags;
+    }
+
 }

src/main/java/propertyFiles/Bundle.properties

@@ -819,6 +819,8 @@ advanced.search.files.variableLabel.tip=A short description of the variable.
 advanced.search.datasets.persistentId.tip=The persistent identifier for the dataset.
 advanced.search.datasets.persistentId=Dataset Persistent ID
 advanced.search.datasets.persistentId.tip=The unique persistent identifier for a dataset, which can be a Handle or DOI in Dataverse.
+advanced.search.files.fileTags=File Tags
+advanced.search.files.fileTags.tip=Terms such "Documentation", "Data", or "Code" that have been applied to files.
 
 # search 
 search.datasets.literalquestion=Text of the actual, literal question asked.

src/main/webapp/search/advanced.xhtml

@@ -206,6 +206,16 @@
                                         <p:inputText id="fileFieldVariableLabel" styleClass="form-control" value="#{AdvancedSearchPage.fileFieldVariableLabel}"/>
                                     </div>
                                 </div>
+                                <div class="form-group">
+                                    <label class="col-sm-4 control-label">
+                                        #{bundle['advanced.search.files.fileTags']}
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.files.fileTags.tip']}"></span>
+                                    </label>
+                                    <div class="col-sm-6">
+                                        <p:inputText id="fileFieldFileTags" styleClass="form-control" value="#{AdvancedSearchPage.fileFieldFileTags}"/>
+                                    </div>
+                                </div>
                             </div>
                         </div>