From 0cb572b53fc484aca5c6343e4362abeb340316d4 Mon Sep 17 00:00:00 2001 From: DiogoSobralCapgemini Date: Mon, 4 Feb 2019 14:57:50 +0100 Subject: [PATCH 1/2] HTMLDOCS-132 : Search criteria of blogs are not working --- .../lutece/plugins/blog/business/Blog.java | 38 +++++++++---------- .../plugins/blog/service/BlogService.java | 4 +- .../docsearch/BlogLuceneSearchEngine.java | 4 +- .../service/docsearch/DefaultBlogIndexer.java | 4 +- .../service/search/BlogSearchIndexer.java | 9 ++++- .../lutece/plugins/blog/web/BlogJspBean.java | 2 +- .../admin/plugins/blog/manage_blogs.html | 5 +-- 7 files changed, 37 insertions(+), 29 deletions(-) diff --git a/src/java/fr/paris/lutece/plugins/blog/business/Blog.java b/src/java/fr/paris/lutece/plugins/blog/business/Blog.java index 9288f260..93b79515 100644 --- a/src/java/fr/paris/lutece/plugins/blog/business/Blog.java +++ b/src/java/fr/paris/lutece/plugins/blog/business/Blog.java @@ -107,7 +107,7 @@ public class Blog extends ReferenceItem implements Serializable, IExtendableReso private List _tag = new ArrayList( ); - private List _blogPubilcation = new ArrayList( ); + private List _blogPublication = new ArrayList( ); /** * Returns the Id @@ -486,13 +486,13 @@ public void deleteTag( Tag tag ) } /** - * Returns the blogPubilcation list + * Returns the blogPublication list * - * @return The BlogPubilcation list + * @return The blogPublication list */ - public List getBlogPubilcation( ) + public List getBlogPublication( ) { - return _blogPubilcation; + return _blogPublication; } /** @@ -501,37 +501,37 @@ public List getBlogPubilcation( ) * @param blogPublication * list The blogPublication list */ - public void setBlogPubilcation( List blogPublication ) + public void setBlogPublication( List blogPublication ) { - _blogPubilcation = blogPublication; + _blogPublication = blogPublication; } /** - * Sets the BlogPubilcation list + * Sets the blogPublication list * - * @param BlogPubilcation - * list The BlogPubilcation list + * @param blogPublication + * list The blogPublication list */ - public void addBlogPublication( BlogPublication blogPubilcation ) + public void addBlogPublication( BlogPublication blogPublication ) { - boolean isContain = _blogPubilcation.stream( ).anyMatch( - blogPub -> ( blogPub.getIdBlog( ) == blogPubilcation.getIdBlog( ) && blogPub.getIdPortlet( ) == blogPubilcation.getIdPortlet( ) ) ); + boolean isContain = _blogPublication.stream( ).anyMatch( + blogPub -> ( blogPub.getIdBlog( ) == blogPublication.getIdBlog( ) && blogPub.getIdPortlet( ) == blogPublication.getIdPortlet( ) ) ); if ( !isContain ) - _blogPubilcation.add( blogPubilcation ); + _blogPublication.add( blogPublication ); } /** - * delet the BlogPubilcation + * delet the blogPublication * - * @param BlogPubilcation - * The BlogPubilcation + * @param blogPublication + * The blogPublication */ - public void deleteBlogPublication( BlogPublication blogPubilcation ) + public void deleteBlogPublication( BlogPublication blogPublication ) { - _blogPubilcation.removeIf( blogPub -> ( blogPub.getIdBlog( ) == blogPubilcation.getIdBlog( ) && blogPub.getIdPortlet( ) == blogPubilcation + _blogPublication.removeIf( blogPub -> ( blogPub.getIdBlog( ) == blogPublication.getIdBlog( ) && blogPub.getIdPortlet( ) == blogPublication .getIdPortlet( ) ) ); } diff --git a/src/java/fr/paris/lutece/plugins/blog/service/BlogService.java b/src/java/fr/paris/lutece/plugins/blog/service/BlogService.java index ef5cc067..425ba860 100644 --- a/src/java/fr/paris/lutece/plugins/blog/service/BlogService.java +++ b/src/java/fr/paris/lutece/plugins/blog/service/BlogService.java @@ -314,7 +314,7 @@ public Blog loadBlog( int nIdDocument ) List docContent = DocContentHome.getDocsContentByHtmlDoc( nIdDocument ); blog.setDocContent( docContent ); blog.setTag( TagHome.loadByDoc( nIdDocument ) ); - blog.setBlogPubilcation( BlogPublicationHome.getDocPublicationByIdDoc( nIdDocument ) ); + blog.setBlogPublication( BlogPublicationHome.getDocPublicationByIdDoc( nIdDocument ) ); return blog; @@ -332,7 +332,7 @@ public Blog findByPrimaryKeyWithoutBinaries( int nIdDocument ) { Blog blog = BlogHome.findByPrimaryKey( nIdDocument ); blog.setTag( TagHome.loadByDoc( nIdDocument ) ); - blog.setBlogPubilcation( BlogPublicationHome.getDocPublicationByIdDoc( nIdDocument ) ); + blog.setBlogPublication( BlogPublicationHome.getDocPublicationByIdDoc( nIdDocument ) ); return blog; diff --git a/src/java/fr/paris/lutece/plugins/blog/service/docsearch/BlogLuceneSearchEngine.java b/src/java/fr/paris/lutece/plugins/blog/service/docsearch/BlogLuceneSearchEngine.java index e1e5b7fd..3c09ae2e 100644 --- a/src/java/fr/paris/lutece/plugins/blog/service/docsearch/BlogLuceneSearchEngine.java +++ b/src/java/fr/paris/lutece/plugins/blog/service/docsearch/BlogLuceneSearchEngine.java @@ -73,6 +73,8 @@ public class BlogLuceneSearchEngine implements IBlogSearchEngine { + private static final String WILDCARD = "*"; + /** * {@inheritDoc} */ @@ -120,7 +122,7 @@ public int getSearchResults( BlogSearchFilter filter, Plugin plugin, List getDocuments( String strDocumentId ) throws IOException, I public void indexDocuments( ) throws IOException, InterruptedException, SiteMessageException { BlogSearchService.getInstance( ).processIndexing( true ); - // DefaultblogIndexer.getDocuments(""); + } + + /** + * {@inheritDoc} + */ + @Override + public void indexDocuments(StringBuffer sbLogs) throws IOException, InterruptedException, SiteMessageException { + sbLogs.append(BlogSearchService.getInstance().processIndexing(true)); } } diff --git a/src/java/fr/paris/lutece/plugins/blog/web/BlogJspBean.java b/src/java/fr/paris/lutece/plugins/blog/web/BlogJspBean.java index 5ffea0ce..3a2c1e10 100644 --- a/src/java/fr/paris/lutece/plugins/blog/web/BlogJspBean.java +++ b/src/java/fr/paris/lutece/plugins/blog/web/BlogJspBean.java @@ -910,7 +910,7 @@ public String getPreviewBlog( HttpServletRequest request ) { blog = BlogService.getInstance( ).loadBlog( nId ); } - blog.setBlogPubilcation( BlogPublicationHome.getDocPublicationByIdDoc( nId ) ); + blog.setBlogPublication( BlogPublicationHome.getDocPublicationByIdDoc( nId ) ); Map model = getModel( ); model.put( MARK_LIST_TAG, TagHome.getTagsReferenceList( ) ); diff --git a/webapp/WEB-INF/templates/admin/plugins/blog/manage_blogs.html b/webapp/WEB-INF/templates/admin/plugins/blog/manage_blogs.html index c63e8447..dd15f555 100644 --- a/webapp/WEB-INF/templates/admin/plugins/blog/manage_blogs.html +++ b/webapp/WEB-INF/templates/admin/plugins/blog/manage_blogs.html @@ -18,9 +18,8 @@
- + + checked title="#i18n{blog.manage_blogs.sortByUserButton}" />
From e45e0f9e46e328d7630be9e6c46020b1b42c5d7b Mon Sep 17 00:00:00 2001 From: DiogoSobralCapgemini Date: Mon, 4 Feb 2019 15:39:27 +0100 Subject: [PATCH 2/2] HTMLDOCS-132 : Search criteria of blogs are not working (without need of LUTECE-2224, lutece-core) --- .../plugins/blog/service/search/BlogSearchIndexer.java | 10 +--------- .../templates/admin/plugins/blog/manage_blogs.html | 10 +++++----- .../templates/admin/plugins/blog/modify_blog.html | 10 +++++----- .../templates/admin/plugins/blog/publication_blog.html | 2 +- 4 files changed, 12 insertions(+), 20 deletions(-) diff --git a/src/java/fr/paris/lutece/plugins/blog/service/search/BlogSearchIndexer.java b/src/java/fr/paris/lutece/plugins/blog/service/search/BlogSearchIndexer.java index 3a82415a..d3e2e695 100644 --- a/src/java/fr/paris/lutece/plugins/blog/service/search/BlogSearchIndexer.java +++ b/src/java/fr/paris/lutece/plugins/blog/service/search/BlogSearchIndexer.java @@ -167,13 +167,5 @@ public void indexDocuments( ) throws IOException, InterruptedException, SiteMess { BlogSearchService.getInstance( ).processIndexing( true ); } - - /** - * {@inheritDoc} - */ - @Override - public void indexDocuments(StringBuffer sbLogs) throws IOException, InterruptedException, SiteMessageException { - sbLogs.append(BlogSearchService.getInstance().processIndexing(true)); - } - + } diff --git a/webapp/WEB-INF/templates/admin/plugins/blog/manage_blogs.html b/webapp/WEB-INF/templates/admin/plugins/blog/manage_blogs.html index dd15f555..e7b24869 100644 --- a/webapp/WEB-INF/templates/admin/plugins/blog/manage_blogs.html +++ b/webapp/WEB-INF/templates/admin/plugins/blog/manage_blogs.html @@ -155,19 +155,19 @@
<#if permission_manage_publish_blog> + class="btn-publish btn btn-sm <#if blog.blogPublication?size == 0>btn-default<#else>btn-primary notif" title="<#if blog.blogPublication?size==0>Publier<#else>#i18n{blog.manage_blogs.managePublication}"> - <#if blog.blogPubilcation?size > 0> - ${blog.blogPubilcation?size} + <#if blog.blogPublication?size > 0> + ${blog.blogPublication?size} - <#if blog.blogPubilcation?size > 0> + <#if blog.blogPublication?size > 0>