Author: vbriand Date: 2011-02-03 10:59:36 +0100 (Thu, 03 Feb 2011) New Revision: 180 Url: http://chorem.org/repositories/revision/bow/180 Log: Added the redirections to the search page / home page when manually adding a bookmark or deleting a tag. Cleaned the struts.xml Removed: trunk/src/main/java/org/chorem/bow/action/AddAliasAction.java Modified: trunk/src/main/java/org/chorem/bow/action/AddUrlAction.java trunk/src/main/java/org/chorem/bow/action/DeleteTagAction.java trunk/src/main/java/org/chorem/bow/action/EditBookmarkAction.java trunk/src/main/java/org/chorem/bow/action/ModifyBookmarkAction.java trunk/src/main/resources/struts.xml trunk/src/main/webapp/jsp/inc/rightMenu.jsp Deleted: trunk/src/main/java/org/chorem/bow/action/AddAliasAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/AddAliasAction.java 2011-01-28 17:28:36 UTC (rev 179) +++ trunk/src/main/java/org/chorem/bow/action/AddAliasAction.java 2011-02-03 09:59:36 UTC (rev 180) @@ -1,62 +0,0 @@ -package org.chorem.bow.action; - -import java.util.List; - -import org.chorem.bow.Bookmark; -import org.chorem.bow.BowProxy; -import org.nuiton.wikitty.Criteria; -import org.nuiton.wikitty.WikittyProxy; -import org.nuiton.wikitty.search.Search; - -public class AddAliasAction extends BowBaseAction { - private static final long serialVersionUID = 2565840071468031758L; - protected String alias; - protected String bookmarkId; - - /** - * @return the alias - */ - public String getAlias() { - return alias; - } - - /** - * @param alias the alias to set - */ - public void setAlias(String alias) { - this.alias = alias; - } - - /** - * @return the bookmarkId - */ - public String getBookmarkId() { - return bookmarkId; - } - - /** - * @param bookmarkId the bookmarkId to set - */ - public void setBookmarkId(String bookmarkId) { - this.bookmarkId = bookmarkId; - } - - public String execute() { - if (alias != null && !alias.isEmpty()) { - WikittyProxy proxy = BowProxy.getInstance(); - Criteria criteria = Search.query().eq(Bookmark.FQ_FIELD_ALIAS, alias).criteria(); - List<Bookmark> bookmarks = proxy.findAllByCriteria(Bookmark.class, criteria).getAll(); - - if (bookmarks == null || bookmarks.isEmpty()) { - if (bookmarkId != null && !bookmarkId.isEmpty()) { - Bookmark bookmark = proxy.restore(Bookmark.class, bookmarkId); - if (bookmark != null) { - bookmark.setAlias(alias); - proxy.store(bookmark); - } - } - } - } - return SUCCESS; - } -} \ No newline at end of file Modified: trunk/src/main/java/org/chorem/bow/action/AddUrlAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/AddUrlAction.java 2011-01-28 17:28:36 UTC (rev 179) +++ trunk/src/main/java/org/chorem/bow/action/AddUrlAction.java 2011-02-03 09:59:36 UTC (rev 180) @@ -6,6 +6,7 @@ import org.chorem.bow.Bookmark; import org.chorem.bow.BookmarkActions; import org.chorem.bow.BowProxy; +import org.chorem.bow.BowUtils; import org.chorem.bow.User; import org.nuiton.wikitty.Criteria; import org.nuiton.wikitty.WikittyProxy; @@ -18,6 +19,9 @@ protected String alias; protected String tags; protected String nameAndTags; + protected String redirectTo; + protected String searchLine; + protected String fullTextLine; protected Map<String, Object> session; @@ -91,6 +95,41 @@ this.nameAndTags = nameAndTags; } + /** + * @return the redirectTo + */ + public String getRedirectTo() { + return redirectTo; + } + + /** + * @return the searchLine + */ + public String getSearchLine() { + return searchLine; + } + + /** + * @param searchLine the searchLine to set + */ + public void setSearchLine(String searchLine) { + this.searchLine = searchLine; + } + + /** + * @return the fullTextLine + */ + public String getFullTextLine() { + return fullTextLine; + } + + /** + * @param fullTextLine the fullTextLine to set + */ + public void setFullTextLine(String fullTextLine) { + this.fullTextLine = fullTextLine; + } + @Override public void setSession(Map<String, Object> session) { this.session = session; @@ -116,7 +155,11 @@ } if (bookmark != null && !bookmark.getDescription().isEmpty() && !bookmark.getEmail().isEmpty()) { proxy.store(bookmark); //Stores the bookmark if everything is ok + if (log.isDebugEnabled()) { + log.debug("Adding URL"); + } } + redirectTo = BowUtils.redirectTo(searchLine, fullTextLine); return SUCCESS; } } \ No newline at end of file Modified: trunk/src/main/java/org/chorem/bow/action/DeleteTagAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/DeleteTagAction.java 2011-01-28 17:28:36 UTC (rev 179) +++ trunk/src/main/java/org/chorem/bow/action/DeleteTagAction.java 2011-02-03 09:59:36 UTC (rev 180) @@ -2,12 +2,16 @@ import org.chorem.bow.Bookmark; import org.chorem.bow.BowProxy; +import org.chorem.bow.BowUtils; import org.nuiton.wikitty.WikittyProxy; public class DeleteTagAction extends BowBaseAction { private static final long serialVersionUID = -6174966873862161966L; protected String bookmarkId; protected String deleteTag; + protected String redirectTo; + protected String searchLine; + protected String fullTextLine; /** * @return the bookmarkId @@ -33,7 +37,42 @@ public void setDeleteTag(String deleteTag) { this.deleteTag = deleteTag; } - + + /** + * @return the searchLine + */ + public String getSearchLine() { + return searchLine; + } + + /** + * @param searchLine the searchLine to set + */ + public void setSearchLine(String searchLine) { + this.searchLine = searchLine; + } + + /** + * @return the fullTextLine + */ + public String getFullTextLine() { + return fullTextLine; + } + + /** + * @param fullTextLine the fullTextLine to set + */ + public void setFullTextLine(String fullTextLine) { + this.fullTextLine = fullTextLine; + } + + /** + * @return the redirectTo + */ + public String getRedirectTo() { + return redirectTo; + } + public String execute() { if (deleteTag != null && bookmarkId != null) { if (!bookmarkId.isEmpty()) { @@ -46,6 +85,7 @@ } } } + redirectTo = BowUtils.redirectTo(searchLine, fullTextLine); return SUCCESS; } } \ No newline at end of file Modified: trunk/src/main/java/org/chorem/bow/action/EditBookmarkAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/EditBookmarkAction.java 2011-01-28 17:28:36 UTC (rev 179) +++ trunk/src/main/java/org/chorem/bow/action/EditBookmarkAction.java 2011-02-03 09:59:36 UTC (rev 180) @@ -89,7 +89,7 @@ request.setAttribute("formAction", "/bow/modifyBookmark.action?bookmarkId=" + bookmarkId + "&searchLine=" + searchLine + "&fullTextLine=" + fullTextLine); } } - if (searchLine == null) { + if (searchLine == null || searchLine.equals("")) { BowInit.initHomePage(request, (User)session.get("user")); return "home"; } else { Modified: trunk/src/main/java/org/chorem/bow/action/ModifyBookmarkAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/ModifyBookmarkAction.java 2011-01-28 17:28:36 UTC (rev 179) +++ trunk/src/main/java/org/chorem/bow/action/ModifyBookmarkAction.java 2011-02-03 09:59:36 UTC (rev 180) @@ -3,7 +3,6 @@ import org.chorem.bow.Bookmark; import org.chorem.bow.BookmarkActions; import org.chorem.bow.BowProxy; -import org.chorem.bow.BowUtils; import org.nuiton.wikitty.Criteria; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.search.Search; @@ -17,7 +16,6 @@ protected String bookmarkId; protected String searchLine; protected String fullTextLine; - protected String redirectTo; /** * @return the link @@ -27,7 +25,7 @@ } /** - * @param url the linkto set + * @param url the link to set */ public void setLink(String link) { this.link = link; @@ -117,20 +115,6 @@ this.fullTextLine = fullTextLine; } - /** - * @return the redirectTo - */ - public String getRedirectTo() { - return redirectTo; - } - - /** - * @param redirectTo the redirectTo to set - */ - public void setRedirectTo(String redirectTo) { - this.redirectTo = redirectTo; - } - public String execute() { WikittyProxy proxy = BowProxy.getInstance(); Bookmark bookmark = proxy.restore(Bookmark.class, bookmarkId); @@ -146,8 +130,6 @@ BookmarkActions.updateBookmark(bookmark, name, link, tags, alias); proxy.store(bookmark); } - System.out.println("{{{{{{{{{{{{{{{{{{"+searchLine+"}}}}}}}}}{{{{{{{"+fullTextLine); - redirectTo = BowUtils.redirectTo(searchLine, fullTextLine); return SUCCESS; } } \ No newline at end of file Modified: trunk/src/main/resources/struts.xml =================================================================== --- trunk/src/main/resources/struts.xml 2011-01-28 17:28:36 UTC (rev 179) +++ trunk/src/main/resources/struts.xml 2011-02-03 09:59:36 UTC (rev 180) @@ -7,7 +7,7 @@ <constant name="struts.ognl.allowStaticMethodAccess" value="true" /> <!-- <default-action-ref name="" />--><!-- TODO: action à lancer quand une action n'existe pas --> - <package name="myPackage" extends="struts-default"> + <package name="login" extends="struts-default"> <action name="register_*" method="{1}" class="org.chorem.bow.action.RegisterAction"> <result name="input">/jsp/register.jsp</result> <result type="redirectAction">home</result> @@ -16,10 +16,6 @@ <result name="input">/jsp/forgotPassword.jsp</result> <result>/home.action</result> </action> - - <action name="locale" class="org.chorem.bow.action.LocaleAction"> - <result type="redirect">/jsp/login.jsp</result> - </action> <action name="login_*" method="{1}" class="org.chorem.bow.action.LoginAction"> <result name="input">/jsp/login.jsp</result> <result type="redirectAction">home</result> @@ -27,14 +23,6 @@ <action name="logout" class="org.chorem.bow.action.LogoutAction"> <result type="redirectAction">login_input</result> </action> - <action name="home" class="org.chorem.bow.action.HomeAction"> - <result name="login" type="redirectAction">login_input</result> - <result>/jsp/home.jsp</result> - </action> - <action name="addUrl" class="org.chorem.bow.action.AddUrlAction"> - <result type="redirectAction">home</result> - <!-- TODO: changer pour rediriger selon la page sur laquelle on se trouvait (home, search, ...)--> - </action> </package> <package name="bookmark" extends="struts-default"> @@ -45,7 +33,7 @@ </action> <action name="exportBookmarks" class="org.chorem.bow.action.ExportBookmarksAction" /> <action name="modifyBookmark" class="org.chorem.bow.action.ModifyBookmarkAction"> - <result type="redirect">${redirectTo}</result> + <result type="redirectAction">home</result> </action> <action name="removeBookmark" class="org.chorem.bow.action.RemoveBookmarkAction"> <result type="redirect">${redirectTo}</result> @@ -54,44 +42,60 @@ <result name="home" type="redirectAction">home</result> <result name="search">/jsp/search.jsp</result> </action> + <action name="deleteImport" class="org.chorem.bow.action.DeleteImportAction"> + <result type="redirectAction">preferences</result> + </action> + <action name="addUrl" class="org.chorem.bow.action.AddUrlAction"> + <result type="redirect">${redirectTo}</result> + </action> </package> - - <package name="toto" extends="struts-default"> + + <package name="search" extends="struts-default"> <action name="search" class="org.chorem.bow.action.SearchAction"> <result>/jsp/search.jsp</result> </action> <action name="fullText" class="org.chorem.bow.action.FullTextSearchAction"> <result>/jsp/search.jsp</result> </action> + <action name="order" class="org.chorem.bow.action.OrderAction"> + <result>/jsp/search.jsp</result> + </action> + <action name="openSearchResult" class="org.chorem.bow.action.OpenSearchResultAction"> + <result type="redirect">${redirectTo}</result> + </action> + <action name="openSearchSuggestion" class="org.chorem.bow.action.OpenSearchSuggestionAction"> + <result>/jsp/suggestions.jsp</result> + </action> + <action name="deleteSearchResults" class="org.chorem.bow.action.DeleteSearchResultsAction"> + <result type="redirectAction">home</result> + </action> + </package> + + <package name="misc" extends="struts-default"> + <action name="home" class="org.chorem.bow.action.HomeAction"> + <result name="login" type="redirectAction">login_input</result> + <result>/jsp/home.jsp</result> + </action> + <action name="locale" class="org.chorem.bow.action.LocaleAction"> + <result type="redirect">/jsp/login.jsp</result> + </action> <action name="generateToken" class="org.chorem.bow.action.GenerateTokenAction"> <result name="login" type="redirectAction">login_input</result> <result type="redirectAction">preferences</result> </action> <action name="deleteTag" class="org.chorem.bow.action.DeleteTagAction"> - <!-- TODO: changer pour rediriger selon la page sur laquelle on se trouvait (home, search, ...)--> - <result type="redirectAction">home</result> + <result type="redirect">${redirectTo}</result> </action> - <action name="addAlias" class="org.chorem.bow.action.AddAliasAction"> - <!-- TODO: changer pour rediriger selon la page sur laquelle on se trouvait (home, search, ...)--> - <result type="redirectAction">home</result> - </action> - <action name="order" class="org.chorem.bow.action.OrderAction"> - <result>/jsp/search.jsp</result> - </action> <action name="addClick" class="org.chorem.bow.action.AddClickAction"> <result name="error" type="redirectAction">home</result> <result type="redirect">${link}</result> </action> - <!-- temporary, permanent --> - <action name="*Xml"> - <result>/jsp/{1}Xml.jsp</result> + <action name="temporaryXml"> + <result>/jsp/temporaryXml.jsp</result> </action> - <action name="openSearchResult" class="org.chorem.bow.action.OpenSearchResultAction"> - <result type="redirect">${redirectTo}</result> + <action name="permanentXml"> + <result>/jsp/permanentXml.jsp</result> </action> - <action name="openSearchSuggestion" class="org.chorem.bow.action.OpenSearchSuggestionAction"> - <result>/jsp/suggestions.jsp</result> - </action> <action name="preferences" class="org.chorem.bow.action.PreferencesAction"> <result name="login" type="redirectAction">login_input</result> <result name="update" type="redirectAction">preferences</result> @@ -102,14 +106,8 @@ <result name="error">/jsp/login.jsp</result> <result>/jsp/admin.jsp</result> </action> - <action name="deleteImport" class="org.chorem.bow.action.DeleteImportAction"> - <result type="redirectAction">preferences</result> - </action> <action name="reIndexation" class="org.chorem.bow.action.ReIndexationAction"> <result>/jsp/admin.jsp</result> </action> - <action name="deleteSearchResults" class="org.chorem.bow.action.DeleteSearchResultsAction"> - <result type="redirectAction">home</result> - </action> </package> </struts> Modified: trunk/src/main/webapp/jsp/inc/rightMenu.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/rightMenu.jsp 2011-01-28 17:28:36 UTC (rev 179) +++ trunk/src/main/webapp/jsp/inc/rightMenu.jsp 2011-02-03 09:59:36 UTC (rev 180) @@ -84,6 +84,8 @@ <s:textfield key="bow.rightMenu.bookmark.alias" name="alias" value="%{#request.alias}" labelSeparator="" /><br /> <s:textfield key="bow.rightMenu.bookmark.name" name="name" value="%{#request.name}" labelSeparator="" /><br /> <s:textfield key="bow.rightMenu.bookmark.tags" name="tags" value="%{#request.tags}" labelSeparator="" /><br /><br /> + <s:hidden name="searchLine" value="%{searchLine}" /> + <s:hidden name="fullTextLine" value="%{fullTextLine}" /> <s:submit key="bow.rightMenu.bookmark.submit" /> </s:form> </div>