Skip to content

Commit f8771c5

Browse files
committed
completed copy-paste; reverted needless changes
1 parent 72ce99e commit f8771c5

File tree

3 files changed

+7
-11
lines changed

3 files changed

+7
-11
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import edu.harvard.iq.dataverse.engine.command.impl.PublishDataverseCommand;
3939
import edu.harvard.iq.dataverse.engine.command.impl.UpdateDatasetVersionCommand;
4040
import edu.harvard.iq.dataverse.export.ExportService;
41-
import edu.harvard.iq.dataverse.util.MarkupChecker;
4241
import edu.harvard.iq.dataverse.util.cache.CacheFactoryBean;
4342
import io.gdcc.spi.export.ExportException;
4443
import io.gdcc.spi.export.Exporter;
@@ -1652,12 +1651,11 @@ public void setDisplayCitation(String displayCitation) {
16521651
}
16531652

16541653
public String getDisplayTitle() {
1655-
//displayCitation = dataset.getCitation(false, workingVersion);
16561654
return displayTitle;
16571655
}
16581656

1659-
public void setDisplayTitle(String displayCitation) {
1660-
this.displayCitation = displayTitle;
1657+
public void setDisplayTitle(String displayTitle) {
1658+
this.displayTitle = displayTitle;
16611659
}
16621660

16631661
public String getDropBoxSelection() {

src/main/java/edu/harvard/iq/dataverse/dataaccess/FileAccessIO.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ private List<Path> listCachedFiles() throws IOException {
608608
datasetDirectoryPath = Paths.get(getDatasetDirectory());
609609
}
610610

611-
if (datasetDirectoryPath == null) {
611+
if (datasetDirectoryPath == null) {
612612
throw new IOException("Could not determine the filesystem directory of the parent dataset.");
613613
}
614614

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@
8686
import jakarta.ejb.Stateless;
8787
import jakarta.ejb.TransactionAttribute;
8888

89-
import static edu.harvard.iq.dataverse.DatasetField.NA_VALUE;
9089
import static jakarta.ejb.TransactionAttributeType.REQUIRES_NEW;
9190

9291
import jakarta.inject.Inject;
@@ -267,7 +266,7 @@ public Future<String> indexDataverse(Dataverse dataverse, boolean processPaths)
267266
Set<String> langs = settingsService.getConfiguredLanguages();
268267
for (ControlledVocabularyValue dataverseSubject : dataverse.getDataverseSubjects()) {
269268
String subject = dataverseSubject.getStrValue();
270-
if (!subject.equals(NA_VALUE)) {
269+
if (!subject.equals(DatasetField.NA_VALUE)) {
271270
// Index in all used languages (display and metadata languages
272271
for(String locale: langs) {
273272
solrInputDocument.addField(SearchFields.DATAVERSE_SUBJECT, dataverseSubject.getLocaleStrValue(locale));
@@ -1062,7 +1061,6 @@ public SolrInputDocuments toSolrDocs(IndexableDataset indexableDataset, Set<Long
10621061
if (datasetVersion.isInReview()) {
10631062
solrInputDocument.addField(SearchFields.PUBLICATION_STATUS, IN_REVIEW_STRING);
10641063
}
1065-
10661064
CurationStatus status = datasetVersion.getCurrentCurationStatus();
10671065
if(status != null && Strings.isNotBlank(status.getLabel())) {
10681066
solrInputDocument.addField(SearchFields.CURATION_STATUS, status.getLabel());
@@ -1260,7 +1258,7 @@ public SolrInputDocuments toSolrDocs(IndexableDataset indexableDataset, Set<Long
12601258
*/
12611259
if (dsf.getControlledVocabularyValues().isEmpty()) {
12621260
for (DatasetFieldValue dfv : dsf.getDatasetFieldValues()) {
1263-
if (dfv.getValue() == null || dfv.getValue().equals(NA_VALUE)) {
1261+
if (dfv.getValue() == null || dfv.getValue().equals(DatasetField.NA_VALUE)) {
12641262
continue;
12651263
}
12661264
solrInputDocument.addField(solrFieldSearchable, dfv.getValue());
@@ -1271,7 +1269,7 @@ public SolrInputDocuments toSolrDocs(IndexableDataset indexableDataset, Set<Long
12711269
}
12721270
} else {
12731271
for (ControlledVocabularyValue controlledVocabularyValue : dsf.getControlledVocabularyValues()) {
1274-
if (controlledVocabularyValue.getStrValue().equals(NA_VALUE)) {
1272+
if (controlledVocabularyValue.getStrValue().equals(DatasetField.NA_VALUE)) {
12751273
continue;
12761274
}
12771275

@@ -1308,7 +1306,7 @@ public SolrInputDocuments toSolrDocs(IndexableDataset indexableDataset, Set<Long
13081306
}
13091307
} else {
13101308
var values = dsf.getDisplayValues(); // for proper display of facets with &apos;
1311-
values.removeAll(Arrays.asList(NA_VALUE));
1309+
values.removeAll(Arrays.asList(DatasetField.NA_VALUE));
13121310
solrInputDocument.addField(solrFieldFacetable, values);
13131311
}
13141312
}

0 commit comments

Comments
 (0)