Bow-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- 617 discussions
Author: bpoussin
Date: 2010-06-02 18:42:56 +0200 (Wed, 02 Jun 2010)
New Revision: 63
Url: http://chorem.org/repositories/revision/bow/63
Log:
pouvoir voir l'exception dans les logs, c'est tout de meme beaucoup plus facile pour comprendre les erreurs :(
Modified:
trunk/src/main/java/org/chorem/bow/ControllerServlet.java
Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-06-02 15:55:32 UTC (rev 62)
+++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-06-02 16:42:56 UTC (rev 63)
@@ -224,6 +224,7 @@
request.getRequestDispatcher("login.jsp").forward(request, response);
}
} catch (Exception eee) {
+ log.error("Can't do action", eee);
request.getRequestDispatcher("error.jsp").forward(request, response);
}
}
1
0
02 Jun '10
Author: bbrossaud
Date: 2010-06-02 17:55:32 +0200 (Wed, 02 Jun 2010)
New Revision: 62
Url: http://chorem.org/repositories/revision/bow/62
Log:
modified varaible name
Modified:
trunk/src/main/java/org/chorem/bow/ControllerServlet.java
trunk/src/main/webapp/permanentXml.jsp
Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-06-02 15:51:02 UTC (rev 61)
+++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-06-02 15:55:32 UTC (rev 62)
@@ -262,7 +262,7 @@
protected void actionOpenSearchSuggestion(HttpServletRequest request, HttpServletResponse response, User user)
throws IOException, ServletException {
if (user != null) {
- String search = request.getParameter("search");
+ String search = request.getParameter("searchLine");
if (search != null) {
OpenSearchActions openSearchActions = new OpenSearchActions();
WikittyProxy proxy = BowProxy.getInstance();
Modified: trunk/src/main/webapp/permanentXml.jsp
===================================================================
--- trunk/src/main/webapp/permanentXml.jsp 2010-06-02 15:51:02 UTC (rev 61)
+++ trunk/src/main/webapp/permanentXml.jsp 2010-06-02 15:55:32 UTC (rev 62)
@@ -19,6 +19,6 @@
<InputEncoding>inputEncoding</InputEncoding>
<Image width="16" height="16" type="image/ico"><%=url%>img/bow.gif</Image>
<Url type="text/html" method="GET" template="<%=url%>bow?action=openSearchResult&token=<%=token%>&searchLine={searchTerms}" />
- <Url type="application/x-suggestions+json" method="GET" template="<%=url%>bow?action=openSearchSuggestion&token=<%=token%>&search={searchTerms}" />
+ <Url type="application/x-suggestions+json" method="GET" template="<%=url%>bow?action=openSearchSuggestion&token=<%=token%>&searchLine={searchTerms}" />
<moz:SearchForm><%=url%>bow</moz:SearchForm>
</OpenSearchDescription>
\ No newline at end of file
1
0
Author: bbrossaud
Date: 2010-06-02 17:51:02 +0200 (Wed, 02 Jun 2010)
New Revision: 61
Url: http://chorem.org/repositories/revision/bow/61
Log:
added footer in openSearchResult.jsp
Modified:
trunk/src/main/webapp/openSearchResult.jsp
Modified: trunk/src/main/webapp/openSearchResult.jsp
===================================================================
--- trunk/src/main/webapp/openSearchResult.jsp 2010-06-02 15:17:28 UTC (rev 60)
+++ trunk/src/main/webapp/openSearchResult.jsp 2010-06-02 15:51:02 UTC (rev 61)
@@ -1,10 +1,8 @@
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%@page import="org.chorem.bow.Bookmark" %>
<%@page import="org.chorem.bow.BookmarkActions" %>
-<%@page import="java.util.HashMap" %>
<%@page import="java.text.SimpleDateFormat" %>
<%@page import="java.util.Iterator" %>
-<%@page import="java.util.Map" %>
<%@page import="java.util.Set" %>
<%@page import="java.util.ArrayList" %>
<%@page import="java.util.List" %>
@@ -12,11 +10,13 @@
<%
BookmarkActions bookmarkActions = (BookmarkActions) request.getAttribute("bookmarkActions");
- String searchLine = "";
if (bookmarkActions != null) {
- searchLine = bookmarkActions.getSearchLine();
- }
- String url = (String) request.getAttribute("bowUrl");
+ String searchLine = "";
+ if (bookmarkActions != null) {
+ searchLine = bookmarkActions.getSearchLine();
+ }
+ String version = (String) request.getAttribute("version");
+ String url = (String) request.getAttribute("bowUrl");
%>
<html>
@@ -27,8 +27,8 @@
<h1 class="result">Results</h1>
<% if (bookmarkActions != null) {
- List<Bookmark> bookmarkList = bookmarkActions.getBookmarks();
- if (!bookmarkList.isEmpty()) {
+ List<Bookmark> bookmarkList = bookmarkActions.getBookmarks();
+ if (!bookmarkList.isEmpty()) {
%>
<table class="result">
<tr class="result">
@@ -99,16 +99,12 @@
%>
<h2 class="result">No Bookmarks found</h2>
<% }
- }
+ }
%>
- <div class="Index" id="footer">
- <a shape="rect" href="<%=url%>">bow</a>
- <a shape="rect" href="http://www.chorem.org/projects/list_files/bow"></a> -
- <a shape="rect" href="http://www.gnu.org/licenses/agpl.html">Licence AGPL</a> -
- <span title="Copyright">©2009-2010</span>
- <a shape="rect" href="http://www.codelutin.com">Code Lutin</a> -
- <a shape="rect" href="http://www.chorem.org/projects/bow/issues">Rapport de bug</a> -
- <a shape="rect" href="http://list.chorem.org/cgi-bin/mailman/listinfo/bow-users">Support utilisateur</a>
- </div>
+ <jsp:include page="footer.jsp" flush="true" >
+ <jsp:param name="bowUrl" value="<%=url%>" />
+ <jsp:param name="version" value="<%=version%>" />
+ </jsp:include>
</body>
-</html>
\ No newline at end of file
+</html>
+<%}%>
\ No newline at end of file
1
0
Author: bbrossaud
Date: 2010-06-02 17:17:28 +0200 (Wed, 02 Jun 2010)
New Revision: 60
Url: http://chorem.org/repositories/revision/bow/60
Log:
remove bug from suggestion.jsp
Modified:
trunk/src/main/webapp/suggestions.jsp
Modified: trunk/src/main/webapp/suggestions.jsp
===================================================================
--- trunk/src/main/webapp/suggestions.jsp 2010-06-02 15:11:39 UTC (rev 59)
+++ trunk/src/main/webapp/suggestions.jsp 2010-06-02 15:17:28 UTC (rev 60)
@@ -1,6 +1,5 @@
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%@page import="org.chorem.bow.OpenSearchActions" %>
-<%@page import="org.chorem.bow.Suggestion" %>
<%@page import="java.util.List" %>
<%@page import="java.util.Iterator" %>
<%@page import="org.nuiton.wikitty.FacetTopic" %>
1
0
02 Jun '10
Author: bbrossaud
Date: 2010-06-02 17:11:39 +0200 (Wed, 02 Jun 2010)
New Revision: 59
Url: http://chorem.org/repositories/revision/bow/59
Log:
use facet for the opensearch suggestions
Removed:
trunk/src/main/java/org/chorem/bow/Model.java
trunk/src/main/java/org/chorem/bow/Suggestion.java
Modified:
trunk/src/main/java/org/chorem/bow/ControllerServlet.java
trunk/src/main/java/org/chorem/bow/OpenSearchActions.java
trunk/src/main/java/org/chorem/bow/SuggestionsComparator.java
trunk/src/main/webapp/openSearchResult.jsp
trunk/src/main/webapp/suggestions.jsp
Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-06-02 14:14:19 UTC (rev 58)
+++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-06-02 15:11:39 UTC (rev 59)
@@ -276,12 +276,16 @@
List<String> cpy = new ArrayList<String>(searchLine);
cpy.remove(cpy.size() - 1);
criteria = Search.query().eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).
- eq(Bookmark.FQ_FIELD_TAGS, cpy).criteria();
+ eq(Bookmark.FQ_FIELD_TAGS, cpy).criteria().addFacetField(Bookmark.FQ_FIELD_TAGS);
} else {
- criteria = Search.query().eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria();
+ criteria = Search.query().eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).
+ criteria().addFacetField(Bookmark.FQ_FIELD_TAGS);
}
- List<Bookmark> bookList = proxy.findAllByCriteria(Bookmark.class, criteria).getAll();
+ PagedResult result = proxy.findAllByCriteria(Bookmark.class, criteria);
+ List<Bookmark> bookList = result.getAll();
+ List<FacetTopic> topics = result.getTopic(Bookmark.FQ_FIELD_TAGS);
openSearchActions.setBookmarkList(bookList);
+ openSearchActions.setSuggestionList(topics);
openSearchActions.findSuggestions(searchLine);
request.setAttribute("openSearchAction", openSearchActions);
}
Deleted: trunk/src/main/java/org/chorem/bow/Model.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/Model.java 2010-06-02 14:14:19 UTC (rev 58)
+++ trunk/src/main/java/org/chorem/bow/Model.java 2010-06-02 15:11:39 UTC (rev 59)
@@ -1,53 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.chorem.bow;
-
-import java.util.Properties;
-import org.nuiton.wikitty.WikittyExtensionStorage;
-import org.nuiton.wikitty.WikittyProxy;
-import org.nuiton.wikitty.WikittyService;
-import org.nuiton.wikitty.WikittyStorage;
-import org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC;
-import org.nuiton.wikitty.jdbc.WikittyStorageJDBC;
-import org.nuiton.wikitty.multistorage.MultiStorageConfiguration;
-import org.nuiton.wikitty.multistorage.MultiStorageConfiguration.BasicConfiguration;
-import org.nuiton.wikitty.multistorage.WikittyServiceMultiStorage;
-
-/**
- *
- * @author bbrossaud
- */
-public class Model {
-
- protected WikittyProxy proxy = null;
-
- Model() {
- System.setProperty("solr.data.dir", System.getProperty("user.home") + "/.bow/solr");
- this.init();
- }
-
- public void init() {
- MultiStorageConfiguration config = new BasicConfiguration();
- Model.configureJDBC(config);
-
- WikittyService jdbcStorage = new WikittyServiceMultiStorage(config);
- proxy = new WikittyProxy();
- proxy.setWikittyService(jdbcStorage);
- }
-
- static void configureJDBC(MultiStorageConfiguration configuration) {
- Properties properties = new Properties();
-
- WikittyExtensionStorage extensionStorage = new WikittyExtensionStorageJDBC(properties);
- WikittyStorage wikittyStorage = new WikittyStorageJDBC(extensionStorage, properties);
-
- configuration.addExtensionStorage(extensionStorage, true);
- configuration.addWikittyStorage(wikittyStorage, true);
- }
-
- public WikittyProxy getProxy() {
- return proxy;
- }
-}
Modified: trunk/src/main/java/org/chorem/bow/OpenSearchActions.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/OpenSearchActions.java 2010-06-02 14:14:19 UTC (rev 58)
+++ trunk/src/main/java/org/chorem/bow/OpenSearchActions.java 2010-06-02 15:11:39 UTC (rev 59)
@@ -6,12 +6,11 @@
import java.util.ArrayList;
import java.util.Collections;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import org.apache.commons.lang.StringUtils;
+import org.nuiton.wikitty.FacetTopic;
/**
*
@@ -20,50 +19,38 @@
public class OpenSearchActions {
protected List<Bookmark> bookmarkList = new ArrayList<Bookmark>();
- protected List<Suggestion> suggestions = new ArrayList<Suggestion>();
+ protected List<FacetTopic> suggestions = new ArrayList<FacetTopic>();
protected String[] search = null;
public void findSuggestions(List<String> searchLine) {
int size = searchLine.size();
search = searchLine.toArray(new String[size]);
- fieldSuggestionList(search[size - 1], searchLine);
- }
-
- protected void fieldSuggestionList(String word, List<String> searchLine) {
- if (bookmarkList != null) {
- Map<String, Integer> map = new HashMap<String, Integer>();
- List<Bookmark> save = new ArrayList<Bookmark>(bookmarkList);
- for (Bookmark bookmark : save) {
- Set<String> tagList = bookmark.getTags();
- boolean contain = false;
- if (tagList != null) {
- for (String tag : tagList) {
- if (tag.indexOf(word) == 0 && !searchLine.contains(tag)) {
- contain = true;
- if (map.containsKey(tag)) {
- Integer count = map.get(tag);
- ++count;
- map.put(tag, count);
- } else {
- map.put(tag, 1);
- }
- }
- }
+ String word = search[size - 1];
+ List<FacetTopic> save = new ArrayList<FacetTopic>(suggestions);
+ for (FacetTopic topic : save) {
+ String tag = topic.getTopicName();
+ if (tag != null) {
+ if (tag.indexOf(word) != 0 || searchLine.contains(tag)) {
+ suggestions.remove(topic);
}
- if (contain == false) {
- bookmarkList.remove(bookmark);
+ }
+ }
+ List<Bookmark> cpy = new ArrayList<Bookmark>(bookmarkList);
+ for (Bookmark bookmark : cpy) {
+ Set<String> tags = bookmark.getTags();
+ boolean delete = true;
+ for (FacetTopic topic : suggestions) {
+ String name = topic.getTopicName();
+ if (tags != null && tags.contains(name)) {
+ delete = false;
+ break;
}
}
- Set<String> keys = map.keySet();
- for (String key : keys) {
- Suggestion newSuggestion = new Suggestion();
- newSuggestion.setName(key);
- newSuggestion.setNb(map.get(key));
- suggestions.add(newSuggestion);
+ if (delete == true) {
+ bookmarkList.remove(bookmark);
}
-
- Collections.sort(suggestions, new SuggestionsComparator());
}
+ Collections.sort(suggestions, new SuggestionsComparator());
}
protected boolean bookmarkHasTag(Bookmark bookmark, String tag) {
@@ -97,14 +84,14 @@
public String getJsonSuggestions() {
String str = "[";
String srch = "";
- Iterator<Suggestion> it = suggestions.iterator();
+ Iterator<FacetTopic> it = suggestions.iterator();
if (search.length > 1) {
srch = StringUtils.join(search, ' ', 0, (search.length - 1));
srch += " ";
}
while (it.hasNext()) {
- Suggestion su = it.next();
- str += "\"" + srch + su.getName() + "\"";
+ FacetTopic su = it.next();
+ str += "\"" + srch + su.getTopicName() + "\"";
if (it.hasNext()) {
str += ",";
}
@@ -120,10 +107,10 @@
public String getJsonDescription() {
String str = "[";
- Iterator<Suggestion> it = suggestions.iterator();
+ Iterator<FacetTopic> it = suggestions.iterator();
while (it.hasNext()) {
- Suggestion su = it.next();
- str += "\"" + su.getNb() + " results\"";
+ FacetTopic su = it.next();
+ str += "\"" + su.getCount() + " results\"";
if (it.hasNext()) {
str += ",";
}
@@ -136,8 +123,10 @@
search = tab;
}
- public void setSuggestionList(List<Suggestion> list) {
- suggestions = list;
+ public void setSuggestionList(List<FacetTopic> list) {
+ if (list != null) {
+ suggestions = new ArrayList<FacetTopic>(list);
+ }
}
public List<Bookmark> getBookmarkList() {
@@ -148,7 +137,7 @@
return search;
}
- public List<Suggestion> getSuggestionList() {
+ public List<FacetTopic> getSuggestionList() {
return suggestions;
}
}
Deleted: trunk/src/main/java/org/chorem/bow/Suggestion.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/Suggestion.java 2010-06-02 14:14:19 UTC (rev 58)
+++ trunk/src/main/java/org/chorem/bow/Suggestion.java 2010-06-02 15:11:39 UTC (rev 59)
@@ -1,35 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package org.chorem.bow;
-
-/**
- *
- * @author bbrossaud
- */
-public class Suggestion {
- int nb = 0;
- String name = "";
-
- public void increment() {
- nb++;
- }
-
- public void setNb(int value) {
- nb = value;
- }
-
- public void setName(String str) {
- name = str;
- }
-
- public int getNb() {
- return nb;
- }
-
- public String getName() {
- return name;
- }
-}
Modified: trunk/src/main/java/org/chorem/bow/SuggestionsComparator.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/SuggestionsComparator.java 2010-06-02 14:14:19 UTC (rev 58)
+++ trunk/src/main/java/org/chorem/bow/SuggestionsComparator.java 2010-06-02 15:11:39 UTC (rev 59)
@@ -2,23 +2,25 @@
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
-
package org.chorem.bow;
import java.util.Comparator;
+import org.nuiton.wikitty.FacetTopic;
/**
*
* @author bbrossaud
*/
-public class SuggestionsComparator implements Comparator<Suggestion> {
+public class SuggestionsComparator implements Comparator<FacetTopic> {
@Override
- public int compare(Suggestion o1, Suggestion o2) {
- if (o1.getNb() < o2.getNb())
+ public int compare(FacetTopic o1, FacetTopic o2) {
+ if (o1.getCount() < o2.getCount()) {
return 1;
- if (o1.getNb() > o2.getNb())
+ }
+ if (o1.getCount() > o2.getCount()) {
return -1;
+ }
return 0;
}
}
Modified: trunk/src/main/webapp/openSearchResult.jsp
===================================================================
--- trunk/src/main/webapp/openSearchResult.jsp 2010-06-02 14:14:19 UTC (rev 58)
+++ trunk/src/main/webapp/openSearchResult.jsp 2010-06-02 15:11:39 UTC (rev 59)
@@ -16,11 +16,11 @@
if (bookmarkActions != null) {
searchLine = bookmarkActions.getSearchLine();
}
- String url = (String) request.getAttribute("bowUrl");
+ String url = (String) request.getAttribute("bowUrl");
%>
<html>
- <jsp:include page="header.jsp" flush="true">
+ <jsp:include page="header.jsp" flush="true">
<jsp:param name="bowUrl" value="<%=url%>"/>
</jsp:include>
<body>
@@ -80,7 +80,7 @@
%>
<%=tag%>
<%
- }
+ }
%>
</td>
<%
Modified: trunk/src/main/webapp/suggestions.jsp
===================================================================
--- trunk/src/main/webapp/suggestions.jsp 2010-06-02 14:14:19 UTC (rev 58)
+++ trunk/src/main/webapp/suggestions.jsp 2010-06-02 15:11:39 UTC (rev 59)
@@ -3,6 +3,7 @@
<%@page import="org.chorem.bow.Suggestion" %>
<%@page import="java.util.List" %>
<%@page import="java.util.Iterator" %>
+<%@page import="org.nuiton.wikitty.FacetTopic" %>
<%
@@ -10,7 +11,7 @@
if (osa != null) {
String[] word = osa.getSearch();
if (word != null) {
- List<Suggestion> suggestions = osa.getSuggestionList();
+ List<FacetTopic> suggestions = osa.getSuggestionList();
if (suggestions != null) {
%>
<%=osa.getJsonResult()%>
1
0
Author: bbrossaud
Date: 2010-06-02 16:14:19 +0200 (Wed, 02 Jun 2010)
New Revision: 58
Url: http://chorem.org/repositories/revision/bow/58
Log:
added new comments
Modified:
trunk/TODO.txt
trunk/src/main/java/org/chorem/bow/BowProxy.java
trunk/src/main/java/org/chorem/bow/ControllerServlet.java
trunk/src/main/java/org/chorem/bow/Suggestion.java
Modified: trunk/TODO.txt
===================================================================
--- trunk/TODO.txt 2010-06-02 10:32:07 UTC (rev 57)
+++ trunk/TODO.txt 2010-06-02 14:14:19 UTC (rev 58)
@@ -20,7 +20,7 @@
===> champ recherche fulltext
-===> class bokkmarkFile = Id proprietaire, list<userID> writer, list<userId> reader;
+===> class bookmarkFile = Id proprietaire, list<userID> writer, list<userId> reader;
===> class bookmark = idBookmarkFile a la place de UserID;
Modified: trunk/src/main/java/org/chorem/bow/BowProxy.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/BowProxy.java 2010-06-02 10:32:07 UTC (rev 57)
+++ trunk/src/main/java/org/chorem/bow/BowProxy.java 2010-06-02 14:14:19 UTC (rev 58)
@@ -22,7 +22,6 @@
import org.apache.commons.logging.LogFactory;
import org.nuiton.wikitty.WikittyProxy;
import org.nuiton.wikitty.WikittyService;
-//import org.nuiton.wikitty.WikittyServiceCached;
import org.nuiton.wikitty.WikittyServiceCached;
import org.nuiton.wikitty.jdbc.WikittyServiceJDBC;
@@ -52,10 +51,7 @@
protected BowProxy(BowConfig config) {
WikittyService ws = new WikittyServiceJDBC(config.getFlatOptions());
- // FIXME activate next line, when new wikitty version released ans tested
ws = new WikittyServiceCached(ws);
setWikittyService(ws);
}
-
-
}
Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-06-02 10:32:07 UTC (rev 57)
+++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-06-02 14:14:19 UTC (rev 58)
@@ -78,10 +78,12 @@
request.setAttribute("bowUrl", url);
HttpSession session = request.getSession(true);
User user = (User) session.getAttribute("user");
+
String token = request.getParameter("token"); // token or not
if (token != null && !token.isEmpty()) {
- user = checkToken(token, session);
+ user = checkToken(token, session); // retrieve user by token
}
+
String action = request.getParameter("action");
if (action != null) {
if (action.equals("register")) {
@@ -226,6 +228,14 @@
}
}
+
+ /* @param request servlet request
+ * @param response servlet response
+ * @param user the user
+ * @param token the permanent or temporary token
+ * @throws ServletException if a servlet error occurs
+ * @description set the openSearch result
+ */
protected void actionOpenSearchResult(HttpServletRequest request, HttpServletResponse response, User user, String token)
throws IOException, ServletException {
String searchLine = request.getParameter("searchLine");
@@ -235,7 +245,7 @@
WikittyProxy proxy = BowProxy.getInstance();
Criteria criteria = getBookmarkListCriteriaByUser(user, searchLine);
criteria = criteria.addSortDescending(Bookmark.FQ_FIELD_CLICK);
- PagedResult result = proxy.findAllByCriteria(Bookmark.class, criteria);
+ PagedResult result = proxy.findAllByCriteria(Bookmark.class, criteria);// retrieve bookmarks by search
BookmarkActions bookmarkActions = createBookmarkActions(request, result, searchLine);
request.setAttribute("bookmarkActions", bookmarkActions);
request.setAttribute("token", token);
@@ -243,6 +253,12 @@
}
}
+ /* @param request servlet request
+ * @param response servlet response
+ * @param user the user
+ * @throws ServletException if a servlet error occurs
+ * @description set the openSearch suggestions
+ */
protected void actionOpenSearchSuggestion(HttpServletRequest request, HttpServletResponse response, User user)
throws IOException, ServletException {
if (user != null) {
@@ -253,14 +269,14 @@
String[] words = search.split("\\s+");
List<String> searchLine = new ArrayList<String>(Arrays.asList(words));
if (search.charAt(search.length() - 1) == ' ') {
- searchLine.add("");
+ searchLine.add(""); // if the user types nothing we have to propose suggestions
}
Criteria criteria = null;
if (searchLine.size() > 1) {
List<String> cpy = new ArrayList<String>(searchLine);
cpy.remove(cpy.size() - 1);
criteria = Search.query().eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).
- contains(Bookmark.FQ_FIELD_TAGS, cpy).criteria();
+ eq(Bookmark.FQ_FIELD_TAGS, cpy).criteria();
} else {
criteria = Search.query().eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria();
}
@@ -272,12 +288,24 @@
}
}
+ /* @param request servlet request
+ * @param response servlet response
+ * @param session current session
+ * @throws ServletException if a servlet error occurs
+ * @description delete the session
+ */
protected void actionLogout(HttpServletRequest request, HttpServletResponse response, HttpSession session)
throws IOException, ServletException {
session.invalidate();
request.getRequestDispatcher("login.jsp").forward(request, response);
}
+ /* @param request servlet request
+ * @param response servlet response
+ * @throws ServletException if a servlet error occurs
+ * @description when the user click on the bookmark url, we
+ * increment the number of click
+ */
protected void actionAddClick(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException {
String bookmarkId = request.getParameter("bookmarkId");
@@ -295,6 +323,12 @@
}
}
+ /* @param request servlet request
+ * @param response servlet response
+ * @param user the user
+ * @throws ServletException if a servlet error occurs
+ * @description order the bookmarks by type
+ */
protected void actionOrderAsc(HttpServletRequest request, HttpServletResponse response, User user)
throws IOException, ServletException {
String type = request.getParameter("type");
@@ -318,6 +352,12 @@
}
}
+ /* @param request servlet request
+ * @param response servlet response
+ * @param user the user
+ * @throws ServletException if a servlet error occurs
+ * @description order the bookmarks by type
+ */
protected void actionOrderDesc(HttpServletRequest request, HttpServletResponse response, User user)
throws IOException, ServletException {
String searchLine = request.getParameter("searchLine");
@@ -341,6 +381,12 @@
}
}
+ /* @param request servlet request
+ * @param response servlet response
+ * @param user the user
+ * @throws ServletException if a servlet error occurs
+ * @description edit the bookmark
+ */
protected void actionEditBookmark(HttpServletRequest request, HttpServletResponse response, User user)
throws IOException, ServletException {
String tags = request.getParameter("tags");
@@ -358,6 +404,12 @@
redirectToTheGoodPage(request, response);
}
+ /* @param request servlet request
+ * @param response servlet response
+ * @param user the user
+ * @throws ServletException if a servlet error occurs
+ * @description remove the bookmark
+ */
protected void actionRemoveBookmark(HttpServletRequest request, HttpServletResponse response, User user)
throws IOException, ServletException {
String bookmarkId = request.getParameter("bookmarkId");
@@ -371,6 +423,12 @@
redirectToTheGoodPage(request, response);
}
+ /* @param request servlet request
+ * @param response servlet response
+ * @param user the user
+ * @throws ServletException if a servlet error occurs
+ * @description delete the bookmark tag
+ */
protected void actionDeleteTag(HttpServletRequest request, HttpServletResponse response, User user)
throws IOException, ServletException {
String bookmarkId = request.getParameter("bookmarkId");
@@ -389,9 +447,12 @@
}
- /* @param request servlet request
- * @param response servlet response
- * @throws ServletException if a servlet error occurs
+ /* @param request servlet request
+ * @param response servlet response
+ * @param user User user
+ * @param session HttpSession session
+ * @throws ServletException if a servlet error occurs
+ * @description delete the current token and generate an another
*/
protected void actionGenerateToken(HttpServletRequest request, HttpServletResponse response, User user, HttpSession session)
throws IOException, ServletException, NoSuchAlgorithmException {
@@ -421,9 +482,11 @@
redirectToTheGoodPage(request, response);
}
- /* @param request servlet request
- * @param response servlet response
- * @throws ServletException if a servlet error occurs
+ /* @param request servlet request
+ * @param response servlet response
+ * @param user User user
+ * @throws ServletException if a servlet error occurs
+ * @description add a new bookmark
*/
protected void actionAddUrl(HttpServletRequest request, HttpServletResponse response, User user)
throws IOException, ServletException {
@@ -433,12 +496,12 @@
protected void addUrl(HttpServletRequest request, User user) {
String link = request.getParameter("url"); // url of the website
- String name = request.getParameter("name");
+ String name = request.getParameter("name"); // website name
Bookmark bookmark = null;
if (name != null) {
String tags = request.getParameter("tags"); // tags
bookmark = BookmarkActions.createBookmark(link, name, tags, user, null);
- } else {
+ } else { // this part is for the bookmark addition by script
String nameAndTags = request.getParameter("nameAndTags");
bookmark = BookmarkActions.createBookmark(link, nameAndTags, user);
}
@@ -450,6 +513,12 @@
}
}
}
+ /* @param token String token
+ * @param session HttpSession session
+ * @return User
+ * @description check if the token is valid and return the
+ * token owner
+ */
protected User checkToken(String token, HttpSession session) {
if (checkTemporaryToken(token, session) == true) {
@@ -478,6 +547,10 @@
return null;
}
+ /* @param token String which contains the MD5 encoding token
+ * @return null the token doesn't exist
+ * @return User the token owner
+ */
protected boolean checkTemporaryToken(String token, HttpSession session) {
TokenActions tokenActions = (TokenActions) session.getAttribute("tokenActions");
if (tokenActions != null) {
@@ -491,9 +564,12 @@
return false;
}
- /* @param request servlet request
- * @param response servlet response
- * @throws ServletException if a servlet error occurs
+ /* @param request servlet request
+ * @param response servlet response
+ * @param user User user
+ * @throws ServletException if a servlet error occurs
+ * @description set the bookmarks and the tagCloud by search
+ * or tag addition
*/
protected void actionSearch(HttpServletRequest request, User user)
throws IOException, ServletException {
@@ -514,6 +590,12 @@
request.setAttribute("bookmarkActions", bookmarkActions);
}
+ /* @param request servlet request
+ * @param result PageResult result
+ * @param searchLine String searchLine
+ * @return bookmarkActions the bookmarkAction
+ * @description create the tagCLoud by research type
+ */
protected BookmarkActions createBookmarkActions(HttpServletRequest request, PagedResult result, String searchLine) {
String fullText = request.getParameter("fullTextLine");
BookmarkActions bookmarkActions = new BookmarkActions();
@@ -535,9 +617,11 @@
return bookmarkActions;
}
- /* @param request servlet request
- * @param response servlet response
- * @throws ServletException if a servlet error occurs
+ /* @param request servlet request
+ * @param response servlet response
+ * @param session HttpSession session
+ * @throws ServletException if a servlet error occurs
+ * @description check if the registration is correct or not
*/
protected void actionRegister(HttpServletRequest request, HttpServletResponse response, HttpSession session)
throws IOException, ServletException, NoSuchAlgorithmException {
@@ -564,9 +648,11 @@
}
}
- /* @param request servlet request
- * @param response servlet response
- * @throws ServletException if a servlet error occurs
+ /* @param request servlet request
+ * @param response servlet response
+ * @param session HttpSession session
+ * @throws ServletException if a servlet error occurs
+ * @description check if the authentication is correct or not
*/
protected void actionLogin(HttpServletRequest request, HttpServletResponse response, HttpSession session)
throws IOException, ServletException, NoSuchAlgorithmException {
@@ -587,6 +673,11 @@
}
}
+ /* @param session HttpSession session
+ * @throws ServletException if a servlet error occurs
+ * @description retrieve tokens or create there if the user are just
+ * registered
+ */
protected void initializeToken(HttpSession session, User login)
throws NoSuchAlgorithmException {
WikittyProxy proxy = BowProxy.getInstance();
@@ -607,10 +698,10 @@
}
- /* @param email String which contains the user name (email)
- * @param password String which contains the user password
- * @return null the user doesn't exist
- * @return User the user exists
+ /* @param email String which contains the user name (email)
+ * @param password String which contains the user password
+ * @return null the user doesn't exist
+ * @return User the user exists
*/
protected User checkLogin(String email, String password) {
if (email != null && password != null) {
@@ -626,9 +717,9 @@
}
- /* @param email String which contains the user name (email)
- * @param password String which contains the user password
- * @return bool false if the user doesn't exists or true
+ /* @param email String which contains the user name (email)
+ * @param password String which contains the user password
+ * @return bool false if the user doesn't exists or true
*/
protected boolean checkRegister(String email, String password) {
if (email != null && password != null) {
@@ -644,6 +735,10 @@
return true;
}
+ /* @param request servlet request
+ * @param user User user
+ * @description initialize all for the home page
+ */
protected void actionHome(HttpServletRequest request, User user) {
WikittyProxy proxy = BowProxy.getInstance();
Criteria criteria = getBookmarkListCriteriaByUser(user, null);
@@ -666,6 +761,12 @@
}
}
+ /* @param request servlet request
+ * @param response servlet response
+ * @param user User user
+ * @throws ServletException if a servlet error occurs
+ * @description import bookmark for an user
+ */
protected void actionImportBookmarks(HttpServletRequest request, HttpServletResponse response, User user)
throws IOException, FileUploadException, ParserException {
// Check that we have a file upload request
@@ -695,6 +796,12 @@
redirectToTheGoodPage(request, response);
}
+ /* @param list NodeList list
+ * @param bookmarks List<Bookmark> bookmarks
+ * @param tagList List<String> tagList
+ * @throws ParserException if a parser error occurs
+ * @description parse the html by recursion and retrieve bookmarks
+ */
protected void parseHtmlToBookmarks(NodeList list, User user, List<Bookmark> bookmarks, List<String> tagList)
throws ParserException {
if (list != null) {
@@ -702,14 +809,14 @@
SimpleNodeIterator it = list.elements();
while (it.hasMoreNodes()) {
Node node = it.nextNode();
- String plainText = node.toPlainTextString();
- String text = node.getText();
- if (text != null && text.startsWith("H3")) {
+ String plainText = node.toPlainTextString(); // the text between two heads ==> <toto>plainText</toto>
+ String text = node.getText(); // the text in the head ==> <text></toto>
+ if (text != null && text.startsWith("H3")) { // H3 = folder
if (plainText != null && !plainText.isEmpty()) {
- tagList.add(plainText);
+ tagList.add(plainText); // add the folder name to the tagList
isFolder = true;
}
- } else if (text != null && text.startsWith("A HREF")) {
+ } else if (text != null && text.startsWith("A HREF")) { // HREF = new bookmarks
Bookmark bookmark = BookmarkActions.createBookmarkFromHtml(text, plainText, user);
BookmarkActions.addTagsToBookmark(tagList, bookmark);
if (bookmark != null) {
@@ -718,10 +825,10 @@
}
NodeList children = node.getChildren();
if (children != null) {
- parseHtmlToBookmarks(children, user, bookmarks, tagList);
+ parseHtmlToBookmarks(children, user, bookmarks, tagList); // if there is an under node = recursion
}
}
- if (isFolder == true) {
+ if (isFolder == true) { // if we find a folder, we have to remove it
int index = tagList.size() - 1;
if (index > -1) {
tagList.remove(index);
@@ -730,6 +837,10 @@
}
}
+ /* @param response servlet response
+ * @param user User user
+ * @description export bookmarks
+ */
protected void actionExportBookmarks(HttpServletResponse response, User user)
throws IOException {
WikittyProxy proxy = BowProxy.getInstance();
@@ -746,6 +857,11 @@
op.close();
}
+ /* @param request servlet request
+ * @param response servlet response
+ * @throws ServletException if a servlet error occurs
+ * @description add an alias for one bookmark
+ */
protected void actionAddAlias(HttpServletRequest request, HttpServletResponse response)
throws IOException {
String alias = request.getParameter("alias");
@@ -767,6 +883,11 @@
redirectToTheGoodPage(request, response);
}
+ /* @param request servlet request
+ * @param user User user
+ * @throws ServletException if a servlet error occurs
+ * @description retrieve bookmark for the full text research
+ */
protected void actionFullText(HttpServletRequest request, User user) {
WikittyProxy proxy = BowProxy.getInstance();
Criteria criteria = getBookmarkListCriteriaByUser(user, null);
@@ -775,6 +896,11 @@
request.setAttribute("bookmarkActions", bookmarkActions);
}
+ /* @param request servlet request
+ * @param response servlet response
+ * @throws ServletException if a servlet error occurs
+ * @description choose the good page
+ */
protected void redirectToTheGoodPage(HttpServletRequest request, HttpServletResponse response)
throws IOException {
String searchLine = request.getParameter("searchLine");
@@ -789,6 +915,10 @@
}
}
+ /* @param user User user
+ * @param searchLine String searchLine
+ * @description return the bookmark criteria by search
+ */
protected Criteria getBookmarkListCriteriaByUser(User user, String searchLine) {
Criteria criteria = null;
if (user != null) {
Modified: trunk/src/main/java/org/chorem/bow/Suggestion.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/Suggestion.java 2010-06-02 10:32:07 UTC (rev 57)
+++ trunk/src/main/java/org/chorem/bow/Suggestion.java 2010-06-02 14:14:19 UTC (rev 58)
@@ -13,6 +13,10 @@
int nb = 0;
String name = "";
+ public void increment() {
+ nb++;
+ }
+
public void setNb(int value) {
nb = value;
}
1
0
02 Jun '10
Author: bbrossaud
Date: 2010-06-02 12:32:07 +0200 (Wed, 02 Jun 2010)
New Revision: 57
Url: http://chorem.org/repositories/revision/bow/57
Log:
remove bugs and cutting the jsp in different logical parts
Added:
trunk/src/main/webapp/footer.jsp
trunk/src/main/webapp/header.jsp
trunk/src/main/webapp/main.jsp
Modified:
trunk/src/main/java/org/chorem/bow/BookmarkActions.java
trunk/src/main/java/org/chorem/bow/ControllerServlet.java
trunk/src/main/webapp/home.jsp
trunk/src/main/webapp/login.jsp
trunk/src/main/webapp/openSearchResult.jsp
trunk/src/main/webapp/register.jsp
trunk/src/main/webapp/search.jsp
trunk/src/main/xmi/bow.zargo
Modified: trunk/src/main/java/org/chorem/bow/BookmarkActions.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-06-01 14:15:25 UTC (rev 56)
+++ trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-06-02 10:32:07 UTC (rev 57)
@@ -353,8 +353,15 @@
lastBookmarks = newList;
}
+ public void setTagSearch(List<String> cpy) {
+ tagsSearch = cpy;
+ }
+
public String getSearchLine() {
- return StringUtil.join(tagsSearch, " ", true); // return the search line created with the tags
+ if (tagsSearch != null) {
+ return StringUtil.join(tagsSearch, " ", true); // return the search line created with the tags
+ }
+ return null;
}
public int getFont(int ti) {
Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-06-01 14:15:25 UTC (rev 56)
+++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-06-02 10:32:07 UTC (rev 57)
@@ -109,7 +109,7 @@
log.debug("Going to actionHome.jsp");
}
this.actionHome(request, user);
- request.getRequestDispatcher("home.jsp").forward(request, response);
+ request.getRequestDispatcher("main.jsp").forward(request, response);
} else if (action.equals("addUrl") && user != null) {
if (log.isDebugEnabled()) {
log.debug("Going to actionAddUrl");
@@ -130,7 +130,7 @@
log.debug("Going to actionSearch");
}
this.actionSearch(request, user);
- request.getRequestDispatcher("search.jsp").forward(request, response);
+ request.getRequestDispatcher("main.jsp").forward(request, response);
} else if (action.equals("generateToken") && user != null) {
if (log.isDebugEnabled()) {
log.debug("Going to actionGenerateToken");
@@ -161,7 +161,7 @@
log.debug("Going to actionOrderAsc");
}
this.actionOrderAsc(request, response, user);
- request.getRequestDispatcher("search.jsp").forward(request, response);
+ request.getRequestDispatcher("main.jsp").forward(request, response);
} else if (action.equals("orderAscOS") && user != null) {
if (log.isDebugEnabled()) {
log.debug("Going to actionOrderAsc");
@@ -173,7 +173,7 @@
log.debug("Going to actionOrderDesc");
}
this.actionOrderDesc(request, response, user);
- request.getRequestDispatcher("search.jsp").forward(request, response);
+ request.getRequestDispatcher("main.jsp").forward(request, response);
} else if (action.equals("orderDescOS") && user != null) {
if (log.isDebugEnabled()) {
log.debug("Going to actionOrderDesc");
@@ -210,7 +210,7 @@
log.debug("Going to actionFullText");
}
this.actionFullText(request, user);
- request.getRequestDispatcher("search.jsp").forward(request, response);
+ request.getRequestDispatcher("main.jsp").forward(request, response);
} else {
if (user != null) {
request.getRequestDispatcher("error.jsp").forward(request, response);
@@ -222,8 +222,7 @@
request.getRequestDispatcher("login.jsp").forward(request, response);
}
} catch (Exception eee) {
- throw new ServletException("msg", eee);
- // request.getRequestDispatcher("error.jsp").forward(request, response);
+ request.getRequestDispatcher("error.jsp").forward(request, response);
}
}
@@ -398,16 +397,18 @@
throws IOException, ServletException, NoSuchAlgorithmException {
WikittyProxy proxy = BowProxy.getInstance();
- Criteria criteria = Search.query().eq(User.FQ_FIELD_EMAIL, user.getEmail()).criteria();
+ Criteria criteria = Search.query().eq(Token.FQ_FIELD_EMAIL, user.getEmail()).criteria();
Token currentToken = proxy.findByCriteria(Token.class, criteria);
if (currentToken != null) {
- proxy.delete(currentToken.getWikittyId());
+ String id = currentToken.getWikittyId();
+ proxy.delete(id);
}
TokenActions tokenActions = (TokenActions) session.getAttribute("tokenActions");
if (tokenActions != null) {
String token = tokenActions.generateToken(); // Generate an encoding MD5 token
criteria = Search.query().eq(Token.FQ_FIELD_TOKEN, token).criteria();
- if (proxy.findByCriteria(Token.class, criteria) == null) { // Check if the token already exists
+ Token oldToken = proxy.findByCriteria(Token.class, criteria);
+ if (oldToken == null) { // Check if the token already exists
TokenImpl newToken = new TokenImpl();
newToken.setToken(token);
newToken.setEmail(user.getEmail());
@@ -558,7 +559,7 @@
session.setAttribute("user", login);
initializeToken(session, login);
actionHome(request, login);
- request.getRequestDispatcher("home.jsp").forward(request, response);
+ request.getRequestDispatcher("main.jsp").forward(request, response);
}
}
}
@@ -577,7 +578,7 @@
session.setAttribute("user", login);
initializeToken(session, login);
actionHome(request, login);
- request.getRequestDispatcher("home.jsp").forward(request, response);
+ request.getRequestDispatcher("main.jsp").forward(request, response);
} else {
String error = "Unknow email or incorrect password";
@@ -652,6 +653,7 @@
sortCriteria = criteria.addSortDescending(Bookmark.FQ_FIELD_DATE).setEndIndex(10);
List<Bookmark> lastBookmarks = proxy.findAllByCriteria(Bookmark.class, sortCriteria).getAll();
BookmarkActions bookmarkActions = createBookmarkActions(request, result, null);
+ bookmarkActions.setTagSearch(null);
List<Bookmark> bookList = bookmarkActions.getBookmarks();
if (bookList.size() > 10) {
bookList = bookmarkActions.getBookmarks().subList(0, 10);
Added: trunk/src/main/webapp/footer.jsp
===================================================================
--- trunk/src/main/webapp/footer.jsp (rev 0)
+++ trunk/src/main/webapp/footer.jsp 2010-06-02 10:32:07 UTC (rev 57)
@@ -0,0 +1,18 @@
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<%
+ String url = (String) request.getAttribute("bowUrl");
+ String version = (String) request.getAttribute("version");
+%>
+<body>
+ <br />
+ <br />
+ <div class="Index" id="footer" style="float: left">
+ <a shape="rect" href="<%=url%>">bow</a>
+ <a shape="rect" href="http://www.chorem.org/projects/list_files/bow"><%=version%></a> -
+ <a shape="rect" href="http://www.gnu.org/licenses/agpl.html">Licence AGPL</a> -
+ <span title="Copyright">©2010</span>
+ <a shape="rect" href="http://www.codelutin.com">Code Lutin</a> -
+ <a shape="rect" href="http://www.chorem.org/projects/bow/issues">Rapport de bug</a> -
+ <a shape="rect" href="http://list.chorem.org/cgi-bin/mailman/listinfo/bow-users">Support utilisateur</a>
+ </div>
+</body>
\ No newline at end of file
Added: trunk/src/main/webapp/header.jsp
===================================================================
--- trunk/src/main/webapp/header.jsp (rev 0)
+++ trunk/src/main/webapp/header.jsp 2010-06-02 10:32:07 UTC (rev 57)
@@ -0,0 +1,12 @@
+<%
+ String url = (String) request.getAttribute("bowUrl");
+%>
+
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+ <meta name="description" content="Bookmark On Web" />
+ <title>Bow</title>
+ <link rel="stylesheet" type="text/css" href="./css/styles.css" />
+ <link rel="search" type="application/opensearchdescription+xml" title="bowTemporarySearchEngine" href="<%=url%>bow?action=temporaryXml" />
+ <link rel="search" type="application/opensearchdescription+xml" title="bowPermanentSearchEngine" href="<%=url%>bow?action=permanentXml" />
+</head>
\ No newline at end of file
Modified: trunk/src/main/webapp/home.jsp
===================================================================
--- trunk/src/main/webapp/home.jsp 2010-06-01 14:15:25 UTC (rev 56)
+++ trunk/src/main/webapp/home.jsp 2010-06-02 10:32:07 UTC (rev 57)
@@ -1,10 +1,8 @@
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%@page import="org.chorem.bow.Bookmark" %>
<%@page import="org.chorem.bow.BookmarkActions" %>
-<%@page import="java.util.HashMap" %>
<%@page import="java.text.SimpleDateFormat" %>
<%@page import="java.util.Iterator" %>
-<%@page import="java.util.Map" %>
<%@page import="java.util.Set" %>
<%@page import="java.util.ArrayList" %>
<%@page import="java.util.List" %>
@@ -18,259 +16,243 @@
String temporaryToken = tokenActions.getTemporaryToken();
String permanentToken = tokenActions.getPermanentToken();
String url = (String) request.getAttribute("bowUrl");
- String version = (String) request.getAttribute("version");
%>
-
-<html>
- <link rel="stylesheet" type="text/css" href="./css/styles.css" />
- <link rel="search" type="application/opensearchdescription+xml" title="bowTemporarySearchEngine" href="<%=url%>bow?action=temporaryXml" />
- <link rel="search" type="application/opensearchdescription+xml" title="bowPermanentSearchEngine" href="<%=url%>bow?action=permanentXml" />
- <body>
- <div id="table">
- <h1 class="result">
- <a style="float: left;font-size: 12px; margin-left: 10px;" href="<%=url%>bow?action=home">home</a>
- Home
- </h1>
+<body>
+ <div id="table">
+ <h1 class="result">
+ <a style="float: left;font-size: 12px; margin-left: 10px;" href="<%=url%>bow?action=home">home</a>
+ Home
+ </h1>
+ <%
+ if (bookmarkActions != null) {
+ List<Bookmark> bookmarkList = bookmarkActions.getBookmarks();
+ if (!bookmarkList.isEmpty()) {
+ %>
+ <h2 class="result">The most used bookmarks</h2>
+ <table class="result">
+ <tr class="result">
+ <th class ="result remove">
+ remove
+ </th>
+ <th class="result date">
+ Date
+ </th>
+ <th class="result name">
+ Name
+ </th>
+ <th class ="result tags">
+ Tags
+ </th>
+ <th class=" result click">
+ Click
+ </th>
+ </tr>
<%
- if (bookmarkActions != null) {
- List<Bookmark> bookmarkList = bookmarkActions.getBookmarks();
- if (!bookmarkList.isEmpty()) {
+ SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
+ for (Bookmark bookmark : bookmarkList) {
%>
- <h2 class="result">The most used bookmarks</h2>
- <table class="result">
- <tr class="result">
- <th class ="result remove">
- remove
- </th>
- <th class="result date">
- Date
- </th>
- <th class="result name">
- Name
- </th>
- <th class ="result tags">
- Tags
- </th>
- <th class=" result click">
- Click
- </th>
- </tr>
+ <tr class="result">
+ <td class="result">
+ <a style="border:none;" href="bow?action=removeBookmark&bookmarkId=<%=bookmark.getWikittyId()%>">
+ <IMG style="border:none;" SRC="img/remove.png" ALT="Remove bookmark" TITLE="Remove" />
+ </a>
+ </td>
+ <td class="result">
+ <%=sdf.format(bookmark.getDate())%>
+ </td>
<%
- SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
- for (Bookmark bookmark : bookmarkList) {
+ String alias = bookmark.getAlias();
+ if (alias != null && !alias.isEmpty()) {
+ alias = url + "alias/" + alias;
+ }
%>
- <tr class="result">
- <td class="result">
- <a style="border:none;" href="bow?action=removeBookmark&bookmarkId=<%=bookmark.getWikittyId()%>">
- <IMG style="border:none;" SRC="img/remove.png" ALT="Remove bookmark" TITLE="Remove" />
+ <td class="result" style="text-align: left">
+ <a title ="<%=alias%>" href="bow?action=addClick&bookmarkId=<%=bookmark.getWikittyId()%>" target="_blank"><%=bookmark.getDescription()%></a>
+ <form method="POST" action="bow?action=addAlias&bookmarkId=<%=bookmark.getWikittyId()%>" style="display: inline">
+ <input type="text" name="alias" size="10" value="<%=bookmark.getAlias()%>" />
+ <input style="display: inline;" type="submit" value="Add alias" />
+ </form>
+ <form method="POST" action="bow?action=editBookmark&bookmarkId=<%=bookmark.getWikittyId()%>">
+ <input type="text" name="name" size="35" value="<%=bookmark.getDescription()%>" />
+ <input type="image" src="img/edit.png" title="Edit"/>
+ </form>
+ </td>
+ <td class="result" style="text-align: left">
+ <%
+ Set<String> tagList = bookmark.getTags();
+ if (tagList != null && !tagList.isEmpty()) {
+ for (String tag : tagList) {
+ %>
+ <div style="display: inline">
+ <a style="text-decoration:none" href="bow?action=deleteTag&bookmarkId=<%=bookmark.getWikittyId()%>&deleteTag=<%=tag%>">
+ <IMG style="border:none" SRC="img/delete.png" ALT="Delete tag" TITLE="Delete" />
</a>
- </td>
- <td class="result">
- <%=sdf.format(bookmark.getDate())%>
- </td>
+ <%=tag%>
+ </div>
<%
- String alias = bookmark.getAlias();
- if (alias != null && !alias.isEmpty()) {
- alias = url + "alias/" + alias;
- }
+ }
+ }
%>
- <td class="result" style="text-align: left">
- <a title ="<%=alias%>" href="bow?action=addClick&bookmarkId=<%=bookmark.getWikittyId()%>" target="_blank"><%=bookmark.getDescription()%></a>
- <form method="POST" action="bow?action=addAlias&bookmarkId=<%=bookmark.getWikittyId()%>" style="display: inline">
- <input type="text" name="alias" size="10" value="<%=bookmark.getAlias()%>" />
- <input style="display: inline;" type="submit" value="Add alias" />
- </form>
- <form method="POST" action="bow?action=editBookmark&bookmarkId=<%=bookmark.getWikittyId()%>">
- <input type="text" name="name" size="35" value="<%=bookmark.getDescription()%>" />
- <input type="image" src="img/edit.png" title="Edit"/>
- </form>
- </td>
- <td class="result" style="text-align: left">
- <%
- Set<String> tagList = bookmark.getTags();
- if (tagList != null && !tagList.isEmpty()) {
- for (String tag : tagList) {
- %>
- <div style="display: inline">
- <a style="text-decoration:none" href="bow?action=deleteTag&bookmarkId=<%=bookmark.getWikittyId()%>&deleteTag=<%=tag%>">
- <IMG style="border:none" SRC="img/delete.png" ALT="Delete tag" TITLE="Delete" />
- </a>
- <%=tag%>
- </div>
- <%
- }
- }
- %>
- <form method="POST" action="bow?action=editBookmark&bookmarkId=<%=bookmark.getWikittyId()%>">
- <input type="text" name="tags" size="35" value="<%=BookmarkActions.getBookmarkTagsString(bookmark)%>" />
- <input type="image" src="img/edit.png" title="Edit"/>
- </form>
- </td>
- <td class="result">
- <%=bookmark.getClick()%>
- </td>
- </tr>
- <%
- }
- %>
- </table>
+ <form method="POST" action="bow?action=editBookmark&bookmarkId=<%=bookmark.getWikittyId()%>">
+ <input type="text" name="tags" size="35" value="<%=BookmarkActions.getBookmarkTagsString(bookmark)%>" />
+ <input type="image" src="img/edit.png" title="Edit"/>
+ </form>
+ </td>
+ <td class="result">
+ <%=bookmark.getClick()%>
+ </td>
+ </tr>
<%
- List<Bookmark> lastBookmarks = bookmarkActions.getLastBookmarks();
- if (!lastBookmarks.isEmpty()) {
+ }
%>
- <h2 class="result">The last addition bookmarks</h2>
- <table class="result">
- <tr class="result">
- <th class ="result remove">
- remove
- </th>
- <th class="result date">
- Date
- </th>
- <th class="result name">
- Name
- </th>
- <th class ="result tags">
- Tags
- </th>
- <th class=" result click">
- Click
- </th>
- </tr>
+ </table>
+ <%
+ List<Bookmark> lastBookmarks = bookmarkActions.getLastBookmarks();
+ if (!lastBookmarks.isEmpty()) {
+ %>
+ <h2 class="result">The last addition bookmarks</h2>
+ <table class="result">
+ <tr class="result">
+ <th class ="result remove">
+ remove
+ </th>
+ <th class="result date">
+ Date
+ </th>
+ <th class="result name">
+ Name
+ </th>
+ <th class ="result tags">
+ Tags
+ </th>
+ <th class=" result click">
+ Click
+ </th>
+ </tr>
+ <%
+ for (Bookmark bookmark : lastBookmarks) {
+ %>
+ <tr class="result">
+ <td class="result">
+ <a style="border:none;" href="bow?action=removeBookmark&bookmarkId=<%=bookmark.getWikittyId()%>">
+ <IMG style="border:none;" SRC="img/remove.png" ALT="Remove bookmark" TITLE="Remove" />
+ </a>
+ </td>
+ <td class="result">
+ <%=sdf.format(bookmark.getDate())%>
+ </td>
<%
- for (Bookmark bookmark : lastBookmarks) {
+ String alias = bookmark.getAlias();
+ if (alias != null && !alias.isEmpty()) {
+ alias = url + "alias/" + alias;
+ }
%>
- <tr class="result">
- <td class="result">
- <a style="border:none;" href="bow?action=removeBookmark&bookmarkId=<%=bookmark.getWikittyId()%>">
- <IMG style="border:none;" SRC="img/remove.png" ALT="Remove bookmark" TITLE="Remove" />
+ <td class="result" style="text-align: left">
+ <a title ="<%=alias%>" href="bow?action=addClick&bookmarkId=<%=bookmark.getWikittyId()%>" target="_blank"><%=bookmark.getDescription()%></a>
+ <form method="POST" action="bow?action=addAlias&bookmarkId=<%=bookmark.getWikittyId()%>" style="display: inline">
+ <input type="text" name="alias" size="10" value="<%=bookmark.getAlias()%>" />
+ <input style="display: inline;" type="submit" value="Add alias" />
+ </form>
+ <form method="POST" action="bow?action=editBookmark&bookmarkId=<%=bookmark.getWikittyId()%>">
+ <input type="text" name="name" size="35" value="<%=bookmark.getDescription()%>" />
+ <input type="image" src="img/edit.png" title="Edit"/>
+ </form>
+ </td>
+ <td class="result" style="text-align: left">
+ <%
+ Set<String> tagList = bookmark.getTags();
+ if (tagList != null && !tagList.isEmpty()) {
+ for (String tag : tagList) {
+ %>
+ <div style="display: inline">
+ <a style="text-decoration:none" href="bow?action=deleteTag&bookmarkId=<%=bookmark.getWikittyId()%>&deleteTag=<%=tag%>">
+ <IMG style="border:none;" SRC="img/delete.png" ALT="Delete tag" TITLE="Delete" />
</a>
- </td>
- <td class="result">
- <%=sdf.format(bookmark.getDate())%>
- </td>
+ <%=tag%>
+ </div>
<%
- String alias = bookmark.getAlias();
- if (alias != null && !alias.isEmpty()) {
- alias = url + "alias/" + alias;
- }
+ }
+ }
%>
- <td class="result" style="text-align: left">
- <a title ="<%=alias%>" href="bow?action=addClick&bookmarkId=<%=bookmark.getWikittyId()%>" target="_blank"><%=bookmark.getDescription()%></a>
- <form method="POST" action="bow?action=addAlias&bookmarkId=<%=bookmark.getWikittyId()%>" style="display: inline">
- <input type="text" name="alias" size="10" value="<%=bookmark.getAlias()%>" />
- <input style="display: inline;" type="submit" value="Add alias" />
- </form>
- <form method="POST" action="bow?action=editBookmark&bookmarkId=<%=bookmark.getWikittyId()%>">
- <input type="text" name="name" size="35" value="<%=bookmark.getDescription()%>" />
- <input type="image" src="img/edit.png" title="Edit"/>
- </form>
- </td>
- <td class="result" style="text-align: left">
- <%
- Set<String> tagList = bookmark.getTags();
- if (tagList != null && !tagList.isEmpty()) {
- for (String tag : tagList) {
- %>
- <div style="display: inline">
- <a style="text-decoration:none" href="bow?action=deleteTag&bookmarkId=<%=bookmark.getWikittyId()%>&deleteTag=<%=tag%>">
- <IMG style="border:none;" SRC="img/delete.png" ALT="Delete tag" TITLE="Delete" />
- </a>
- <%=tag%>
- </div>
- <%
- }
- }
- %>
- <form method="POST" action="bow?action=editBookmark&bookmarkId=<%=bookmark.getWikittyId()%>">
- <input type="text" name="tags" size="35" value="<%=BookmarkActions.getBookmarkTagsString(bookmark)%>" />
- <input style="display: inline" type="image" src="img/edit.png" title="Edit"/>
- </form>
- </td>
- <td class="result">
- <%=bookmark.getClick()%>
- </td>
- </tr>
- <%
- }
- %>
- </table>
+ <form method="POST" action="bow?action=editBookmark&bookmarkId=<%=bookmark.getWikittyId()%>">
+ <input type="text" name="tags" size="35" value="<%=BookmarkActions.getBookmarkTagsString(bookmark)%>" />
+ <input style="display: inline" type="image" src="img/edit.png" title="Edit"/>
+ </form>
+ </td>
+ <td class="result">
+ <%=bookmark.getClick()%>
+ </td>
+ </tr>
<%
- }
- } else {
+ }
%>
- <h2 class="result">No Bookmarks</h2>
- <% }
- }
- %>
+ </table>
+ <%
+ }
+ } 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+'|');if%20(nameAndTags!=(document.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+'|');if%20(nameAndTags!=(document.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="bow?action=generateToken">Regenerate permanent token</a></li>
+ </ul>
</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+'|');if%20(nameAndTags!=(document.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+'|');if%20(nameAndTags!=(document.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="bow?action=generateToken">Regenerate permanent token</a></li>
- </ul>
- </div>
- <div class="menu">
- <form method="POST" action="bow?action=addUrl">
- URL<br />
- <input type="text" name="url" size="20" value="URL" /><br />
- Name<br />
- <input type="text" name="name" size="20" value="name" /><br />
- Tags<br />
- <input type="text" name="tags" size="20" value="tag1 tag2..." /><br />
- <input type="submit" value="add" />
- </form>
- </div>
+ <div class="menu">
+ <form method="POST" action="bow?action=addUrl">
+ URL<br />
+ <input type="text" name="url" size="20" value="URL" /><br />
+ Name<br />
+ <input type="text" name="name" size="20" value="name" /><br />
+ Tags<br />
+ <input type="text" name="tags" size="20" value="tag1 tag2..." /><br />
+ <input type="submit" value="add" />
+ </form>
+ </div>
- <div class="menu">
- <div class="tagCloud">
- <% if (bookmarkActions != null) {
- List<FacetTopic> tagCloud = bookmarkActions.getTagsCloud();
- for (FacetTopic tag : tagCloud) {
- int value = tag.getCount();
- String tagName = tag.getTopicName();
- int font = bookmarkActions.getFont(value);
- %>
- <a href="bow?action=search&addTag=<%=tagName%>" title="<%=value%> results" class="tag" style="font-size: <%=font%>px;"><%=tagName%></a>
- <%
- }
+ <div class="menu">
+ <div class="tagCloud">
+ <% if (bookmarkActions != null) {
+ List<FacetTopic> tagCloud = bookmarkActions.getTagsCloud();
+ for (FacetTopic tag : tagCloud) {
+ int value = tag.getCount();
+ String tagName = tag.getTopicName();
+ int font = bookmarkActions.getFont(value);
+ %>
+ <a href="bow?action=search&addTag=<%=tagName%>" title="<%=value%> results" class="tag" style="font-size: <%=font%>px;"><%=tagName%></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" />
- <input style="float: left;" type="submit" value="Find" />
- </form>
- </div>
- </div>
- <div class="menu">
- <form method="POST" action="bow?action=fullText" style="text-align: center;">
- Full text research
- <input style="float: left" type="text" name="fullTextLine" size="15" value="<%=bookmarkActions.getFullTextLine()%>"/>
+ }
+ %>
+ <form method="POST" action="bow?action=search" style="text-align: center;margin-left: 20px;">
+ <input style="float: left" type="text" name="searchLine" size="15" />
<input style="float: left;" type="submit" value="Find" />
</form>
</div>
- <div class="menu">
- <form method="POST" action="bow?action=importBookmarks" enctype="multipart/form-data">
- Import Bookmarks
- <input type="file" name="upfile" />
- <input type="submit" value="Import"/>
- </form>
- <br />
- <a href="bow?action=exportBookmarks">Export bookmarks</a>
- </div>
</div>
- <div class="Index" id="footer">
- <a shape="rect" href="<%=url%>">bow</a>
- <a shape="rect" href="http://www.chorem.org/projects/list_files/bow"><%=version%></a> -
- <a shape="rect" href="http://www.gnu.org/licenses/agpl.html">Licence AGPL</a> -
- <span title="Copyright">©2010</span>
- <a shape="rect" href="http://www.codelutin.com">Code Lutin</a> -
- <a shape="rect" href="http://www.chorem.org/projects/bow/issues">Rapport de bug</a> -
- <a shape="rect" href="http://list.chorem.org/cgi-bin/mailman/listinfo/bow-users">Support utilisateur</a>
+ <div class="menu">
+ <form method="POST" action="bow?action=fullText" style="text-align: center;">
+ Full text research
+ <input style="float: left" type="text" name="fullTextLine" size="15" value="<%=bookmarkActions.getFullTextLine()%>"/>
+ <input style="float: left;" type="submit" value="Find" />
+ </form>
</div>
- </body>
-</html>
+ <div class="menu">
+ <form method="POST" action="bow?action=importBookmarks" enctype="multipart/form-data">
+ Import Bookmarks
+ <input type="file" name="upfile" />
+ <input type="submit" value="Import"/>
+ </form>
+ <br />
+ <a href="bow?action=exportBookmarks">Export bookmarks</a>
+ </div>
+ </div>
+</body>
<%}%>
\ No newline at end of file
Modified: trunk/src/main/webapp/login.jsp
===================================================================
--- trunk/src/main/webapp/login.jsp 2010-06-01 14:15:25 UTC (rev 56)
+++ trunk/src/main/webapp/login.jsp 2010-06-02 10:32:07 UTC (rev 57)
@@ -6,7 +6,9 @@
%>
<html>
- <link rel="stylesheet" type="text/css" href="./css/styles.css" />
+ <jsp:include page="header.jsp" flush="true">
+ <jsp:param name="bowUrl" value="<%=url%>"/>
+ </jsp:include>
<body>
<h1 class="login">Login</h1>
<form method="POST" action="bow?action=login">
@@ -21,14 +23,9 @@
<%if (error != null) {%>
<font color="red"><%=error%></font>
<%}%>
- <div class="Index" id="footer">
- <a shape="rect" href="<%=url%>">bow</a>
- <a shape="rect" href="http://www.chorem.org/projects/list_files/bow"><%=version%></a> -
- <a shape="rect" href="http://www.gnu.org/licenses/agpl.html">Licence AGPL</a> -
- <span title="Copyright">©2010</span>
- <a shape="rect" href="http://www.codelutin.com">Code Lutin</a> -
- <a shape="rect" href="http://www.chorem.org/projects/bow/issues">Rapport de bug</a> -
- <a shape="rect" href="http://list.chorem.org/cgi-bin/mailman/listinfo/bow-users">Support utilisateur</a>
- </div>
+ <jsp:include page="footer.jsp" flush="true" >
+ <jsp:param name="bowUrl" value="<%=url%>" />
+ <jsp:param name="version" value="<%=version%>" />
+ </jsp:include>
</body>
</html>
\ No newline at end of file
Added: trunk/src/main/webapp/main.jsp
===================================================================
--- trunk/src/main/webapp/main.jsp (rev 0)
+++ trunk/src/main/webapp/main.jsp 2010-06-02 10:32:07 UTC (rev 57)
@@ -0,0 +1,40 @@
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<%@page import="org.chorem.bow.BookmarkActions" %>
+<%@page import="org.chorem.bow.TokenActions" %>
+
+<%
+ TokenActions tokenActions = (TokenActions) session.getAttribute("tokenActions");
+ BookmarkActions bookmarkActions = (BookmarkActions) request.getAttribute("bookmarkActions");
+ if (tokenActions != null && bookmarkActions != null) {
+ String searchLine = bookmarkActions.getSearchLine();
+ String url = (String) request.getAttribute("bowUrl");
+ String version = (String) request.getAttribute("version");
+%>
+
+<html>
+ <jsp:include page="header.jsp" flush="true">
+ <jsp:param name="bowUrl" value="<%=url%>"/>
+ </jsp:include>
+ <%
+ if (searchLine != null) {
+ %>
+ <jsp:include page="search.jsp" flush="true">
+ <jsp:param name="bookmarkActions" value="<%=tokenActions%>" />
+ <jsp:param name="bookmarkActions" value="<%=bookmarkActions%>" />
+ <jsp:param name="bowUrl" value="<%=url%>"/>
+ </jsp:include>
+ <% } else {
+ %>
+ <jsp:include page="home.jsp" flush="true">
+ <jsp:param name="bookmarkActions" value="<%=tokenActions%>" />
+ <jsp:param name="bookmarkActions" value="<%=bookmarkActions%>" />
+ <jsp:param name="bowUrl" value="<%=url%>"/>
+ </jsp:include>
+ <% }
+ %>
+ <jsp:include page="footer.jsp" flush="true" >
+ <jsp:param name="bowUrl" value="<%=url%>" />
+ <jsp:param name="version" value="<%=version%>" />
+ </jsp:include>
+</html>
+<%}%>
\ No newline at end of file
Modified: trunk/src/main/webapp/openSearchResult.jsp
===================================================================
--- trunk/src/main/webapp/openSearchResult.jsp 2010-06-01 14:15:25 UTC (rev 56)
+++ trunk/src/main/webapp/openSearchResult.jsp 2010-06-02 10:32:07 UTC (rev 57)
@@ -20,7 +20,9 @@
%>
<html>
- <link rel="stylesheet" type="text/css" href="./css/styles.css" />
+ <jsp:include page="header.jsp" flush="true">
+ <jsp:param name="bowUrl" value="<%=url%>"/>
+ </jsp:include>
<body>
<h1 class="result">Results</h1>
Modified: trunk/src/main/webapp/register.jsp
===================================================================
--- trunk/src/main/webapp/register.jsp 2010-06-01 14:15:25 UTC (rev 56)
+++ trunk/src/main/webapp/register.jsp 2010-06-02 10:32:07 UTC (rev 57)
@@ -5,7 +5,9 @@
String version = (String) request.getAttribute("version");
%>
<html>
- <link rel="stylesheet" type="text/css" href="./css/styles.css" />
+ <jsp:include page="header.jsp" flush="true">
+ <jsp:param name="bowUrl" value="<%=url%>"/>
+ </jsp:include>
<body>
<h1 class="login">Register</h1>
@@ -21,14 +23,9 @@
<%if (error != null && error.isEmpty() == false) {%>
<font color="red"><%=error%></font>
<%}%>
- <div class="Index" id="footer">
- <a shape="rect" href="<%=url%>">bow</a>
- <a shape="rect" href="http://www.chorem.org/projects/list_files/bow"><%=version%></a> -
- <a shape="rect" href="http://www.gnu.org/licenses/agpl.html">Licence AGPL</a> -
- <span title="Copyright">©2010</span>
- <a shape="rect" href="http://www.codelutin.com">Code Lutin</a> -
- <a shape="rect" href="http://www.chorem.org/projects/bow/issues">Rapport de bug</a> -
- <a shape="rect" href="http://list.chorem.org/cgi-bin/mailman/listinfo/bow-users">Support utilisateur</a>
- </div>
+ <jsp:include page="footer.jsp" flush="true" >
+ <jsp:param name="bowUrl" value="<%=url%>" />
+ <jsp:param name="version" value="<%=version%>" />
+ </jsp:include>
</body>
</html>
\ No newline at end of file
Modified: trunk/src/main/webapp/search.jsp
===================================================================
--- trunk/src/main/webapp/search.jsp 2010-06-01 14:15:25 UTC (rev 56)
+++ trunk/src/main/webapp/search.jsp 2010-06-02 10:32:07 UTC (rev 57)
@@ -1,10 +1,8 @@
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%@page import="org.chorem.bow.Bookmark" %>
<%@page import="org.chorem.bow.BookmarkActions" %>
-<%@page import="java.util.HashMap" %>
<%@page import="java.text.SimpleDateFormat" %>
<%@page import="java.util.Iterator" %>
-<%@page import="java.util.Map" %>
<%@page import="java.util.Set" %>
<%@page import="java.util.ArrayList" %>
<%@page import="java.util.List" %>
@@ -23,189 +21,174 @@
String version = (String) request.getAttribute("version");
%>
-<html>
- <head>
- <link rel="stylesheet" type="text/css" href="./css/styles.css" />
- <link rel="search" type="application/opensearchdescription+xml" title="bowTemporarySearchEngine" href="<%=url%>bow?action=temporaryXml" />
- <link rel="search" type="application/opensearchdescription+xml" title="bowPermanentSearchEngine" href="<%=url%>bow?action=permanentXml" />
- <body>
- <div id="table">
- <h1 class="result">
- <a style="float: left;font-size: 12px; margin-left: 10px;" href="<%=url%>bow?action=home">home</a>
- My Bookmarks
- </h1>
+<body>
+ <div id="table">
+ <h1 class="result">
+ <a style="float: left;font-size: 12px; margin-left: 10px;" href="<%=url%>bow?action=home">home</a>
+ My Bookmarks
+ </h1>
+ <%
+ if (bookmarkActions != null) {
+ List<Bookmark> bookmarkList = bookmarkActions.getBookmarks();
+ if (!bookmarkList.isEmpty()) {
+ %>
+ <table class="result">
+ <tr class="result">
+ <th class="result remove">Remove</th>
+ <th class="result date">
+ Date
+ <a style="text-decoration:none" href="bow?action=orderAsc&type=date&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>" >
+ <IMG style="border:none" SRC="img/asc.png" ALT="order ASC" TITLE="Asc" />
+ </a>
+ <a style="text-decoration:none" href="bow?action=orderDesc&type=date&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>">
+ <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" />
+ </a>
+ </th>
+ <th class="result name">
+ Name
+ <a style="text-decoration:none" href="bow?action=orderAsc&type=name&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>">
+ <IMG style="border:none" SRC="img/asc.png" ALT="order ASC" TITLE="Asc" />
+ </a>
+ <a style="text-decoration:none" href="bow?action=orderDesc&type=name&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>">
+ <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" />
+ </a>
+ </th>
+ <th class ="result tags">Tags</th>
+ <th class=" result click">
+ Click
+ <a style="text-decoration:none" href="bow?action=orderAsc&type=click&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>">
+ <IMG style="border:none" SRC="img/asc.png" ALT="order ASC" TITLE="Asc" />
+ </a>
+ <a style="text-decoration:none" href="bow?action=orderDesc&type=click&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>">
+ <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" />
+ </a>
+ </th>
+ </tr>
<%
- if (bookmarkActions != null) {
- List<Bookmark> bookmarkList = bookmarkActions.getBookmarks();
- if (!bookmarkList.isEmpty()) {
+ SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
+ for (Bookmark bookmark : bookmarkList) {
%>
- <table class="result">
- <tr class="result">
- <th class="result remove">Remove</th>
- <th class="result date">
- Date
- <a style="text-decoration:none" href="bow?action=orderAsc&type=date&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>" >
- <IMG style="border:none" SRC="img/asc.png" ALT="order ASC" TITLE="Asc" />
- </a>
- <a style="text-decoration:none" href="bow?action=orderDesc&type=date&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>">
- <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" />
- </a>
- </th>
- <th class="result name">
- Name
- <a style="text-decoration:none" href="bow?action=orderAsc&type=name&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>">
- <IMG style="border:none" SRC="img/asc.png" ALT="order ASC" TITLE="Asc" />
- </a>
- <a style="text-decoration:none" href="bow?action=orderDesc&type=name&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>">
- <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" />
- </a>
- </th>
- <th class ="result tags">Tags</th>
- <th class=" result click">
- Click
- <a style="text-decoration:none" href="bow?action=orderAsc&type=click&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>">
- <IMG style="border:none" SRC="img/asc.png" ALT="order ASC" TITLE="Asc" />
- </a>
- <a style="text-decoration:none" href="bow?action=orderDesc&type=click&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>">
- <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" />
- </a>
- </th>
- </tr>
+ <tr class="result">
+ <td class="result">
+ <a style="border:none;" href="bow?action=removeBookmark&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>">
+ <IMG style="border:none;" SRC="img/remove.png" ALT="Remove bookmark" TITLE="Remove" />
+ </a>
+ </td>
+ <td class="result">
+ <%=sdf.format(bookmark.getDate())%>
+ </td>
<%
- SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
- for (Bookmark bookmark : bookmarkList) {
+ String alias = bookmark.getAlias();
+ if (alias != null && !alias.isEmpty()) {
+ alias = url + "alias/" + alias;
+ }
%>
- <tr class="result">
- <td class="result">
- <a style="border:none;" href="bow?action=removeBookmark&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>">
- <IMG style="border:none;" SRC="img/remove.png" ALT="Remove bookmark" TITLE="Remove" />
+ <td class="result">
+ <a title ="<%=alias%>" href="bow?action=addClick&bookmarkId=<%=bookmark.getWikittyId()%>" target="_blank"><%=bookmark.getDescription()%></a>
+ <form method="POST" action="bow?action=addAlias&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>" style="display: inline">
+ <input type="text" name="alias" size="10" value="<%=bookmark.getAlias()%>" />
+ <input style="display: inline;" type="submit" value="Add alias" />
+ </form>
+ <form method="POST" action="bow?action=editBookmark&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>">
+ <input type="text" name="name" size="35" value="<%=bookmark.getDescription()%>" />
+ <input type="image" src="img/edit.png" title="Edit"/>
+ </form>
+ </td>
+ <td class="result" style="text-align: left">
+ <%
+ Set<String> tagList = bookmark.getTags();
+ if (tagList != null && !tagList.isEmpty()) {
+ for (String tag : tagList) {
+ %>
+ <div style="display: inline">
+ <a style="text-decoration:none" href="bow?action=deleteTag&bookmarkId=<%=bookmark.getWikittyId()%>&deleteTag=<%=tag%>&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>">
+ <IMG style="border:none" SRC="img/delete.png" ALT="Delete tag" TITLE="Delete" />
</a>
- </td>
- <td class="result">
- <%=sdf.format(bookmark.getDate())%>
- </td>
+ <%=tag%>
+ </div>
<%
- String alias = bookmark.getAlias();
- if (alias != null && !alias.isEmpty()) {
- alias = url + "alias/" + alias;
- }
+ }
+ }
%>
- <td class="result">
- <a title ="<%=alias%>" href="bow?action=addClick&bookmarkId=<%=bookmark.getWikittyId()%>" target="_blank"><%=bookmark.getDescription()%></a>
- <form method="POST" action="bow?action=addAlias&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>" style="display: inline">
- <input type="text" name="alias" size="10" value="<%=bookmark.getAlias()%>" />
- <input style="display: inline;" type="submit" value="Add alias" />
- </form>
- <form method="POST" action="bow?action=editBookmark&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>">
- <input type="text" name="name" size="35" value="<%=bookmark.getDescription()%>" />
- <input type="image" src="img/edit.png" title="Edit"/>
- </form>
- </td>
- <td class="result" style="text-align: left">
- <%
- Set<String> tagList = bookmark.getTags();
- if (tagList != null && !tagList.isEmpty()) {
- for (String tag : tagList) {
- %>
- <div style="display: inline">
- <a style="text-decoration:none" href="bow?action=deleteTag&bookmarkId=<%=bookmark.getWikittyId()%>&deleteTag=<%=tag%>&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>">
- <IMG style="border:none" SRC="img/delete.png" ALT="Delete tag" TITLE="Delete" />
- </a>
- <%=tag%>
- </div>
- <%
- }
- }
- %>
- <form method="POST" action="bow?action=editBookmark&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>">
- <input type="text" name="tags" size="35" value="<%=BookmarkActions.getBookmarkTagsString(bookmark)%>" />
- <input type="image" src="img/edit.png" title="Edit"/>
- </form>
- </td>
- <td class="result">
- <%=bookmark.getClick()%>
- </td>
- </tr>
- <%
- }
- %>
- </table>
+ <form method="POST" action="bow?action=editBookmark&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>">
+ <input type="text" name="tags" size="35" value="<%=BookmarkActions.getBookmarkTagsString(bookmark)%>" />
+ <input type="image" src="img/edit.png" title="Edit"/>
+ </form>
+ </td>
+ <td class="result">
+ <%=bookmark.getClick()%>
+ </td>
+ </tr>
<%
- } else {
+ }
%>
- <h2 class="result">No Bookmarks</h2>
- <% }
- }
- %>
+ </table>
+ <%
+ } 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="bow?action=home">Home</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="bow?action=generateToken&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>">Regenerate permanent token</a></li>
+ </ul>
</div>
- <div id="menu">
- <div class="menu">
- <ul id="meta">
- <li><a href="bow?action=logout">Logout</a></li>
- <li><a href="bow?action=home">Home</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="bow?action=generateToken&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>">Regenerate permanent token</a></li>
- </ul>
+ <div class="menu">
+ <form method="POST" action="bow?action=addUrl&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>">
+ URL<br />
+ <input type="text" name="url" size="20" value="URL" /><br />
+ Name<br />
+ <input type="text" name="name" size="20" value="name" /><br />
+ Tags<br />
+ <input type="text" name="tags" size="20" value="tag1 tag2..." /><br />
+ <input type="submit" value="add" />
+ </form>
+ </div>
+
+ <div class="menu">
+ <div class="tagCloud">
+ <% if (bookmarkActions != null) {
+ List<FacetTopic> tagCloud = bookmarkActions.getTagsCloud();
+ for (FacetTopic tag : tagCloud) {
+ int value = tag.getCount();
+ String tagName = tag.getTopicName();
+ int font = bookmarkActions.getFont(value);
+ %>
+ <a href="bow?action=search&addTag=<%=tagName%>&searchLine=<%=searchLine%>" title="<%=value%> results" class="tag" style="font-size: <%=font%>px;"><%=tagName%></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" value="<%=searchLine%>" />
+ <input style="float: left" type="submit" value="Find" />
+ </form>
</div>
<div class="menu">
- <form method="POST" action="bow?action=addUrl&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>">
- URL<br />
- <input type="text" name="url" size="20" value="URL" /><br />
- Name<br />
- <input type="text" name="name" size="20" value="name" /><br />
- Tags<br />
- <input type="text" name="tags" size="20" value="tag1 tag2..." /><br />
- <input type="submit" value="add" />
+ <form method="POST" action="bow?action=fullText" style="text-align: center;">
+ Full text research
+ <input style="float: left" type="text" name="fullTextLine" size="15" value="<%=bookmarkActions.getFullTextLine()%>" />
+ <input style="float: left;" type="submit" value="Find" />
</form>
</div>
-
<div class="menu">
- <div class="tagCloud">
- <% if (bookmarkActions != null) {
- List<FacetTopic> tagCloud = bookmarkActions.getTagsCloud();
- for (FacetTopic tag : tagCloud) {
- int value = tag.getCount();
- String tagName = tag.getTopicName();
- int font = bookmarkActions.getFont(value);
- %>
- <a href="bow?action=search&addTag=<%=tagName%>&searchLine=<%=searchLine%>" title="<%=value%> results" class="tag" style="font-size: <%=font%>px;"><%=tagName%></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" value="<%=searchLine%>" />
- <input style="float: left" type="submit" value="Find" />
- </form>
- </div>
- <div class="menu">
- <form method="POST" action="bow?action=fullText" style="text-align: center;">
- Full text research
- <input style="float: left" type="text" name="fullTextLine" size="15" value="<%=bookmarkActions.getFullTextLine()%>" />
- <input style="float: left;" type="submit" value="Find" />
- </form>
- </div>
- <div class="menu">
- <form method="post" action="bow?action=importBookmarks&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>" enctype="multipart/form-data">
- Import Bookmarks
- <input type="file" name="upfile" />
- <input type="submit" value="Import"/>
- </form>
- <br />
- <a href="bow?action=exportBookmarks&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>">Export bookmarks</a>
- </div>
+ <form method="post" action="bow?action=importBookmarks&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>" enctype="multipart/form-data">
+ Import Bookmarks
+ <input type="file" name="upfile" />
+ <input type="submit" value="Import"/>
+ </form>
+ <br />
+ <a href="bow?action=exportBookmarks&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>">Export bookmarks</a>
</div>
</div>
- <div class="Index" id="footer">
- <a shape="rect" href="<%=url%>">bow</a>
- <a shape="rect" href="http://www.chorem.org/projects/list_files/bow"><%=version%></a> -
- <a shape="rect" href="http://www.gnu.org/licenses/agpl.html">Licence AGPL</a> -
- <span title="Copyright">©2010</span>
- <a shape="rect" href="http://www.codelutin.com">Code Lutin</a> -
- <a shape="rect" href="http://www.chorem.org/projects/bow/issues">Rapport de bug</a> -
- <a shape="rect" href="http://list.chorem.org/cgi-bin/mailman/listinfo/bow-users">Support utilisateur</a>
- </div>
- </body>
-</html>
+ </div>
+</body>
<%}%>
\ No newline at end of file
Modified: trunk/src/main/xmi/bow.zargo
===================================================================
(Binary files differ)
1
0
01 Jun '10
Author: bbrossaud
Date: 2010-06-01 16:15:25 +0200 (Tue, 01 Jun 2010)
New Revision: 56
Url: http://chorem.org/repositories/revision/bow/56
Log:
replace model by a singleton instance
Modified:
trunk/src/main/java/org/chorem/bow/AliasServlet.java
trunk/src/main/java/org/chorem/bow/BookmarkActions.java
trunk/src/main/java/org/chorem/bow/BowProxy.java
trunk/src/main/java/org/chorem/bow/ControllerServlet.java
trunk/src/main/webapp/search.jsp
Modified: trunk/src/main/java/org/chorem/bow/AliasServlet.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/AliasServlet.java 2010-06-01 13:39:30 UTC (rev 55)
+++ trunk/src/main/java/org/chorem/bow/AliasServlet.java 2010-06-01 14:15:25 UTC (rev 56)
@@ -20,7 +20,6 @@
*/
public class AliasServlet extends HttpServlet {
- protected Model model = new Model();
protected String bowUrl = "";
public AliasServlet() throws ArgumentsParserException {
@@ -48,7 +47,7 @@
String alias = url.substring(index);
if (alias != null && !alias.isEmpty()) {
alias = alias.substring(1);
- WikittyProxy proxy = model.getProxy();
+ WikittyProxy proxy = BowProxy.getInstance();
Criteria criteria = Search.query().eq(Bookmark.FQ_FIELD_ALIAS, alias).criteria();
Bookmark bookmark = proxy.findByCriteria(Bookmark.class, criteria);
if (bookmark != null) {
Modified: trunk/src/main/java/org/chorem/bow/BookmarkActions.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-06-01 13:39:30 UTC (rev 55)
+++ trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-06-01 14:15:25 UTC (rev 56)
@@ -105,7 +105,7 @@
/* @param url String which contains the bookmark url
* @param nameAndTags String which contains the name and the tags of the
- bookmark separated by '|' ==> name|tag1 tag2...
+ * bookmark separated by '|' ==> name|tag1 tag2...
* @param user bookmark user
* @return null if all fields are not correctly filled
* @return Bookmark the website bookmark
@@ -155,7 +155,7 @@
if (!tagList.contains(tagsTab[i]) && !tagsTab[i].isEmpty()) {
bookmark.addTags(tagsTab[i]); // Added tag for each rank (one tag by rank)
}
- } else if (!tagsTab[i].isEmpty()){
+ } else if (!tagsTab[i].isEmpty()) {
bookmark.addTags(tagsTab[i]);
}
}
@@ -165,7 +165,7 @@
public static void addTagsToBookmark(List<String> tagList, Bookmark bookmark) {
if (tagList != null && !tagList.isEmpty()) {
for (String tag : tagList) {
- addTagsToBookmark(tag, bookmark);
+ addTagsToBookmark(tag, bookmark);
}
}
}
Modified: trunk/src/main/java/org/chorem/bow/BowProxy.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/BowProxy.java 2010-06-01 13:39:30 UTC (rev 55)
+++ trunk/src/main/java/org/chorem/bow/BowProxy.java 2010-06-01 14:15:25 UTC (rev 56)
@@ -23,6 +23,7 @@
import org.nuiton.wikitty.WikittyProxy;
import org.nuiton.wikitty.WikittyService;
//import org.nuiton.wikitty.WikittyServiceCached;
+import org.nuiton.wikitty.WikittyServiceCached;
import org.nuiton.wikitty.jdbc.WikittyServiceJDBC;
/**
@@ -52,7 +53,7 @@
protected BowProxy(BowConfig config) {
WikittyService ws = new WikittyServiceJDBC(config.getFlatOptions());
// FIXME activate next line, when new wikitty version released ans tested
-// ws = new WikittyServiceCached(ws);
+ ws = new WikittyServiceCached(ws);
setWikittyService(ws);
}
Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-06-01 13:39:30 UTC (rev 55)
+++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-06-01 14:15:25 UTC (rev 56)
@@ -12,10 +12,8 @@
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServlet;
@@ -47,7 +45,6 @@
public class ControllerServlet extends HttpServlet {
private static final Log log = LogFactory.getLog(ControllerServlet.class);
- protected Model model = new Model();
protected String version = "";
protected String url = "";
@@ -236,7 +233,7 @@
if (searchLine != null && searchLine.matches("^http://[^ ]*") && !searchLine.contains(" ")) {
response.sendRedirect(searchLine);
} else {
- WikittyProxy proxy = model.getProxy();
+ WikittyProxy proxy = BowProxy.getInstance();
Criteria criteria = getBookmarkListCriteriaByUser(user, searchLine);
criteria = criteria.addSortDescending(Bookmark.FQ_FIELD_CLICK);
PagedResult result = proxy.findAllByCriteria(Bookmark.class, criteria);
@@ -253,7 +250,7 @@
String search = request.getParameter("search");
if (search != null) {
OpenSearchActions openSearchActions = new OpenSearchActions();
- WikittyProxy proxy = model.getProxy();
+ WikittyProxy proxy = BowProxy.getInstance();
String[] words = search.split("\\s+");
List<String> searchLine = new ArrayList<String>(Arrays.asList(words));
if (search.charAt(search.length() - 1) == ' ') {
@@ -286,7 +283,7 @@
throws IOException, ServletException {
String bookmarkId = request.getParameter("bookmarkId");
if (bookmarkId != null && !bookmarkId.isEmpty()) {
- WikittyProxy proxy = model.getProxy();
+ WikittyProxy proxy = BowProxy.getInstance();
Bookmark bookmark = proxy.restore(Bookmark.class, bookmarkId);
if (bookmark != null) {
int click = bookmark.getClick();
@@ -305,7 +302,7 @@
String searchLine = request.getParameter("searchLine");
Criteria baseCriteria = getBookmarkListCriteriaByUser(user, searchLine);
if (type != null && baseCriteria != null && !type.isEmpty()) {
- WikittyProxy proxy = model.getProxy();
+ WikittyProxy proxy = BowProxy.getInstance();
PagedResult result = null;
if (type.equals("name")) {
Criteria criteria = baseCriteria.addSortAscending(Bookmark.FQ_FIELD_DESCRIPTION);
@@ -328,7 +325,7 @@
String type = request.getParameter("type");
Criteria baseCriteria = getBookmarkListCriteriaByUser(user, searchLine);
if (type != null && baseCriteria != null && !type.isEmpty()) {
- WikittyProxy proxy = model.getProxy();
+ WikittyProxy proxy = BowProxy.getInstance();
PagedResult result = null;
if (type.equals("name")) {
Criteria criteria = baseCriteria.addSortDescending(Bookmark.FQ_FIELD_DESCRIPTION);
@@ -351,7 +348,7 @@
String name = request.getParameter("name");
String bookmarkId = request.getParameter("bookmarkId");
if (bookmarkId != null && !bookmarkId.isEmpty()) {
- WikittyProxy proxy = model.getProxy();
+ WikittyProxy proxy = BowProxy.getInstance();
Bookmark bookmark = proxy.restore(Bookmark.class, bookmarkId);
if (bookmark != null) {
BookmarkActions.updateBookmarkName(bookmark, name);
@@ -366,7 +363,7 @@
throws IOException, ServletException {
String bookmarkId = request.getParameter("bookmarkId");
if (bookmarkId != null && !bookmarkId.isEmpty()) {
- WikittyProxy proxy = model.getProxy();
+ WikittyProxy proxy = BowProxy.getInstance();
Bookmark bookmark = proxy.restore(Bookmark.class, bookmarkId);
if (bookmark != null) {
proxy.delete(bookmarkId);
@@ -381,7 +378,7 @@
String tag = request.getParameter("deleteTag");
if (tag != null && bookmarkId != null) {
if (!bookmarkId.isEmpty()) {
- WikittyProxy proxy = model.getProxy();
+ WikittyProxy proxy = BowProxy.getInstance();
Bookmark bookmark = proxy.restore(Bookmark.class, bookmarkId);
if (bookmark != null) {
bookmark.removeTags(tag);
@@ -400,7 +397,7 @@
protected void actionGenerateToken(HttpServletRequest request, HttpServletResponse response, User user, HttpSession session)
throws IOException, ServletException, NoSuchAlgorithmException {
- WikittyProxy proxy = model.getProxy();
+ WikittyProxy proxy = BowProxy.getInstance();
Criteria criteria = Search.query().eq(User.FQ_FIELD_EMAIL, user.getEmail()).criteria();
Token currentToken = proxy.findByCriteria(Token.class, criteria);
if (currentToken != null) {
@@ -445,7 +442,7 @@
bookmark = BookmarkActions.createBookmark(link, nameAndTags, user);
}
if (bookmark != null) {
- WikittyProxy proxy = model.getProxy();
+ WikittyProxy proxy = BowProxy.getInstance();
proxy.store(bookmark); // store the bookmark if all is Ok
if (log.isDebugEnabled()) {
log.debug("Adding URL");
@@ -468,7 +465,7 @@
*/
protected User checkPermanentToken(String token) {
if (token != null) {
- WikittyProxy proxy = model.getProxy();
+ WikittyProxy proxy = BowProxy.getInstance();
Criteria criteria = Search.query().eq(Token.FQ_FIELD_TOKEN, token).criteria();
Token DbToken = proxy.findByCriteria(Token.class, criteria);
if (DbToken != null) { // check if the token exists
@@ -508,7 +505,7 @@
searchLine += " " + tag;
}
}
- WikittyProxy proxy = model.getProxy();
+ WikittyProxy proxy = BowProxy.getInstance();
Criteria criteria = getBookmarkListCriteriaByUser(user, searchLine);
criteria = criteria.addSortDescending(Bookmark.FQ_FIELD_CLICK);
PagedResult result = proxy.findAllByCriteria(Bookmark.class, criteria); // select all bookmarks by user
@@ -550,7 +547,7 @@
request.setAttribute("msgError", error);
request.getRequestDispatcher("register.jsp").forward(request, response);
} else {
- WikittyProxy proxy = model.getProxy();
+ WikittyProxy proxy = BowProxy.getInstance();
UserImpl newUser = new UserImpl();
newUser.setPassword(request.getParameter("password"));
newUser.setEmail(request.getParameter("email"));
@@ -591,7 +588,7 @@
protected void initializeToken(HttpSession session, User login)
throws NoSuchAlgorithmException {
- WikittyProxy proxy = model.getProxy();
+ WikittyProxy proxy = BowProxy.getInstance();
Criteria criteria = Search.query().eq(User.FQ_FIELD_EMAIL, login.getEmail()).criteria();
Token token = proxy.findByCriteria(Token.class, criteria);
TokenActions tokenActions = new TokenActions();
@@ -617,7 +614,7 @@
protected User checkLogin(String email, String password) {
if (email != null && password != null) {
if (!email.isEmpty() && !password.isEmpty()) {
- WikittyProxy proxy = model.getProxy();
+ WikittyProxy proxy = BowProxy.getInstance();
Criteria criteria = Search.query().eq(User.FQ_FIELD_EMAIL, email).
eq(User.FQ_FIELD_PASSWORD, password).criteria();
@@ -635,7 +632,7 @@
protected boolean checkRegister(String email, String password) {
if (email != null && password != null) {
if (!email.isEmpty() && !password.isEmpty()) {
- WikittyProxy proxy = model.getProxy();
+ WikittyProxy proxy = BowProxy.getInstance();
Criteria criteria = Search.query().eq(User.FQ_FIELD_EMAIL, email).criteria(); // retrieve user by user name (email)
if (proxy.findByCriteria(User.class, criteria) == null) {
@@ -647,7 +644,7 @@
}
protected void actionHome(HttpServletRequest request, User user) {
- WikittyProxy proxy = model.getProxy();
+ WikittyProxy proxy = BowProxy.getInstance();
Criteria criteria = getBookmarkListCriteriaByUser(user, null);
if (criteria != null) {
Criteria sortCriteria = criteria.addSortDescending(Bookmark.FQ_FIELD_CLICK);
@@ -683,7 +680,7 @@
while (iter.hasNext()) {
FileItem item = (FileItem) iter.next();
if (!item.isFormField()) {
- WikittyProxy proxy = model.getProxy();
+ WikittyProxy proxy = BowProxy.getInstance();
String content = item.getString();
Parser parser = new Parser(content);
NodeList list = parser.parse(null);
@@ -733,7 +730,7 @@
protected void actionExportBookmarks(HttpServletResponse response, User user)
throws IOException {
- WikittyProxy proxy = model.getProxy();
+ WikittyProxy proxy = BowProxy.getInstance();
Criteria criteria = Search.query().eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria();
List<Bookmark> bookmarks = proxy.findAllByCriteria(Bookmark.class, criteria).getAll();
String export = BookmarkActions.getExportHtmlBookmark(bookmarks);
@@ -751,7 +748,7 @@
throws IOException {
String alias = request.getParameter("alias");
if (alias != null && !alias.isEmpty()) {
- WikittyProxy proxy = model.getProxy();
+ 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()) {
@@ -769,7 +766,7 @@
}
protected void actionFullText(HttpServletRequest request, User user) {
- WikittyProxy proxy = model.getProxy();
+ WikittyProxy proxy = BowProxy.getInstance();
Criteria criteria = getBookmarkListCriteriaByUser(user, null);
PagedResult result = proxy.findAllByCriteria(Bookmark.class, criteria);
BookmarkActions bookmarkActions = createBookmarkActions(request, result, null);
Modified: trunk/src/main/webapp/search.jsp
===================================================================
--- trunk/src/main/webapp/search.jsp 2010-06-01 13:39:30 UTC (rev 55)
+++ trunk/src/main/webapp/search.jsp 2010-06-01 14:15:25 UTC (rev 56)
@@ -24,6 +24,7 @@
%>
<html>
+ <head>
<link rel="stylesheet" type="text/css" href="./css/styles.css" />
<link rel="search" type="application/opensearchdescription+xml" title="bowTemporarySearchEngine" href="<%=url%>bow?action=temporaryXml" />
<link rel="search" type="application/opensearchdescription+xml" title="bowPermanentSearchEngine" href="<%=url%>bow?action=permanentXml" />
1
0
Author: bpoussin
Date: 2010-06-01 15:39:30 +0200 (Tue, 01 Jun 2010)
New Revision: 55
Url: http://chorem.org/repositories/revision/bow/55
Log:
ajout d'un proxy specifique bow (il faut modifier le pom pour prendre la prochaine release wikitty qui ne devrait pas tarder)
Added:
trunk/src/main/java/org/chorem/bow/BowProxy.java
Added: trunk/src/main/java/org/chorem/bow/BowProxy.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/BowProxy.java (rev 0)
+++ trunk/src/main/java/org/chorem/bow/BowProxy.java 2010-06-01 13:39:30 UTC (rev 55)
@@ -0,0 +1,60 @@
+/* *##%
+ * Copyright (c) 2010 poussin. All rights reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *##%*/
+
+package org.chorem.bow;
+
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.nuiton.wikitty.WikittyProxy;
+import org.nuiton.wikitty.WikittyService;
+//import org.nuiton.wikitty.WikittyServiceCached;
+import org.nuiton.wikitty.jdbc.WikittyServiceJDBC;
+
+/**
+ * Proxy pour utiliser les wikitty convenablement initialise.
+ *
+ * @author poussin
+ * @version $Revision$
+ *
+ * Last update: $Date$
+ * by : $Author$
+ */
+public class BowProxy extends WikittyProxy {
+
+ /** to use log facility, just put in your code: log.info(\"...\"); */
+ static private Log log = LogFactory.getLog(BowProxy.class);
+
+ static protected BowProxy instance;
+
+ synchronized static public BowProxy getInstance() {
+ if (instance == null) {
+ BowConfig config = BowConfig.getInstance();
+ instance = new BowProxy(config);
+ }
+ return instance;
+ }
+
+ protected BowProxy(BowConfig config) {
+ WikittyService ws = new WikittyServiceJDBC(config.getFlatOptions());
+ // FIXME activate next line, when new wikitty version released ans tested
+// ws = new WikittyServiceCached(ws);
+ setWikittyService(ws);
+ }
+
+
+}
1
0
Author: bbrossaud
Date: 2010-06-01 15:24:46 +0200 (Tue, 01 Jun 2010)
New Revision: 54
Url: http://chorem.org/repositories/revision/bow/54
Log:
remove debugs
Modified:
trunk/src/main/java/org/chorem/bow/ControllerServlet.java
Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-06-01 13:24:13 UTC (rev 53)
+++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-06-01 13:24:46 UTC (rev 54)
@@ -706,7 +706,6 @@
String plainText = node.toPlainTextString();
String text = node.getText();
if (text != null && text.startsWith("H3")) {
- log.debug(text);
if (plainText != null && !plainText.isEmpty()) {
tagList.add(plainText);
isFolder = true;
1
0