Changed dataverse URL in AdvancedSearchPage backing bean to use alias…

…, rather than id. Changed markup of highlighted search terms, to look a little cleaner in the browse/search cards. [ref #1111]
IQSS · Feb 24, 2015 · 27a1472 · 27a1472
1 parent 60786b4
commit 27a1472
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/AdvancedSearchPage.java b/src/main/java/edu/harvard/iq/dataverse/AdvancedSearchPage.java
@@ -77,7 +77,7 @@ public String find() throws IOException, UnsupportedEncodingException {
         String dataverseSubtree = "";
         if (dataverse != null) {
             if (!dataverse.equals(dataverseServiceBean.findRootDataverse())) {
-                dataverseSubtree = "&id=" + dataverse.getId();
+                dataverseSubtree = "&alias=" + dataverse.getAlias();
             }
         }
 

diff --git a/src/main/webapp/search-include-fragment.xhtml b/src/main/webapp/search-include-fragment.xhtml
@@ -555,12 +555,12 @@
                                     <ui:fragment rendered="#{result.highlightsAsList.size() gt 0}">
                                         <ui:repeat value="#{result.highlightsAsList}" var="highlight">
                                             <ui:repeat value="#{highlight.snippets}" var="snippet">
-                                                <br/>
-                                                <ui:param value="#{highlight.solrField.nameFacetable}:intentional" name="unfriendly"/>
-                                                <!--<h:outputText value="#{SearchIncludeFragment.getFriendlyNamesFromFilterQuery('name:intentional').get(0)}"/>-->
-                                                <!--<h:outputText value="#{SearchIncludeFragment.getFriendlyNamesFromFilterQuery(unfriendly).get(0)}: "/>-->
-                                                <h:outputText value="#{highlight.solrField.nameSearchable}: "/>
-                                                <h:outputText value="#{snippet}" escape="false"/>
+                                                <div>
+                                                    <h:outputText value="#{highlight.solrField.nameSearchable}: #{snippet}" escape="false"/>
+                                                    <ui:param value="#{highlight.solrField.nameFacetable}:intentional" name="unfriendly"/>
+                                                    <!--<h:outputText value="#{SearchIncludeFragment.getFriendlyNamesFromFilterQuery('name:intentional').get(0)}"/>-->
+                                                    <!--<h:outputText value="#{SearchIncludeFragment.getFriendlyNamesFromFilterQuery(unfriendly).get(0)}: "/>-->
+                                                </div>
                                             </ui:repeat>
                                         </ui:repeat>
                                     </ui:fragment>
@@ -641,12 +641,12 @@
                                     <ui:fragment rendered="#{result.highlightsAsList.size() > 0}">
                                         <ui:repeat value="#{result.highlightsAsList}" var="highlight">
                                             <ui:repeat value="#{highlight.snippets}" var="snippet">
-                                                <br/>
-                                                <!--<ui:param value="#{highlight.solrField.nameFacetable}:intentional" name="unfriendly"/>-->
-                                                <!--<h:outputText value="#{SearchIncludeFragment.getFriendlyNamesFromFilterQuery('name:intentional').get(0)}"/>-->
-                                                <!--<h:outputText value="#{SearchIncludeFragment.getFriendlyNamesFromFilterQuery(unfriendly).get(0)}: "/>-->
-                                                <h:outputText value="#{highlight.displayName}: "/>
-                                                <h:outputText value="#{snippet}" escape="false"/>
+                                                <div>
+                                                    <h:outputText value="#{highlight.displayName}: #{snippet}" escape="false"/>
+                                                    <!--<ui:param value="#{highlight.solrField.nameFacetable}:intentional" name="unfriendly"/>-->
+                                                    <!--<h:outputText value="#{SearchIncludeFragment.getFriendlyNamesFromFilterQuery('name:intentional').get(0)}"/>-->
+                                                    <!--<h:outputText value="#{SearchIncludeFragment.getFriendlyNamesFromFilterQuery(unfriendly).get(0)}: "/>-->
+                                                </div>
                                             </ui:repeat>
                                         </ui:repeat>
                                     </ui:fragment>
@@ -722,9 +722,9 @@
                                     <div jsf:rendered="#{result.highlightsAsList.size() > 0}">
                                         <ui:repeat value="#{result.highlightsAsList}" var="highlight">
                                             <ui:repeat value="#{highlight.snippets}" var="snippet">
-                                                <h:outputText value="#{highlight.displayName}: "/>
-                                                <h:outputText value="#{snippet}" escape="false"/>
-                                                <br/>
+                                                <div>
+                                                    <h:outputText value="#{highlight.displayName}: #{snippet}" escape="false"/>
+                                                </div>
                                             </ui:repeat>
                                         </ui:repeat>
                                     </div>