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

[Lutinweb-commits] r33 - trunk/lutinrss
by tchemit＠users.labs.libre-entreprise.org 15 May '08

15 May '08

Author: tchemit Date: 2008-05-15 08:13:04 +0000 (Thu, 15 May 2008) New Revision: 33 Modified: trunk/lutinrss/ Log: svn ignore ide config files Property changes on: trunk/lutinrss ___________________________________________________________________ Name: svn:ignore - target target/* profiles.xml nbactions.xml + lutinrss.iws target profiles.xml lutinrss.ipr target/* nbactions.xml

1 0

[Lutinweb-commits] r32 - in trunk/lutinrss: . src/main/java/org/codelutin/rss src/main/webapp
by bpoussin＠users.labs.libre-entreprise.org 14 May '08

14 May '08

Author: bpoussin Date: 2008-05-14 17:08:21 +0000 (Wed, 14 May 2008) New Revision: 32 Modified: trunk/lutinrss/pom.xml trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java trunk/lutinrss/src/main/webapp/rssinclude.js trunk/lutinrss/src/main/webapp/test.html Log: tout semble fonctionner, il ne reste plus qu'a voir si la discussion avec le ws de tony fonctionne bien, ainsi que l'integration du plugin dans le vieux FCK Modified: trunk/lutinrss/pom.xml =================================================================== --- trunk/lutinrss/pom.xml 2008-05-14 16:23:27 UTC (rev 31) +++ trunk/lutinrss/pom.xml 2008-05-14 17:08:21 UTC (rev 32) @@ -34,7 +34,7 @@ <packaging>war</packaging>  - <version>1.0</version> + <version>2.0</version>  <description>Servlet pouvant �tre appeler depuis du JS pour r�cup�rer un Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java 2008-05-14 16:23:27 UTC (rev 31) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java 2008-05-14 17:08:21 UTC (rev 32) @@ -41,57 +41,81 @@ protected transient RSSHelper rss; /** * Le code JavaScript a utilise dans les pages clientes + * + * Provient du fichier rssinclude.js + * cat rssinclude.js |sed 's/"/\\"/g' |sed -re 's/^(.*)$/"\1\\n" +/' */ protected String js = - "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" + - " else if(window.ActiveXObject) // Internet Explorer\n" + - " xhr = new ActiveXObject(\"Microsoft.XMLHTTP\");\n" + - " else { // XMLHttpRequest non supporté par le navigateur\n" + - " div.innerHTML = \"<span class='feed-error'>Votre navigateur ne supporte pas les objets XMLHTTPRequest...</span>\";\n" + - " return;\n" + - " }\n" + - //" if (!nbItem) {\n" + - //" nbItem = null;\n" + - //" }\n" + - //" if (!feedRepr) {\n" + - //" feedRepr = \"\";\n" + - //" }\n" + - //" var param = \"feedName=\" + escape(feedName) + \"&nbItem=\" + escape(nbItem) + \"&feedRepr=\" + escape(feedRepr);\n" + - //" var url = serlvetUrl + \"?\" + param;\n" + - " 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" + - " div.innerHTML = xhr.responseText;\n" + - " }\n" + - " }\n" + - " xhr.send(null);\n" + - "}\n"; + "function rssincludeUpdateDiv(div, background, forceReload) {\n" + + " // mettre background a false est utile lorsque l'on appelle la methode\n" + + " // depuis une fenetre que l'on ferme ensuite\n" + + "\n" + + " var serlvetUrl = \"%1$s\";\n" + + "\n" + + " var win = window;\n" + + "\n" + + " var xhr = null;\n" + + " if(win.XMLHttpRequest) // Firefox\n" + + " xhr = new win.XMLHttpRequest();\n" + + " else if(win.ActiveXObject) // Internet Explorer\n" + + " xhr = new win.ActiveXObject(\"Microsoft.XMLHTTP\");\n" + + " else { // XMLHttpRequest non supporté par le navigateur\n" + + " var error = \"<span class='feed-error'>Votre navigateur ne supporte pas les objets XMLHTTPRequest...</span>\";\n" + + " }\n" + + "\n" + + " if (error) {\n" + + " div.innerHTML = error;\n" + + " } else {\n" + + " div.innerHTML = \"Loading \" + feedName;\n" + + "\n" + + " var feedName = div.getAttribute(\"feedName\");\n" + + " var url = serlvetUrl + \"?feedName=\" + escape(feedName);\n" + + "\n" + + " var nbItem = div.getAttribute(\"nbItem\");\n" + + " if (!!nbItem) {url += '&nbItem=' + escape(nbItem);}\n" + + "\n" + + " var feedRepr = div.getAttribute(\"feedRepr\");\n" + + " if (!!feedRepr) {url += '&feedRepr=' + escape(feedRepr);}\n" + + "\n" + + " if (forceReload) {\n" + + " forceReload = 'true';\n" + + " } else {\n" + + " forceReload = 'false';\n" + + " }\n" + + "\n" + + " xhr.open(\"GET\", url, !!background);\n" + + " xhr.onreadystatechange = function() {\n" + + " if(xhr.readyState == 4) {\n" + + " div.innerHTML = xhr.responseText;\n" + + " }\n" + + " }\n" + + " xhr.send(null);\n" + + " }\n" + + "}\n" + + "\n" + + "function rssinclude() {\n" + + " var divs = document.getElementsByName(\"rssinclude\");\n" + + " var i = 0;\n" + + " while (i < divs.length) {\n" + + " var div = divs[i++];\n" + + " rssincludeUpdateDiv(div, true);\n" + + " }\n" + + "}\n" + + "\n" + + "window.addEventListener( 'load', rssinclude, true );\n"; + private static final long serialVersionUID = 1L; - + @Override public void init(ServletConfig config) throws ServletException { - init(config,true); + init(config,true); } - + public void init(ServletConfig config,boolean initRssConfig) throws ServletException { try { super.init(config); - if (initRssConfig) { + if (initRssConfig) { // init depuis la config de servlet new RSSConfig.RSSConfigInitializer<ServletConfig>() { @Override @@ -99,10 +123,10 @@ return config.getInitParameter(fullConfigName); } }.init(config); - + // instanciate rss avec les implanatation par defaut rss = RSSHelper.newDefaultInstance(); - } + } } catch (Exception eee) { log.warn("Can't configure Servlet", eee); if (eee instanceof ServletException) { @@ -111,8 +135,8 @@ throw new ServletException("Can't configure Servlet", eee); } } - - /** + + /** * Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods. * @param request servlet request * @param response servlet response @@ -136,15 +160,15 @@ response.setContentType("text/html;charset=UTF-8"); PrintWriter out = response.getWriter(); try { - String feedRepr = request.getParameter("feedRepr"); - Integer nbItem = convertToInt(request.getParameter("nbItem")); + 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, forceReload)); } finally { out.close(); } } - } + } protected Integer convertToInt(String parameter) { Integer result = null; @@ -157,7 +181,7 @@ } // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code."> - /** + /** * Handles the HTTP <code>GET</code> method. * @param request servlet request * @param response servlet response @@ -166,9 +190,9 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { processRequest(request, response); - } + } - /** + /** * Handles the HTTP <code>POST</code> method. * @param request servlet request * @param response servlet response @@ -179,7 +203,7 @@ processRequest(request, response); } - /** + /** * Returns a short description of the servlet. */ @Override Modified: trunk/lutinrss/src/main/webapp/rssinclude.js =================================================================== --- trunk/lutinrss/src/main/webapp/rssinclude.js 2008-05-14 16:23:27 UTC (rev 31) +++ trunk/lutinrss/src/main/webapp/rssinclude.js 2008-05-14 17:08:21 UTC (rev 32) @@ -1,32 +1,59 @@ -function rssinclude(feedName, iddiv, nbItem, feedRepr) { - var serlvetUrl = "http://localhost:8080/lutinrss-1.0/RSSServlet"; - var div = document.getElementById(iddiv); +function rssincludeUpdateDiv(div, background, forceReload) { + // mettre background a false est utile lorsque l'on appelle la methode + // depuis une fenetre que l'on ferme ensuite - var xhr = null; - if(window.XMLHttpRequest) // Firefox - xhr = new XMLHttpRequest(); - else if(window.ActiveXObject) // Internet Explorer - xhr = new ActiveXObject("Microsoft.XMLHTTP"); - else { // XMLHttpRequest non supporté par le navigateur - div.innerHTML = "<span class='feed-error'>Votre navigateur ne supporte pas les objets XMLHTTPRequest...</span>"; - return; - } - - if (!nbItem) { - nbItem = -1; - } - if (!feedRepr) { - feedRepr = ""; - } - - var param = "feedName=" + escape(feedName) + "&nbItem=" + escape(nbItem) + "&feedRepr=" + escape(feedRepr); - var url = serlvetUrl + "?" + param; + var serlvetUrl = "http://rssinclude/lutinrss-1.0/RSSServlet"; - xhr.open("GET", url, true); - xhr.onreadystatechange = function() { - if(xhr.readyState == 4) { - div.innerHTML = xhr.responseText; - } - } - xhr.send(null); -} \ No newline at end of file + // if (!win) { + win = window; + // } + + var xhr = null; + if(win.XMLHttpRequest) // Firefox + xhr = new win.XMLHttpRequest(); + else if(win.ActiveXObject) // Internet Explorer + xhr = new win.ActiveXObject("Microsoft.XMLHTTP"); + else { // XMLHttpRequest non supporté par le navigateur + var error = "<span class='feed-error'>Votre navigateur ne supporte pas les objets XMLHTTPRequest...</span>"; + } + + if (error) { + div.innerHTML = error; + } else { + div.innerHTML = "Loading " + feedName; + + var feedName = div.getAttribute("feedName"); + var url = serlvetUrl + "?feedName=" + escape(feedName); + + var nbItem = div.getAttribute("nbItem"); + if (!!nbItem) {url += '&nbItem=' + escape(nbItem);} + + var feedRepr = div.getAttribute("feedRepr"); + if (!!feedRepr) {url += '&feedRepr=' + escape(feedRepr);} + + if (forceReload) { + forceReload = 'true'; + } else { + forceReload = 'false'; + } + + xhr.open("GET", url, !!background); + xhr.onreadystatechange = function() { + if(xhr.readyState == 4) { + div.innerHTML = xhr.responseText; + } + } + xhr.send(null); + } +} + +function rssinclude() { + var divs = document.getElementsByName("rssinclude"); + var i = 0; + while (i < divs.length) { + var div = divs[i++]; + rssincludeUpdateDiv(div, true); + } +} + +window.addEventListener( 'load', rssinclude, true ); Modified: trunk/lutinrss/src/main/webapp/test.html =================================================================== --- trunk/lutinrss/src/main/webapp/test.html 2008-05-14 16:23:27 UTC (rev 31) +++ trunk/lutinrss/src/main/webapp/test.html 2008-05-14 17:08:21 UTC (rev 32) @@ -10,26 +10,14 @@ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <link href="feed.css" rel="stylesheet" type="text/css" /> <script src="RSSServlet"></script> -</head> -<body> -<h1>Test RSS</h1> - -<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> - + </head> + <body> + <h1>Test RSS</h1> + <div name="rssinclude" id="lmi" class="rssinclude" feedName="http://www.lemondeinformatique.fr/flux-rss/open-source/rss.xml" nbItem="5" feedRepre="indat-natd"></div> + <div name="rssinclude" id="lemonde" class="rssinclude" feedName="http://www.lemonde.fr/rss/sequence/0,2-3208,1-0,0.xml" nbItem="5" feedRepre="indat-natd"></div> + <div name="rssinclude" id="developpez" class="rssinclude" feedName="http://blog.developpez.com/xmlsrv/rss2.php?blog=42" nbItem="5" feedRepre="indat-natd"></div> + <div name="rssinclude" id="formatouvert" class="rssinclude" feedName="http://formats-ouverts.org/rss.php" nbItem="5" feedRepre="indat-natd"></div> + <div name="rssinclude" id="h2" class="rssinclude" feedName="http://www.h2database.com/html/newsfeed-rss.xml" nbItem="5" feedRepre="indat-natd"></div> + <div name="rssinclude" id="opensi" class="rssinclude" feedName="http://www.opensi.org/news.rss" nbItem="5" feedRepre="indat-natd"></div> </body> </html>

