From 13520c1f2bf734ec3e9345cb838c4f8e8c020533 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Mon, 23 Jun 2014 11:11:23 -0400
Subject: [PATCH 1/2] Updated render logic for empty dataverse message blocks
 on the search-include, to use the more up to date code regarding permissions.

---
 src/main/webapp/search-include-fragment.xhtml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/search-include-fragment.xhtml b/src/main/webapp/search-include-fragment.xhtml
index 21de0bf0f2d..7e743d1862e 100644
--- a/src/main/webapp/search-include-fragment.xhtml
+++ b/src/main/webapp/search-include-fragment.xhtml
@@ -42,7 +42,7 @@
             </ui:fragment>
 
             <ui:fragment rendered="#{permissionServiceBean.on(SearchIncludeFragment.dataverse).canIssueCommand('CreateDataverseCommand')
-                                     or permissionServiceBean.on(SearchIncludeFragment.dataverse).canIssueCommand('CreateDatasetCommand')  }">
+                                     or permissionServiceBean.on(SearchIncludeFragment.dataverse).canIssueCommand('CreateDatasetCommand')}">
                 <h:form id="shareForm">
                     <div class="btn-group">
                         <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
@@ -227,11 +227,11 @@
                                 <!--THIS IS EMPTY / BROWSE / GUEST-->
                                 <p>This Dataverse currently has no Dataverses, Datasets, or Files. Please <h:outputLink value="/loginpage.xhtml">log in</h:outputLink> to see if you are able to add to it.</p>
                             </ui:fragment>
-                            <ui:fragment rendered="#{!dataverseSession.user.guest and !SearchIncludeFragment.allowedToClickAddData and SearchIncludeFragment.mode == SearchIncludeFragment.browseModeString}">
+                            <ui:fragment rendered="#{!dataverseSession.user.guest and !(permissionServiceBean.on(SearchIncludeFragment.dataverse).canIssueCommand('CreateDataverseCommand') or permissionServiceBean.on(SearchIncludeFragment.dataverse).canIssueCommand('CreateDatasetCommand')) and SearchIncludeFragment.mode == SearchIncludeFragment.browseModeString}">
                                 <!--THIS IS EMPTY / BROWSE / LOGGED IN / NO PERMS-->
-                                <p>This Dataverse contains restricted Datasets you are not able to access.</p>
+                                <p>This Dataverse currently has no Dataverses, Datasets, or Files. You can contact the Dataverse administrator to gain access.</p>
                             </ui:fragment>
-                            <ui:fragment rendered="#{!dataverseSession.user.guest and SearchIncludeFragment.allowedToClickAddData and SearchIncludeFragment.mode == SearchIncludeFragment.browseModeString}">
+                            <ui:fragment rendered="#{!dataverseSession.user.guest and (permissionServiceBean.on(SearchIncludeFragment.dataverse).canIssueCommand('CreateDataverseCommand') or permissionServiceBean.on(SearchIncludeFragment.dataverse).canIssueCommand('CreateDatasetCommand')) and SearchIncludeFragment.mode == SearchIncludeFragment.browseModeString}">
                                 <!--THIS IS EMPTY / BROWSE / LOGGED IN / PERMS-->
                                 <p>This Dataverse currently has no Dataverses, Datasets, or Files. You can add to it by using the Add Data button on this page.</p>
                             </ui:fragment>

From c9151d4c1f7b3364f1d7e999a279686708c07fc5 Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Mon, 23 Jun 2014 14:53:58 -0400
Subject: [PATCH 2/2] cache calls to dataverseService.findRootDataverse() #4062

---
 .../iq/dataverse/IndexServiceBean.java        | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/IndexServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/IndexServiceBean.java
index 92077ce0a0e..700a5a64ae3 100644
--- a/src/main/java/edu/harvard/iq/dataverse/IndexServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/IndexServiceBean.java
@@ -59,6 +59,7 @@ public class IndexServiceBean {
     private static final String PUBLISHED_STRING = "Published";
     private static final String UNPUBLISHED_STRING = "Unpublished";
     private static final String DRAFT_STRING = "Draft";
+    private Dataverse rootDataverseCached;
 
     public String indexAll() {
         /**
@@ -118,7 +119,7 @@ public String indexAll() {
     }
 
     public String indexDataverse(Dataverse dataverse) {
-        Dataverse rootDataverse = dataverseService.findRootDataverse();
+        Dataverse rootDataverse = findRootDataverseCached();
         if (dataverse.getId() == rootDataverse.getId()) {
             /**
              * @todo: replace hard-coded groups with real groups
@@ -843,7 +844,8 @@ public String indexUser(DataverseUser user) {
     }
 
     public List<String> findPathSegments(Dataverse dataverse, List<String> segments) {
-        if (!dataverseService.findRootDataverse().equals(dataverse)) {
+        Dataverse rootDataverse = findRootDataverseCached();
+        if (!dataverse.equals(rootDataverse)) {
             // important when creating root dataverse
             if (dataverse.getOwner() != null) {
                 findPathSegments(dataverse.getOwner(), segments);
@@ -996,4 +998,17 @@ private List<String> findSolrDocIdsForDraftFilesToDelete(Dataset datasetWithDraf
         return solrIdsOfFilesToDelete;
     }
 
+    private Dataverse findRootDataverseCached() {
+        if (rootDataverseCached != null) {
+            return rootDataverseCached;
+        } else {
+            rootDataverseCached = dataverseService.findRootDataverse();
+            if (rootDataverseCached != null) {
+                return rootDataverseCached;
+            } else {
+                throw new RuntimeException("unable to determine root dataverse");
+            }
+        }
+    }
+
 }