r38 - in trunk/src/main: java/org/chorem/bow webapp - Bow-commits

28 May 2010

Author: bbrossaud
Date: 2010-05-28 15:46:00 +0200 (Fri, 28 May 2010)
New Revision: 38

Url: http://chorem.org/repositories/revision/bow/38

Log:
remove bug on javascript

Modified:
   trunk/src/main/java/org/chorem/bow/ControllerServlet.java
   trunk/src/main/webapp/home.jsp

Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java
===================================================================

--- trunk/src/main/java/org/chorem/bow/ControllerServlet.java	2010-05-28 12:47:46 UTC (rev 37)
+++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java	2010-05-28 13:46:00 UTC (rev 38)
@@ -76,6 +76,7 @@
             String token = request.getParameter("token"); // token or not
             if (token != null && !token.isEmpty()) {
                 user = checkToken(token, session);
+                log.debug(session.getAttribute("user"));
             }
             String action = request.getParameter("action");
             if (action != null) {
@@ -209,7 +210,8 @@
                 request.getRequestDispatcher("login.jsp").forward(request, response);
             }
         } catch (Exception eee) {
-            request.getRequestDispatcher("error.jsp").forward(request, response);
+            throw new ServletException("DO GET ERROR", eee);
+//            request.getRequestDispatcher("error.jsp").forward(request, response);
         }
     }
 

Modified: trunk/src/main/webapp/home.jsp
===================================================================
--- trunk/src/main/webapp/home.jsp	2010-05-28 12:47:46 UTC (rev 37)
+++ trunk/src/main/webapp/home.jsp	2010-05-28 13:46:00 UTC (rev 38)
@@ -12,13 +12,14 @@
 
 <%
             TokenActions tokenActions = (TokenActions) session.getAttribute("tokenActions");
-            String temporaryToken = tokenActions.getTemporaryToken();
-            String permanentToken = tokenActions.getPermanentToken();
             BookmarkActions bookmarkActions = (BookmarkActions) request.getAttribute("bookmarkActions");
-            String url = request.getRequestURL().toString();
-            int index = url.indexOf("home.jsp");
-            url = url.substring(0, index);
-            String version = (String) request.getAttribute("version");
+            if (tokenActions != null && bookmarkActions != null) {
+                String temporaryToken = tokenActions.getTemporaryToken();
+                String permanentToken = tokenActions.getPermanentToken();
+                String url = request.getRequestURL().toString();
+                int index = url.indexOf("home.jsp");
+                url = url.substring(0, index);
+                String version = (String) request.getAttribute("version");
 %>
 
 <html>
@@ -29,9 +30,9 @@
         <div id="table">
             <h1 class="result">Home</h1>
             <%
-                        if (bookmarkActions != null) {
-                            List<Bookmark> bookmarkList = bookmarkActions.getBookmarks();
-                            if (!bookmarkList.isEmpty()) {
+                            if (bookmarkActions != null) {
+                                List<Bookmark> bookmarkList = bookmarkActions.getBookmarks();
+                                if (!bookmarkList.isEmpty()) {
             %>
             <h2 class="result">The most used bookmarks</h2>
             <table class="result">
@@ -53,8 +54,8 @@
                     </th>
                 </tr>
                 <%
-                                                SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
-                                                for (Bookmark bookmark : bookmarkList) {
+                                                    SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
+                                                    for (Bookmark bookmark : bookmarkList) {
                 %>
                 <tr class="result">
                     <td class="result">
@@ -102,12 +103,12 @@
                     </td>
                 </tr>
                 <%
-                                                }
+                                                    }
                 %>
             </table>
             <%
-                                            List<Bookmark> lastBookmarks = bookmarkActions.getLastBookmarks();
-                                            if (!lastBookmarks.isEmpty()) {
+                                                List<Bookmark> lastBookmarks = bookmarkActions.getLastBookmarks();
+                                                if (!lastBookmarks.isEmpty()) {
             %>
             <h2 class="result">The last addition bookmarks</h2>
             <table class="result">
@@ -181,20 +182,20 @@
                 %>
             </table>
             <%
-                                            }
-                                        } else {
+                                                }
+                                            } else {
             %>
             <h2 class="result">No Bookmarks</h2>
             <%                }
-                        }
+                            }
             %>
         </div>
         <div id="menu">
             <div class="menu">
                 <ul id="meta">
                     <li><a href="bow?action=logout">Logout</a></li>
-                    <li><a href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');var%20link='<%=url%>bow?action=addUrl&token=<%=temporaryToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);void(0);">Temporary token</a></li>
-                    <li><a href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');var%20link='<%=url%>bow?action=addUrl&token=<%=permanentToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);void(0);">Current permanent token</a></li>
+                    <li><a href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');var%20link='<%=url%>bow?action=addUrl&token=<%=temporaryToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);if%20(nameAndTags!=(document.title+'|')){var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);}void(0);">Temporary token</a></li>
+                    <li><a href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');var%20link='<%=url%>bow?action=addUrl&token=<%=permanentToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);if%20(nameAndTags!=(document.title+'|')){var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);}void(0);">Current permanent token</a></li>
                     <li><a href="bow?action=generateToken">Regenerate permanent token</a></li>
                 </ul>
             </div>
@@ -213,16 +214,16 @@
             <div class="menu">
                 <div class="tagCloud">
                     <%  if (bookmarkActions != null) {
-                                    Map<String, Integer> tagsCloud = bookmarkActions.getTagsCloud();
-                                    Set<String> tags = tagsCloud.keySet();
-                                    for (String tag : tags) {
-                                        int value = tagsCloud.get(tag);
-                                        int font = bookmarkActions.getFont(value);
+                                        Map<String, Integer> tagsCloud = bookmarkActions.getTagsCloud();
+                                        Set<String> tags = tagsCloud.keySet();
+                                        for (String tag : tags) {
+                                            int value = tagsCloud.get(tag);
+                                            int font = bookmarkActions.getFont(value);
                     %>
                     <a href="bow?action=search&addTag=<%=tag%>" title="<%=value%> results" class="tag" style="font-size: <%=font%>px;"><%=tag%></a>
                     <%
+                                        }
                                     }
-                                }
                     %>
                     <form method="POST" action="bow?action=search" style="text-align: center;margin-left: 20px;">
                         <input style="float: left" type="text" name="searchLine" size="15" />
@@ -250,4 +251,5 @@
             <a shape="rect" href="http://list.chorem.org/cgi-bin/mailman/listinfo/bow-users">Support utilisateur</a>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
+<%}%>
\ No newline at end of file

    

r38 - in trunk/src/main: java/org/chorem/bow webapp

bbrossaud＠users.chorem.org

tags

participants (1)