#6300 add Version Numbers to Search API

IQSS · Dec 6, 2019 · ad3accf · ad3accf
1 parent d5116ef
commit ad3accf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Search.java b/src/main/java/edu/harvard/iq/dataverse/api/Search.java
@@ -136,7 +136,7 @@ public Response search(
                         paginationStart,
                         dataRelatedToMe,
                         numResultsPerPage,
-                        queryEntities
+                        true //SEK get query entities always for search API 12/6/2019
                 );
             } catch (SearchException ex) {
                 Throwable cause = ex;

diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java b/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java
@@ -563,7 +563,6 @@ public JsonObjectBuilder json(boolean showRelevance, boolean showEntityIds, bool
 
         } else {
             if (this.entity.isInstanceofDataset()) {
-                System.out.print("Instance of Dataset: " + this.entity.getStorageIdentifier());
                 nullSafeJsonBuilder.add("storageIdentifier", this.entity.getStorageIdentifier());
                 Dataset ds = (Dataset) this.entity;
                 DatasetVersion dv;
@@ -587,6 +586,10 @@ public JsonObjectBuilder json(boolean showRelevance, boolean showEntityIds, bool
                 nullSafeJsonBuilder.add("subjects", subjects);
                 nullSafeJsonBuilder.add("versionId", dv.getId());
                 nullSafeJsonBuilder.add("versionState", dv.getVersionState().toString());
+                if(this.isPublishedState()){
+                    nullSafeJsonBuilder.add("majorVersion", dv.getVersionNumber());
+                    nullSafeJsonBuilder.add("minorVersion", dv.getMinorVersionNumber());
+                }
                 nullSafeJsonBuilder.add("createdAt", ds.getCreateDate());
                 nullSafeJsonBuilder.add("updatedAt", ds.getModificationTime());