Author: thomas.heute(a)jboss.com
Date: 2008-06-25 11:38:35 -0400 (Wed, 25 Jun 2008)
New Revision: 11146
Modified:
branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp
Log:
JBPORTAL-2053: CMS Search fails when a Lucene syntax is entered but not understood by the
converter
Propagate the error in a clean manner to the user interface
Modified:
branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2008-06-25
15:38:17 UTC (rev 11145)
+++
branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2008-06-25
15:38:35 UTC (rev 11146)
@@ -55,6 +55,7 @@
import org.jboss.portal.identity.User;
import org.jboss.portal.identity.UserModule;
import org.jboss.portal.search.FederatedQuery;
+import org.jboss.portal.search.QueryConversionException;
import org.jboss.portal.search.impl.jcr.JCRQuery;
import org.jboss.portal.search.impl.jcr.JCRQueryConverter;
import org.jboss.portal.security.PortalPermission;
@@ -350,6 +351,11 @@
e.printStackTrace();
files = new ArrayList();
}
+ catch (QueryConversionException e)
+ {
+ files = new ArrayList();
+ rReq.setAttribute("conversionError", Boolean.TRUE);
+ }
rReq.setAttribute("files", files);
rReq.setAttribute("textQuery", textQuery);
Modified:
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2008-06-25
15:38:17 UTC (rev 11145)
+++
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2008-06-25
15:38:35 UTC (rev 11146)
@@ -120,4 +120,7 @@
CMS_INTRODUCTION=Introduction
CMS_HELP=The CMS Portlet displays content from the file store inside a portlet window,
or, in the case of binary content, outside of the portlet window altogether
CMS_TO_MODIFY=To modify how this portlet behaves, please
-CMS_CLICK_HERE=click here
\ No newline at end of file
+CMS_CLICK_HERE=click here
+CMS_SELECT_ACTION=Select Action
+
+CMS_QUERYERROR=The query you entered is not valid>>>>>>>
.merge-right.r11144
Modified:
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp 2008-06-25
15:38:17 UTC (rev 11145)
+++
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp 2008-06-25
15:38:35 UTC (rev 11146)
@@ -43,8 +43,16 @@
</form>
</div>
+<%
+Boolean error = (Boolean)request.getAttribute("conversionError");
+if (error != null && error)
+{
+%>
+<div class="portlet-msg-error">${n:i18n("CMS_QUERYERROR")}:
<%= request.getAttribute("textQuery") %></div>
<%
+}
+
List files = (List)request.getAttribute("files");
String createDate = "";
String modifiedDate = "";
Show replies by date