April 2008 - Nuiton-rss-commits - mailman.cloud.codelutin.com

[Lutinweb-commits] r30 - trunk/lutinrss/src/main/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org 29 Apr '08

29 Apr '08

Author: tchemit Date: 2008-04-29 20:02:25 +0000 (Tue, 29 Apr 2008) New Revision: 30 Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/FeedHTMLRenderer.java Log: refactoring renderer: pour le field name, on rends aussi l'url. Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/FeedHTMLRenderer.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/FeedHTMLRenderer.java 2008-04-29 20:00:36 UTC (rev 29) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/FeedHTMLRenderer.java 2008-04-29 20:02:25 UTC (rev 30) @@ -22,7 +22,10 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ private static final Log log = LogFactory.getLog(FeedHTMLRenderer.class); - + + private static final String FEED_CSS_PREFIX ="feed-"; + private static final String FEED_ITEM_CSS_PREFIX ="feedItem-"; + /** tous les HTMLCleaner a utiliser pour nettoyer les chaines */ protected Set<HTMLCleaner> cleaners = new HashSet<HTMLCleaner>(); @@ -46,24 +49,31 @@ } templates.put(Field.NAME, "<span class=\"%1$s\">%2$s</span>\n"); + templates.put(Field.LINK, "<a class=\"%1$s\" href=\"%2$s\">%3$s</a>"); templates.put(Field.IMAGE, "<span class=\"%1$s\"><img src=\"%2$s\"/></span>\n"); templates.put(Field.DESCRIPTION, "<span class=\"%1$s\">%2$s</span>\n"); templates.put(Field.AUTHOR, "<span class=\"%1$s\">%2$s</span>\n"); - templates.put(Field.TIME, "<span class=\"%1$s\">%2$tF</span>\n"); + //Probleme de conversion FIXME + templates.put(Field.TIME, "<span class=\"%1$s\">%2$s</span>\n"); + //templates.put(Field.TIME, "<span class=\"%1$s\">%2$tF</span>\n"); classnames.put(Field.NAME, "name"); + classnames.put(Field.LINK, "link"); classnames.put(Field.IMAGE, "image"); classnames.put(Field.DESCRIPTION, "description"); classnames.put(Field.AUTHOR, "author"); classnames.put(Field.TIME, "time"); feedProperties.put(Field.NAME, "title"); + feedProperties.put(Field.LINK, "link"); + // cela engendre des NPE... feedProperties.put(Field.IMAGE, "image.url"); feedProperties.put(Field.DESCRIPTION, "description"); feedProperties.put(Field.AUTHOR, "author"); feedProperties.put(Field.TIME, "publishedDate"); itemProperties.put(Field.NAME, "title"); + itemProperties.put(Field.LINK, "link"); itemProperties.put(Field.IMAGE, null); itemProperties.put(Field.DESCRIPTION, "description.value"); itemProperties.put(Field.AUTHOR, "author"); @@ -84,21 +94,88 @@ /** * Ajoute un nouveau cleaner de code HTML + * @param cleaner cleaner to add */ public void addHTMLCleaner(HTMLCleaner cleaner) { cleaners.add(cleaner); } + public String render(FeedRendererConfig config, SyndFeed feed, SyndEntry[] items) { + + StringBuffer sbGlobal= new StringBuffer(); + + StringBuffer sbTemp= new StringBuffer(); + for (Field f : config.getFeedFieldOrder()) { + renderField(f, FEED_CSS_PREFIX,feedProperties, feed,sbTemp); + } + + String tmp = sbTemp.toString(); + if (!"".equals(tmp)) { + sbGlobal.append("<div class='rss-feed'>\n").append(tmp).append("</div>\n"); + } + sbGlobal.append("<ul class='rss-items'>\n"); + sbTemp = new StringBuffer(); + for (SyndEntry item : items) { + sbTemp.append( "<li>\n"); + for (Field f : config.getItemFieldOrder()) { + renderField(f, FEED_ITEM_CSS_PREFIX,itemProperties,item,sbTemp); + } + sbTemp.append("</li>\n"); + } + sbGlobal.append(sbTemp.toString()).append("</ul>\n"); + + return sbGlobal.toString(); + } + + protected void renderField(Field f, String cssPrefix, EnumMap<Field, String> properties,Object src,StringBuffer buffer) { + + if (f== Field.LINK) { + // do nothing, link should not be called alone but inside name field only + return; + } + String template = templates.get(f); + String classname = cssPrefix + classnames.get(f); + String prop = properties.get(f); + + if ("".equals(prop)) { + return; + } + + String result; + Object value = null; + try { + + value = BeanUtils.getProperty(src, prop); + if (f == Field.NAME) { + //special case, we must first render link + String templateLink = templates.get(Field.LINK); + String classnameLink = "feed-" + classnames.get(Field.LINK); + String propLink = properties.get(Field.LINK); + Object value2 = BeanUtils.getProperty(src, propLink); + value = render(templateLink, classnameLink, value2, value); + } + + result = render(template, classname, value); + + if (result != null && buffer != null) { + buffer.append(result); + } + } catch (Exception eee) { + log.warn("Can't get feed property value for property " + prop + ", value:" + value); + } + + } + /** * Permet de rendre un element du feed - * + * * @param template le template pour rendre l'element * @param classname la class de l'element html (pour une utilisation CSS) * @param value la valeur de l'element * @return le code HTML */ protected String render(String template, String classname, Object value) { - String result = ""; + StringBuffer sb = new StringBuffer(); if (value != null && !"".equals(value)) { if (value instanceof String) { // si value est une chaine, on la nettoie avec les cleaners enregistrer @@ -106,52 +183,34 @@ value = cleaner.clean((String)value); } } - result += String.format(template, classname, value); + sb.append(renderTemplate(template, classname, value)); } - return result; + return sb.toString(); } - - public String render(FeedRendererConfig config, SyndFeed feed, SyndEntry[] items) { - String result = ""; - for (Field f : config.getFeedFieldOrder()) { - String template = templates.get(f); - String classname = "feed-" + classnames.get(f); - String prop = feedProperties.get(f); - - if (!"".equals(prop)) { - try { - result += render(template, classname, BeanUtils.getProperty(feed, prop)); - } catch (Exception eee) { - log.warn("Can't get feed property value for property " + prop, eee); + + protected String render(String template, String classname, Object value,Object value2) { + StringBuffer sb = new StringBuffer(); + if (value != null && !"".equals(value)) { + if (value instanceof String) { + // si value est une chaine, on la nettoie avec les cleaners enregistrer + for (HTMLCleaner cleaner : cleaners) { + value = cleaner.clean((String)value); } } + sb.append(renderTemplate(template, classname, value,value2)); } - - if (!"".equals(result)) { - result = "<div class='rss-feed'>\n" + result + "</div>\n"; - } - - result += "<ul class='rss-items'>\n"; - for (SyndEntry item : items) { - result += "<li>\n"; - for (Field f : config.getItemFieldOrder()) { - String template = templates.get(f); - String classname = "feedItem-" + classnames.get(f); - String prop = itemProperties.get(f); + return sb.toString(); + } - if (!"".equals(prop)) { - try { - result += render(template, classname, BeanUtils.getProperty(item, prop)); - } catch (Exception eee) { - log.warn("Can't get item property value for property " + prop, eee); - } - } - } - result += "</li>\n"; + protected String renderTemplate(String template,Object... args) { + try { + String result; + result = String.format(template, args); + return result; + } catch (Exception e) { + log.warn("could not format template "+template+" with args : "+java.util.Arrays.toString(args)); + return ""; } - result += "</ul>\n"; - - return result; } }