1 0

[Lutinweb-commits] r31 - in trunk/lutinrss/src/main/resources: . fckeditor fckeditor/editor fckeditor/editor/plugins fckeditor/editor/plugins/rssinclude fckeditor/editor/plugins/rssinclude/lang
by bpoussin＠users.labs.libre-entreprise.org 14 May '08

14 May '08

Author: bpoussin Date: 2008-05-14 16:23:27 +0000 (Wed, 14 May 2008) New Revision: 31 Added: trunk/lutinrss/src/main/resources/fckeditor/ trunk/lutinrss/src/main/resources/fckeditor/editor/ trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/ trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/ trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/README.txt trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/button.rss.gif trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.html trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fckplugin.js trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/ trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/en.js trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/fr.js Log: ajout du code pour le plugin fckeditor Added: trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/README.txt =================================================================== --- trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/README.txt (rev 0) +++ trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/README.txt 2008-05-14 16:23:27 UTC (rev 31) @@ -0,0 +1,14 @@ +This plugin was developped by Code Lutin + +Installation Instructions +1. Copy rssinclude directory into "editor/plugins/" +2. In fckconfig.js make the following additions; +3. add the following line after where "FCKConfig.PluginsPath" is defined + FCKConfig.Plugins.Add("rssinclude", "en,fr"); +4. Add 'rssinclude' to your toolsbarset in fckconfig.js. E.G., + + FCKConfig.ToolbarSets["Default"] = [ + ['rssinclude', 'Bold', 'Italic'] + ] ; + +Please let me know if you experience any issues. Added: trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/button.rss.gif =================================================================== (Binary files differ) Property changes on: trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/button.rss.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.html =================================================================== --- trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.html (rev 0) +++ trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.html 2008-05-14 16:23:27 UTC (rev 31) @@ -0,0 +1,133 @@ + +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html> + <head> + <title>Rss Include Properties</title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta name="robots" content="noindex, nofollow"> + <script src="../../dialog/common/fck_dialog_common.js" type="text/javascript"></script> + <script src="fck_rssinclude.js" type="text/javascript"></script> + <link href="../../dialog/common/fck_dialog_common.css" rel="stylesheet" type="text/css" /> + <script type="text/javascript"> +  + </script> + <script src="http://rssinclude/lutinrss-1.0/rssinclude_1.js" type="text/javascript"></script> + </head> + <body scroll="no"> + <div id="divInfo"> + <table cellspacing="1" cellpadding="1" border="0" width="100%" height="100%"> + <tr> + <td> + <table cellspacing="0" cellpadding="0" width="100%" border="0"> + <tr> + <td valign="top" width="100%"> + <span fckLang="DlgRssincludeFeedName">name or URL</span><br> + <div id="divFeedName"> + <input style="WIDTH: 100%" type="text" id="txtFeedName" onblur="updatePreview();"> + </div> + <script type="text/javascript"> +  + </script> + <a id="editFeed" href='' fckLang="DlgRssincludeFeedNameEdit" target="_editFeed" onclick='changeEdit();'>Edit</a> + <a id="addFeed" href='' fckLang="DlgRssincludeFeedNameAdd" target="_addFeed">Add</a> + <script type="text/javascript"> + var a = document.getElementById('editFeed'); + a.href = configSiteURL + '?action=doRss&rssAction=edit'; + a = document.getElementById('addFeed'); + a.href = configSiteURL + '?action=doRss&rssAction=edit'; + </script> + </td> + </tr> + </table> + <hr width="100%" color="#000000" size="2"> + </td> + </tr> + <tr height="100%"> + <td valign="top"> + <table cellspacing="0" cellpadding="0" width="100%" border="0" height="100%"> + <tr> + <td height="140" valign="top"> + <br> + <table cellspacing="2" cellpadding="1" border="0"> + <tr> + <td><span fckLang="DlgRssincludeNbItem">Item's number</span> </td> + <td><input type="text" size="3" id="txtNbItem" onblur="updatePreview();"></td> + </tr> + <tr> + <td><span fckLang="DlgRssincludeFeedRepr">feed representation</span> </td> + <td><input type="text" size="10" id="txtFeedRepr" onblur="updatePreview();"></td> + </tr> + </table> + </td> + <td>   </td> + <td width="100%" valign="top"> + <table cellpadding="0" cellspacing="0"> + <tr> + <td><span fckLang="DlgImgPreview">Preview</span></td> + </tr> + <tr> + <td valign="top"> + <div class="ImagePreviewArea"> + <div + id="rssincludePreview" + name="rssinclude" + class="rssinclude"> + </div> + + Magnus es, domine, et laudabilis + valde: magna virtus tua, et sapientiae tuae non est numerus. et laudare te vult + homo, aliqua portio creaturae tuae, et homo circumferens mortalitem suam, + circumferens testimonium peccati sui et testimonium, quia superbis resistis: et + tamen laudare te vult homo, aliqua portio creaturae tuae.tu excitas, ut laudare + te delectet, quia fecisti nos ad te et inquietum est cor nostrum, donec + requiescat in te. da mihi, domine, scire et intellegere, utrum sit prius + invocare te an laudare te, et scire te prius sit an invocare te. sed quis te + invocat nesciens te? aliud enim pro alio potest invocare nesciens. an potius + invocaris, ut sciaris? quomodo autem invocabunt, in quem non crediderunt? aut + quomodo credent sine praedicante? et laudabunt dominum qui requirunt eum. + quaerentes enim inveniunt eum et invenientes laudabunt eum. quaeram te, domine, + invocans te, et invocem te credens in te: praedicatus enim es nobis. invocat + te, domine, fides mea, quam dedisti mihi, quam inspirasti mihi per humanitatem + filii tui, per ministerium praedicatoris tui. + </div> + </td> + </tr> + </table> + </td> + </tr> + </table> + </td> + </tr> + </table> + </div> + </body> +</html> Added: trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js =================================================================== --- trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js (rev 0) +++ trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js 2008-05-14 16:23:27 UTC (rev 31) @@ -0,0 +1,144 @@ +var dialog = window.parent ; +var oEditor = dialog.InnerDialogLoaded() ; +var FCK = oEditor.FCK ; +var FCKLang = oEditor.FCKLang ; +var FCKConfig = oEditor.FCKConfig ; +var FCKTools = oEditor.FCKTools ; + +// L'url du service web permettant de recuperer les Feeds configures +var configSiteURL = '/srvwebsiteworkshop'; + +// Set the language direction. +window.document.dir = oEditor.FCKLang.Dir ; + +// Recuperation du feed selectionne +var oRss = dialog.Selection.GetSelectedElement() ; + +// Un peu de travail au chargement de la page +window.onload = function() +{ + // Translate the dialog box texts. + oEditor.FCKLanguageManager.TranslatePage(document) ; + + // chargement de la comba avec les feeds configures + LoadCombo(); + + // Load the selected element information (if any). + LoadSelection() ; + + // Activate the "OK" button. + window.parent.SetOkButton( true ) ; + + SelectField( 'txtFeedName' ) ; +} + +/** + * Remplace le textfield de saisie du nom d'un feed par une combo. + * Cela n'est fait que si le serveur peut etre contacte + */ +function LoadCombo() { + var xhr = null; + if(window.XMLHttpRequest) // Firefox + xhr = new window.XMLHttpRequest(); + else if(window.ActiveXObject) // Internet Explorer + xhr = new window.ActiveXObject("Microsoft.XMLHTTP"); + + if (xhr) { + var url = configSiteURL + "?action=doRss&rssAction=optionList&template=" + escape("<option id='%1' value='%1'>%2</option>"); + xhr.open("GET", url, false); + xhr.onreadystatechange = function() { + if(xhr.readyState == 4) { + if (xhr.status == 200) /* 200 : code HTTP pour OK */ + { + var div = document.getElementById("divFeedName"); + div.innerHTML = '<select style="WIDTH: 100%" id="txtFeedName" onblur="updatePreview();">' + + xhr.responseText + + '</input>'; + if (oRss) { + // on selectionne l'ancienne valeur + GetE('txtFeedName').value = GetAttribute( oRss, 'feedName', '' ); + } + } + } + } + xhr.send(null); + } +} + +/** + * Chargement du feed que l'on re-edite + */ +function LoadSelection() { + if (! oRss) return; + + GetE('txtFeedName').value = GetAttribute( oRss, 'feedName', '' ); + GetE('txtNbItem').value = GetAttribute( oRss, 'nbItem', '' ); + GetE('txtFeedRepr').value = GetAttribute( oRss, 'feedRepr', '' ); + + updatePreview(); +} + +/** + * Fonction appeler lors de la validation + */ +function Ok() +{ + if ( GetE('txtFeedName').value.length == 0 ) + { + GetE('txtFeedName').focus() ; + + alert( oEditor.FCKLang.DlgRssincludeAlertFeedName ) ; + return false ; + } + + oEditor.FCKUndo.SaveUndoStep() ; + if ( !oRss ) + { + oRss = FCK.InsertElement( 'DIV' ) ; + oScript = FCK.InsertElement('SCRIPT'); + SetAttribute( oScript, 'src', 'http://rssinclude/lutinrss-1.0/rssinclude_1.js'); + } + updateRss( oRss ) ; + + rssincludeUpdateDiv(oRss, false); + return true ; +} + +/** + * Mise a jour d'un div avec les informations trouvees dans l'interface + */ +function updateRss(e){ + e.contentEditable = false ; + + SetAttribute( e, 'class', 'rssinclude'); + SetAttribute( e, 'name', 'rssinclude'); + SetAttribute( e, 'feedName', GetE('txtFeedName').value ); + SetAttribute( e, 'nbItem', GetE('txtNbItem').value ); + SetAttribute( e, 'feedRepr', GetE('txtFeedRepr').value ); + e.innerHTML = 'RSS ' + GetE('txtFeedName').value; + e.style.backgroundColor = '#ffff00' ; +} + +// L'element servant a la preview +var ePreview ; + +/** + * Mise a jour du flux dans la preview + */ +function updatePreview(){ + + if ( !ePreview ) { + ePreview = GetE('rssincludePreview') ; + } + + if ( ! ePreview) { + return; + } + + if ( GetE('txtFeedName').value.length == 0 ) { + ePreview.innerHTML = 'Invalid RSS' ; + } else { + updateRss(ePreview); + rssincludeUpdateDiv(ePreview, true, true); + } +} Added: trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fckplugin.js =================================================================== --- trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fckplugin.js (rev 0) +++ trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fckplugin.js 2008-05-14 16:23:27 UTC (rev 31) @@ -0,0 +1,53 @@ +// Register the related commands. +var dialogPath = FCKConfig.PluginsPath + 'rssinclude/fck_rssinclude.html'; +var rssincludeDialogCmd = new FCKDialogCommand( FCKLang["DlgRssincludeTitle"], FCKLang["DlgRssincludeTitle"], dialogPath, 480, 470 ); +FCKCommands.RegisterCommand( 'rssinclude', rssincludeDialogCmd ) ; + +// Create the Rssinclude toolbar button. +var oRssincludeItem = new FCKToolbarButton( 'rssinclude', FCKLang["DlgRssincludeTitle"]) ; +oRssincludeItem.IconPath = FCKConfig.PluginsPath + 'rssinclude/button.rss.gif' ; + +FCKToolbarItems.RegisterItem( 'rssinclude', oRssincludeItem ) ; +// 'Rssinclude' is the name used in the Toolbar config. + +FCK.ContextMenu.RegisterListener( { + AddItems : function( menu, tag, tagName ) { + var e = tag; + if (! (e && e.nodeName == 'DIV' && e.getAttribute('class') == 'rssinclude' )) { + var selection = FCKSelection.GetSelection() ; + var range = selection.getRangeAt(0) ; + e = range.endContainer ; + while (e && (e.nodeName != 'DIV' || e.getAttribute('class') != 'rssinclude')) { + e = e.parentNode; + } + } + + // under what circumstances do we display this option + if (!!e && e.nodeName == 'DIV' && e.getAttribute('class') == 'rssinclude' ) { + FCKSelection.SelectNode(e); + // when the option is displayed, show a separator the command + menu.AddSeparator() ; + // the command needs the registered command name, the title for the context menu, and the icon path + menu.AddItem( 'rssinclude', FCKLang.DlgRssincludeTitle, oRssincludeItem.IconPath ) ; + } + } +} ); + +/** +OnClick = function( e ) +{ + if ( e.target.tagName == 'DIV' && e.target.getAttribute('class') == 'rssinclude' ) + FCKSelection.SelectNode( e.target ) ; +} + +FCK.EditorDocument.addEventListener( 'click', OnClick, true ) ; +**/ + +OnDoubleClick = function( e ) { + if ( e.tagName == 'DIV' && e.getAttribute('class') == 'rssinclude' ) { + FCKSelection.SelectNode(e); + FCKCommands.GetCommand( 'rssinclude' ).Execute() ; + } +} + +FCK.RegisterDoubleClickHandler( OnDoubleClick, 'DIV' ) ; Added: trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/en.js =================================================================== --- trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/en.js (rev 0) +++ trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/en.js 2008-05-14 16:23:27 UTC (rev 31) @@ -0,0 +1,9 @@ +// Rssinclude Dialog +FCKLang["DlgRssincludeTitle"] = "Rss Include"; +FCKLang["DlgRssincludeFeedName"] = "name or URL" ; +FCKLang["DlgRssincludeFeedNameEdit"] = "Edit" ; +DFCKLang["DlgRssincludeFeedNameAdd"] = "Add" ; +FCKLang["DlgRssincludeNbItem"] = "item's number" ; +FCKLang["DlgRssincludeFeedRepr"] = "Feed representation" ; +FCKLang["DlgRssincludeAlertFeedName"] = "Please input the feed name or feed URL" +FCKLang["DlgRssincludeLoading"] = "Loading rss..." Added: trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/fr.js =================================================================== --- trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/fr.js (rev 0) +++ trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/fr.js 2008-05-14 16:23:27 UTC (rev 31) @@ -0,0 +1,9 @@ +// Rssinclude Dialog +FCKLang["DlgRssincludeTitle"] = "Rss Include"; +FCKLang["DlgRssincludeFeedName"] = "nom ou URL" ; +FCKLang["DlgRssincludeFeedNameEdit"] = "Edition" ; +DFCKLang["DlgRssincludeFeedNameAdd"] = "Ajout" ; +FCKLang["DlgRssincludeNbItem"] = "nombre d'item" ; +FCKLang["DlgRssincludeFeedRepr"] = "Feed representation" ; +FCKLang["DlgRssincludeAlertFeedName"] = "Veuillez entrer un nom ou une URL pour le feed" +FCKLang["DlgRssincludeLoading"] = "Chargement du rss..."

1 0

[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