Changeset 8245

Timestamp:

02/24/10 12:51:11 (5 months ago)

Author:

ssterling

Message:

Make Solr Search the default: swapped "search" and "search2" in struts.xml and changed the FTLs for consistent screen flow.

Location:

head/ambra/webapp/src/main

Files:

• resources/struts.xml (modified) (2 diffs)
• webapp/search2/searchResults.ftl (modified) (2 diffs)
• webapp/search2/searchStart.ftl (modified) (2 diffs)
• webapp/search/searchResults.ftl (modified) (5 diffs)
• webapp/search/searchStart.ftl (modified) (1 diff)

head/ambra/webapp/src/main/resources/struts.xml

@@ -221 +221 @@
   </package>
 
-  <package name="search" extends="default" namespace="/search">
+  <package name="search" extends="default" namespace="/search2">
 
     <default-action-ref name="pageNotFound" />
@@ -261 +261 @@
     Copy of the "search" package to act as a starting point for re-engineering the search functionality.
   -->
-  <package name="search2" extends="default" namespace="/search2">
+  <package name="search2" extends="default" namespace="/search">
 
     <default-action-ref name="pageNotFound" />

head/ambra/webapp/src/main/webapp/search2/searchResults.ftl

@@ -28 +28 @@
         This URL is used for both the return link to the Advanced Search form AND the links to other pages of results.
       -->
-      <@s.url id="advancedSearchURL" includeParams="none" namespace="/search2" action="advancedSearch" />
+      <@s.url id="advancedSearchURL" includeParams="none" namespace="/search" action="advancedSearch" />
 
       <!--
@@ -90 +90 @@
   <h1>Search Results</h1>
 
-
-<h1>This FTL is in the search2 directory</h1>
-<!-- TODO: take this out, and the line above it, too.
-<#list limitToCategory as cat>
-<br/>limitToCategory: ${cat}
-</#list>
-<#list limitToJournal as issn>
-<br/>limitToJournal: ${issn}
-</#list>
-<br/>
-<#list journals as journal>
-<br/>${journal.dublinCore.title}: ${journal.eIssn}
-</#list>
--->
-
-
   <div id="search-results">
 

head/ambra/webapp/src/main/webapp/search2/searchStart.ftl

@@ -18 +18 @@
   limitations under the License.
 -->
-
-<h1>This FTL is in the search2 directory</h1>
-
 
 <#assign checkedstr = "checked=\"checked\"">
@@ -70 +67 @@
       </div>
     </#if>
-    <@s.url id="advSearchURL" includeParams="none" namespace="/search2" action="advancedSearch" />
+    <@s.url id="advSearchURL" includeParams="none" namespace="/search" action="advancedSearch" />
     <form id="advSearchForm" name="advSearchForm" onsubmit="return true;" action="${advSearchURL}"
           method="post" enctype="multipart/form-data" class="advSearch" title="Advanced Search">

head/ambra/webapp/src/main/webapp/search/searchResults.ftl

@@ -29 +29 @@
     <#if (startPage gt 0) >
       <#if limitToJournalAsString??>
-        <@s.url id="prevPageURL" action="simpleSearch" namespace="/search" startPage="${startPage - 1}" pageSize="${pageSize}" query="${query}" journalOpt="${journalOpt}" limitToJournal="${limitToJournalAsString}" includeParams="none"/>
-      <#else>
-        <@s.url id="prevPageURL" action="simpleSearch" namespace="/search" startPage="${startPage - 1}" pageSize="${pageSize}" query="${query}" journalOpt="${journalOpt}" includeParams="none"/>
+        <@s.url id="prevPageURL" action="simpleSearch" namespace="/search2" startPage="${startPage - 1}" pageSize="${pageSize}" query="${query}" journalOpt="${journalOpt}" limitToJournal="${limitToJournalAsString}" includeParams="none"/>
+      <#else>
+        <@s.url id="prevPageURL" action="simpleSearch" namespace="/search2" startPage="${startPage - 1}" pageSize="${pageSize}" query="${query}" journalOpt="${journalOpt}" includeParams="none"/>
       </#if>
       <@s.a href="%{prevPageURL}">&lt; Prev</@s.a> |