1 0

[Lutinweb-commits] r29 - trunk/lutinrss/src/main/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org 29 Apr '08

29 Apr '08

Author: tchemit Date: 2008-04-29 20:00:36 +0000 (Tue, 29 Apr 2008) New Revision: 29 Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java Log: ajout d'un message dans la div pendant le chargement Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java 2008-04-29 20:00:11 UTC (rev 28) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java 2008-04-29 20:00:36 UTC (rev 29) @@ -46,6 +46,7 @@ "function rssinclude(feedName, iddiv, nbItem, feedRepr, forceReload) {\n" + " var serlvetUrl = \"%1$s\";\n" + " var div = document.getElementById(iddiv);\n" + + "div.innerHTML=\"En attente de données pour le flux '\"+feedName+\"' \"\n"+ " var xhr = null;\n" + " if(window.XMLHttpRequest) // Firefox\n" + " xhr = new XMLHttpRequest();\n" +

1 0

[Lutinweb-commits] r28 - trunk/lutinrss/src/main/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org 29 Apr '08

29 Apr '08

Author: tchemit Date: 2008-04-29 20:00:11 +0000 (Tue, 29 Apr 2008) New Revision: 28 Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/Field.java Log: ajout de Field link (pour r?\195?\169cup?\195?\169rer l'url d'un feed ou item) Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/Field.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/Field.java 2008-04-29 19:59:39 UTC (rev 27) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/Field.java 2008-04-29 20:00:11 UTC (rev 28) @@ -12,7 +12,7 @@ */ public enum Field { - NAME('n'), IMAGE('i'), DESCRIPTION('d'), AUTHOR('a'), TIME('t'); + NAME('n'), IMAGE('i'), DESCRIPTION('d'), AUTHOR('a'), TIME('t'),LINK('l'); /** le caractere utilise pour la version compactee d'une configuration de renderer */ private char c; @@ -35,11 +35,11 @@ } public static Field[] getFeedFields() { - return new Field[]{NAME,IMAGE,DESCRIPTION,AUTHOR,TIME}; + return new Field[]{NAME,IMAGE,DESCRIPTION,AUTHOR,TIME,LINK}; } public static Field[] getItemFields() { - return new Field[]{NAME,DESCRIPTION,AUTHOR,TIME}; + return new Field[]{NAME,DESCRIPTION,AUTHOR,TIME,LINK}; } }

