Author: bbrossaud Date: 2010-08-24 10:46:04 +0200 (Tue, 24 Aug 2010) New Revision: 108 Url: http://chorem.org/repositories/revision/bow/108 Log: addition import extension to bookmark and set the import date when an import is done Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java trunk/src/main/xmi/bow.zargo Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-08-11 14:49:54 UTC (rev 107) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-08-24 08:46:04 UTC (rev 108) @@ -31,6 +31,7 @@ import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Properties; import javax.mail.Message; @@ -254,6 +255,12 @@ } this.actionChangePreferences(request, session, user); request.getRequestDispatcher("preferences.jsp").forward(request, response); + } else if (action.equals("deleteImport") && user != null) { + if (log.isDebugEnabled()) { + log.debug("Going to actionDeleteImport"); + } + this.actionDeleteImport(request, session, user); + request.getRequestDispatcher("preferences.jsp").forward(request, response); } else if (action.equals("reIndexation") && user != null) { if (log.isDebugEnabled()) { log.debug("Going to actionReIndexation"); @@ -277,7 +284,12 @@ } - /* @param request servlet request + protected void actionDeleteImport(HttpServletRequest request, + HttpSession session, User user) { + ; + } + + /* @param request servlet request * @param response servlet response * @param user the user * @param token the permanent or temporary token @@ -896,6 +908,23 @@ } } + protected void createImportExtension(List<Bookmark> bookmarks) { + if (bookmarks != null && !bookmarks.isEmpty()) { + WikittyProxy proxy = BowProxy.getInstance(); + List<String> ids = new ArrayList<String>(); + for (Bookmark bookmark : bookmarks) { + String id = bookmark.getWikittyId(); + ids.add(id); + } + Date date = new Date(); + List<Import> imports = proxy.restore(Import.class, ids); + for (Import imp : imports) { + imp.setDate(date); + } + proxy.store(imports); + } + } + /* @param request servlet request * @param response servlet response * @param user User user @@ -923,7 +952,8 @@ NodeList list = parser.parse(null); List<Bookmark> bookmarks = new ArrayList<Bookmark>(); parseHtmlToBookmarks(list, user, bookmarks, new ArrayList<String>()); - proxy.store(bookmarks); + bookmarks = proxy.store(bookmarks); + createImportExtension(bookmarks); } } } Modified: trunk/src/main/xmi/bow.zargo =================================================================== (Binary files differ)