From bpoussin@users.chorem.org Wed May 4 20:32:54 2011
From: bpoussin@users.chorem.org
To: bow-commits@list.chorem.org
Subject: [Bow-commits] r277 - in trunk/bow-ui/src/main:
java/org/chorem/bow/action webapp/jsp webapp/jsp/inc
Date: Wed, 04 May 2011 20:32:54 +0200
Message-ID: <20110504183254.AFBEA5A4AB@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2129500696911327350=="
--===============2129500696911327350==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Author: bpoussin
Date: 2011-05-04 20:32:54 +0200 (Wed, 04 May 2011)
New Revision: 277
Url: http://chorem.org/repositories/revision/bow/277
Log:
correction dans le a: qui ne fonctionnait plus depuis le passage au alias pri=
ve
si l'alias public n'existe pas on affiche juste une page l'indiquant
Modified:
trunk/bow-ui/src/main/java/org/chorem/bow/action/OpenSearchResultAction.ja=
va
trunk/bow-ui/src/main/webapp/jsp/error.jsp
trunk/bow-ui/src/main/webapp/jsp/inc/errorFrame.jsp
Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/OpenSearchResultAc=
tion.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/bow-ui/src/main/java/org/chorem/bow/action/OpenSearchResultAction.j=
ava 2011-04-29 21:02:55 UTC (rev 276)
+++ trunk/bow-ui/src/main/java/org/chorem/bow/action/OpenSearchResultAction.j=
ava 2011-05-04 18:32:54 UTC (rev 277)
@@ -137,8 +137,26 @@
redirectTo =3D BowUtils.redirectTo(searchLine, null);
} else if (searchLine !=3D null && searchLine.startsWith("a:")) {
//Redirects to the requested alias
- searchLine =3D searchLine.substring(2);
- redirectTo =3D BowConfig.getInstance().getAliasUrl() + searchLin=
e;
+ String privateAlias =3D searchLine.substring(2);
+ WikittyProxy proxy =3D getBowProxy();
+ Criteria criteria =3D Search.query()
+ .eq(BowBookmark.FQ_FIELD_BOWBOOKMARK_BOWUSER, user.getWi=
kittyId())
+ .eq(BowBookmark.FQ_FIELD_BOWBOOKMARK_PRIVATEALIAS, priva=
teAlias)
+ .criteria();
+ String bookmarkId =3D proxy.findIdByCriteria(criteria);
+ // si on retrouve l'alias prive on l'utilise,
+ // sinon on espere qu'il existe un alias public portant ce nom
+ if (bookmarkId !=3D null) {
+ redirectTo =3D BowConfig.getInstance().getAliasUrl() + bookm=
arkId;
+ if (log.isDebugEnabled()) {
+ log.debug("Private alias found, redirect to: " + redirec=
tTo);
+ }
+ } else {
+ redirectTo =3D BowConfig.getInstance().getAliasUrl() + priva=
teAlias;
+ if (log.isDebugEnabled()) {
+ log.debug("Private alias not found, redirect to: " + red=
irectTo);
+ }
+ }
} else {
//Search on the chosen search engine
BowPreference pref =3D getBowSession().getPreference();
Modified: trunk/bow-ui/src/main/webapp/jsp/error.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/bow-ui/src/main/webapp/jsp/error.jsp 2011-04-29 21:02:55 UTC (rev 2=
76)
+++ trunk/bow-ui/src/main/webapp/jsp/error.jsp 2011-05-04 18:32:54 UTC (rev 2=
77)
@@ -23,22 +23,19 @@
-->
<%@page contentType=3D"text/html; charset=3DUTF-8" pageEncoding=3D"UTF-8"%>
<%@taglib prefix=3D"s" uri=3D"/struts-tags"%>
-<%--
- String techError =3D (String) request.getAttribute("errorMsgTech");
---%>
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
Modified: trunk/bow-ui/src/main/webapp/jsp/inc/errorFrame.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/bow-ui/src/main/webapp/jsp/inc/errorFrame.jsp 2011-04-29 21:02:55 U=
TC (rev 276)
+++ trunk/bow-ui/src/main/webapp/jsp/inc/errorFrame.jsp 2011-05-04 18:32:54 U=
TC (rev 277)
@@ -22,14 +22,15 @@
#L%
-->
<%@page contentType=3D"text/html; charset=3DUTF-8" pageEncoding=3D"UTF-8" %>
-<%
-String userError =3D (String)request.getAttribute("errorMsgUser");
-String techError =3D (String)request.getAttribute("errorMsgTech");
=20
-if (userError !=3D null) {
-%>
-
- <%=3DuserError%><% if (techError !=3D null) { %>
=
Detailed error :
<%=3DtechError%><% } %>
-<% } %>
+ <%
+ String userError =3D (String)request.getAttribute("errorMsgUser");
+ String techError =3D (String)request.getAttribute("errorMsgTech");
+
+ if (userError !=3D null) {
+ %>
+
+ <%=3DuserError%><% if (techError !=3D null) { %>
Detailed error :
<%=3DtechError%><% } %>
+ <% } %>
--===============2129500696911327350==--