1 0

[Lutinweb-commits] r27 - trunk/lutinrss/src/main/webapp
by tchemit＠users.labs.libre-entreprise.org 29 Apr '08

29 Apr '08

Author: tchemit Date: 2008-04-29 19:59:39 +0000 (Tue, 29 Apr 2008) New Revision: 27 Modified: trunk/lutinrss/src/main/webapp/test.html Log: utilisation css + test de positionnement Modified: trunk/lutinrss/src/main/webapp/test.html =================================================================== --- trunk/lutinrss/src/main/webapp/test.html 2008-04-29 19:58:55 UTC (rev 26) +++ trunk/lutinrss/src/main/webapp/test.html 2008-04-29 19:59:39 UTC (rev 27) @@ -5,31 +5,31 @@ --> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> - <head> +<head> <title>Page de test rss</title> - <style type="text/css"> - div {border: solid black;} - </style> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <script src="RSSServlet"></script> - </head> - <body> - <h1>Test RSS</h1> - <div id="lmi"/> - <div id="lemonde"/> - <div id="developpez"/> - <div id="formatouvert"/> - <div id="h2"/> - <div id="opensi"/> + <link href="feed.css" rel="stylesheet" type="text/css" /> + <script src="RSSServlet"></script> +</head> +<body> +<h1>Test RSS</h1> - <script> - rssinclude("http://www.lemondeinformatique.fr/flux-rss/open-source/rss.xml", "lmi", 5, "indat-natd"); - rssinclude("http://www.lemonde.fr/rss/sequence/0,2-3208,1-0,0.xml", "lemonde", 5, "indat-natd"); - rssinclude("http://blog.developpez.com/xmlsrv/rss2.php?blog=42", "developpez", 5, "indat-natd"); - rssinclude("http://formats-ouverts.org/rss.php", "formatouvert", 5, "indat-natd"); - rssinclude("http://www.h2database.com/html/newsfeed-rss.xml", "h2", 5, "indat-natd"); - rssinclude("http://www.opensi.org/news.rss", "opensi", 5, "indat-natd"); - </script> +<div id="content"> + <div id="lmi"> </div> + <div id="lemonde"> </div> + <div id="developpez"> </div> + <div id="formatouvert"> </div> + <div id="h2"> </div> + <div id="opensi"> </div> +</div> +<script> + rssinclude("http://www.lemondeinformatique.fr/flux-rss/open-source/rss.xml", "lmi", 5, "ndat-natd"); + rssinclude("http://www.lemonde.fr/rss/sequence/0,2-3208,1-0,0.xml", "lemonde", 5, "indat-ntda"); + rssinclude("http://blog.developpez.com/xmlsrv/rss2.php?blog=42", "developpez", 5, "ndat-ndat"); + rssinclude("http://formats-ouverts.org/rss.php", "formatouvert", 5, "ndat-natd"); + rssinclude("http://www.h2database.com/html/newsfeed-rss.xml", "h2", 5, "ndat-natd"); + rssinclude("http://www.opensi.org/news.rss", "opensi", 5, "ndat-natd"); +</script> - </body> +</body> </html>