@@ -40 +40 @@
       <#else>
         <#if limitToJournalAsString??>
-          <@s.url id="searchPageURL" action="simpleSearch" namespace="/search" startPage="${pageNumber - 1}" pageSize="${pageSize}" query="${query}" journalOpt="${journalOpt}" limitToJournal="${limitToJournalAsString}" includeParams="none"/>
+          <@s.url id="searchPageURL" action="simpleSearch" namespace="/search2" startPage="${pageNumber - 1}" pageSize="${pageSize}" query="${query}" journalOpt="${journalOpt}" limitToJournal="${limitToJournalAsString}" includeParams="none"/>
         <#else>
-          <@s.url id="searchPageURL" action="simpleSearch" namespace="/search" startPage="${pageNumber - 1}" pageSize="${pageSize}" query="${query}" journalOpt="${journalOpt}" includeParams="none"/>
+          <@s.url id="searchPageURL" action="simpleSearch" namespace="/search2" startPage="${pageNumber - 1}" pageSize="${pageSize}" query="${query}" journalOpt="${journalOpt}" includeParams="none"/>
         </#if>
         <@s.a href="%{searchPageURL}">${pageNumber}</@s.a>
@@ -50 +50 @@
     <#if hasMore == 1>
       <#if limitToJournalAsString??>
-        <@s.url id="nextPageURL" action="simpleSearch" namespace="/search" startPage="${startPage + 1}" pageSize="${pageSize}" query="${query}" journalOpt="${journalOpt}" limitToJournal="${limitToJournalAsString}" includeParams="none"/>
-      <#else>
-        <@s.url id="nextPageURL" action="simpleSearch" namespace="/search" startPage="${startPage + 1}" pageSize="${pageSize}" query="${query}" journalOpt="${journalOpt}" includeParams="none"/>
+        <@s.url id="nextPageURL" action="simpleSearch" namespace="/search2" startPage="${startPage + 1}" pageSize="${pageSize}" query="${query}" journalOpt="${journalOpt}" limitToJournal="${limitToJournalAsString}" includeParams="none"/>
+      <#else>
+        <@s.url id="nextPageURL" action="simpleSearch" namespace="/search2" startPage="${startPage + 1}" pageSize="${pageSize}" query="${query}" journalOpt="${journalOpt}" includeParams="none"/>
       </#if>
       | <@s.a href="%{nextPageURL}"> Next &gt;</@s.a>
@@ -121 +121 @@
     
     <@s.url id="searchHelpURL" includeParams="none" namespace="/static" action="searchHelp" />
-    <@s.url id="advancedSearchURL" includeParams="none" namespace="/search" action="advancedSearch" />
+    <@s.url id="advancedSearchURL" includeParams="none" namespace="/search2" action="advancedSearch" />
     <div id="searchMore">
       <form name="reviseSearch" action="${advancedSearchURL}" method="get">
@@ -142 +142 @@
         </#if>
       </form>
-      <form name="reviseQuery" action="${searchURL}" method="get">
+
+      <!--  TODO: This "action" should be composed dynamically, but is here hard-coded to make the old (Mulgara-based) search work.
+            TODO: The next line should read: form name="reviseQuery" action="${searchURL}" method="get"
+      -->
+      <form name="reviseQuery" action="/ambra-webapp/search2/simpleSearch.action" method="get">
         <@s.hidden name="noSearchFlag" value="set" />
         <@s.hidden name="creator" />

head/ambra/webapp/src/main/webapp/search/searchStart.ftl

@@ -66 +66 @@
       </div>
     </#if>
-    <@s.url id="advSearchURL" includeParams="none" namespace="/search" action="advancedSearch" />
+    <@s.url id="advSearchURL" includeParams="none" namespace="/search2" action="advancedSearch" />
     <form id="advSearchForm" name="advSearchForm" onsubmit="return true;" action="${advSearchURL}"
           method="post" enctype="multipart/form-data" class="advSearch" title="Advanced Search">