1 0

[Lutinweb-commits] r26 - trunk/lutinrss/src/main/webapp
by tchemit＠users.labs.libre-entreprise.org 29 Apr '08

29 Apr '08

Author: tchemit Date: 2008-04-29 19:58:55 +0000 (Tue, 29 Apr 2008) New Revision: 26 Added: trunk/lutinrss/src/main/webapp/feed.css Log: ajout css de test Added: trunk/lutinrss/src/main/webapp/feed.css =================================================================== --- trunk/lutinrss/src/main/webapp/feed.css (rev 0) +++ trunk/lutinrss/src/main/webapp/feed.css 2008-04-29 19:58:55 UTC (rev 26) @@ -0,0 +1,85 @@ +div#content { + border: 1px dotted black; +} + +.rss-feed { + display: block; +} + +.rss-items { + clear: both; + display: block; +} + +.rss-items li { + clear: both; + display: block; +} + +.feed-name { + font-weight: bold; + color: blue; + display: block; +} + +.feed-link { + font-size: 10px; +} + +.feed-time{ + font-size: 10px; + clear: both; + display: block; +} + +.feed-image { + /*float: right;*/ + border: 1px dotted black; + margin: 0 0 15px 20px; +} + +.feed-description { + clear: both; + display: block; + font-style: italic; + color: green; + font-size: 10px; +} + +.feed-author { + color: black; + font-size: 10px; +} + +.feedItem-name { + font-weight: bold; + color: red; + display: block; + clear: both; + font-size: 10px; +} + +.feedItem-link { + font-size: 10px; +} + +.feedItem-description { + font-style: italic; + color: gray; + font-size: 10px; + clear: both; + display: block; +} + +.feedItem-author { + color: black; + font-size: 10px; + clear: both; + display: block; +} + +.feedItem-time{ + font-size: 10px; + clear: both; + display: block; +}

1 0

[Lutinweb-commits] r25 - trunk/lutinrss/src/main/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org 29 Apr '08

29 Apr '08

Author: tchemit Date: 2008-04-29 10:13:12 +0000 (Tue, 29 Apr 2008) New Revision: 25 Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSHelper.java Log: javadoc Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSHelper.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSHelper.java 2008-04-28 12:31:02 UTC (rev 24) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSHelper.java 2008-04-29 10:13:12 UTC (rev 25) @@ -81,7 +81,7 @@ * @param feedName nom du feed souhaite, l'url sera resolu avec le FeedURLResolver * @param representation indique les champs en sortie souhaites (ex: n-nt) * @param nbItem le nombre d'item du feed souhaite - * @param forceResolv un flag pour forcer la resolution + * @param forceReload un flag pour forcer la relecture du feed * @return le code html representant le feed */ public String getHTML(String feedName, String representation, Integer nbItem, boolean forceReload) {

1 0

[Lutinweb-commits] r24 - trunk/lutinrss/src/main/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org 28 Apr '08

28 Apr '08

Author: tchemit Date: 2008-04-28 12:31:02 +0000 (Mon, 28 Apr 2008) New Revision: 24 Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java Log: nom de variable erronne Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java 2008-04-25 20:35:56 UTC (rev 23) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java 2008-04-28 12:31:02 UTC (rev 24) @@ -138,7 +138,7 @@ String feedRepr = request.getParameter("feedRepr"); Integer nbItem = convertToInt(request.getParameter("nbItem")); boolean forceReload = "true".equalsIgnoreCase(request.getParameter("forceReload")); - out.println(rss.getHTML(feedName, feedRepr, nbItem, resolv)); + out.println(rss.getHTML(feedName, feedRepr, nbItem, forceReload)); } finally { out.close(); }

1 0

[Lutinweb-commits] r23 - trunk/lutinrss
by tchemit＠users.labs.libre-entreprise.org 25 Apr '08

25 Apr '08

Author: tchemit Date: 2008-04-25 20:35:56 +0000 (Fri, 25 Apr 2008) New Revision: 23 Modified: trunk/lutinrss/ Log: svn ignore Property changes on: trunk/lutinrss ___________________________________________________________________ Name: svn:ignore - target profiles.xml nbactions.xml + target target/* profiles.xml nbactions.xml

1 0

[Lutinweb-commits] r22 - trunk/lutinrss/src/main/java/org/codelutin/rss
by bpoussin＠users.labs.libre-entreprise.org 25 Apr '08

25 Apr '08

Author: bpoussin Date: 2008-04-25 11:51:33 +0000 (Fri, 25 Apr 2008) New Revision: 22 Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/FeedData.java trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java Log: - ajout du forceReload Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/FeedData.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/FeedData.java 2008-04-25 11:49:51 UTC (rev 21) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/FeedData.java 2008-04-25 11:51:33 UTC (rev 22) @@ -48,6 +48,10 @@ this.url = url; } + public long getLastRetrived() { + return lastRetrived; + } + public URL getUrl() { return url; } Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java 2008-04-25 11:49:51 UTC (rev 21) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java 2008-04-25 11:51:33 UTC (rev 22) @@ -43,7 +43,7 @@ * Le code JavaScript a utilise dans les pages clientes */ protected String js = - "function rssinclude(feedName, iddiv, nbItem, feedRepr) {\n" + + "function rssinclude(feedName, iddiv, nbItem, feedRepr, forceReload) {\n" + " var serlvetUrl = \"%1$s\";\n" + " var div = document.getElementById(iddiv);\n" + " var xhr = null;\n" + @@ -66,6 +66,11 @@ " var url = serlvetUrl + \"?feedName=\" + escape(feedName);"+ " if (!!nbItem) {url += \"&nbItem=\" + escape(nbItem);}"+ " if (!!feedRepr) {url += \"&feedRepr=\" + escape(feedRepr);}"+ + " if (forceReload) {\n" + + " forceReload = \"true\";\n" + + " } else {\n" + + " forceReload = \"false\";\n" + + " }\n" + " xhr.open(\"GET\", url, true);\n" + " xhr.onreadystatechange = function() {\n" + " if(xhr.readyState == 4) {\n" + @@ -132,9 +137,8 @@ try { String feedRepr = request.getParameter("feedRepr"); Integer nbItem = convertToInt(request.getParameter("nbItem")); - String t = request.getParameter("resolv"); - Boolean resolv = t!=null && "true".equals(t); - out.println(rss.getHTML(feedName, feedRepr, nbItem,resolv)); + boolean forceReload = "true".equalsIgnoreCase(request.getParameter("forceReload")); + out.println(rss.getHTML(feedName, feedRepr, nbItem, resolv)); } finally { out.close(); }

1 0

[Lutinweb-commits] r21 - trunk/lutinrss/src/main/java/org/codelutin/rss
by bpoussin＠users.labs.libre-entreprise.org 25 Apr '08

25 Apr '08

Author: bpoussin Date: 2008-04-25 11:49:51 +0000 (Fri, 25 Apr 2008) New Revision: 21 Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSHelper.java Log: - ajout forceReload - ajout appel du resolv lors du timeout Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSHelper.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSHelper.java 2008-04-25 07:33:18 UTC (rev 20) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSHelper.java 2008-04-25 11:49:51 UTC (rev 21) @@ -84,10 +84,10 @@ * @param forceResolv un flag pour forcer la resolution * @return le code html representant le feed */ - public String getHTML(String feedName, String representation, Integer nbItem,boolean forceResolv) { + public String getHTML(String feedName, String representation, Integer nbItem, boolean forceReload) { try { - FeedData feed = (FeedData) feeds.get(feedName); - if (feed == null || forceResolv) { + FeedData feed = (FeedData) feeds.get(feedName); + if (forceReload || feed == null || feed.getLastRetrived() + RSSConfig.TIME_FORCE_RETRIEVED < System.currentTimeMillis()) { feed = resolver.resolv(feedName); if (feed==null) { log.warn("could not find feed for "+feedName);

1 0