From 8715b7e671f975e647a70b587d51e8152a7438f7 Mon Sep 17 00:00:00 2001 From: Lawrence Carvalho Date: Wed, 10 Jun 2009 14:13:57 +0000 Subject: [PATCH] now filters out non blogposts git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14634 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repository/blogs/posts/blog-posts-mydrafts.get.js | 3 +++ .../repository/blogs/posts/blog-posts-mypublished.get.js | 2 ++ .../repository/blogs/posts/blog-posts-per-month.get.js | 4 ++++ .../repository/blogs/posts/blog-posts-publishedext.get.js | 2 ++ .../org/alfresco/repository/blogs/posts/blog-posts.get.js | 3 +++ 5 files changed, 14 insertions(+) diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-mydrafts.get.js b/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-mydrafts.get.js index 8652b5f10f..5a7a41ebb3 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-mydrafts.get.js +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-mydrafts.get.js @@ -11,6 +11,9 @@ function getBlogPostList(node, index, count) // query information var luceneQuery = " +TYPE:\"{http://www.alfresco.org/model/content/1.0}content\" " + " +PATH:\"" + node.qnamePath + "/*\" "; + luceneQuery += " +(@\\{http\\://www.alfresco.org/model/content/1.0\\}content.mimetype:application/octet-stream OR"; + luceneQuery += " @\\{http\\://www.alfresco.org/model/content/1.0\\}content.mimetype:text/html)" + // add the drafts part luceneQuery += " -ISNOTNULL:\"{http://www.alfresco.org/model/content/1.0}published\" " + diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-mypublished.get.js b/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-mypublished.get.js index e476fee454..8b609b7d08 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-mypublished.get.js +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-mypublished.get.js @@ -11,6 +11,8 @@ function getBlogPostList(node, index, count) // query information var luceneQuery = " +TYPE:\"{http://www.alfresco.org/model/content/1.0}content\"" + " +PATH:\"" + node.qnamePath + "/*\" "; + luceneQuery += " +(@\\{http\\://www.alfresco.org/model/content/1.0\\}content.mimetype:application/octet-stream OR"; + luceneQuery += " @\\{http\\://www.alfresco.org/model/content/1.0\\}content.mimetype:text/html)" // exclude drafts luceneQuery += " +ISNOTNULL:\"{http://www.alfresco.org/model/content/1.0}published\" " + diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-per-month.get.js b/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-per-month.get.js index 22b155e5da..7a384847de 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-per-month.get.js +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-per-month.get.js @@ -46,6 +46,10 @@ function getBlogPostMonths(node) var luceneQuery = " +TYPE:\"{http://www.alfresco.org/model/content/1.0}content\"" + " +PATH:\"" + node.qnamePath + "/*\" " + " +ISNOTNULL:\"{http://www.alfresco.org/model/content/1.0}published\" "; + luceneQuery += " +(@\\{http\\://www.alfresco.org/model/content/1.0\\}content.mimetype:application/octet-stream OR"; + luceneQuery += " @\\{http\\://www.alfresco.org/model/content/1.0\\}content.mimetype:text/html)" + + var sortAttribute = "@{http://www.alfresco.org/model/content/1.0}published"; nodes = search.luceneSearch(node.nodeRef.storeRef.toString(), luceneQuery, sortAttribute, true); diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-publishedext.get.js b/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-publishedext.get.js index eee8f94d10..1c73a4bf56 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-publishedext.get.js +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-publishedext.get.js @@ -11,6 +11,8 @@ function getBlogPostList(node, index, count) // query information var luceneQuery = " +TYPE:\"{http://www.alfresco.org/model/content/1.0}content\"" + " +PATH:\"" + node.qnamePath + "/*\" "; + luceneQuery += " +(@\\{http\\://www.alfresco.org/model/content/1.0\\}content.mimetype:application/octet-stream OR"; + luceneQuery += " @\\{http\\://www.alfresco.org/model/content/1.0\\}content.mimetype:text/html)" // add the drafts part luceneQuery += "+ASPECT:\"{http://www.alfresco.org/model/blogintegration/1.0}blogPost\" " diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts.get.js b/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts.get.js index 2583858820..3d71b179c8 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts.get.js +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts.get.js @@ -11,6 +11,9 @@ function getBlogPostList(node, fromDate, toDate, tag, index, count) // query information var luceneQuery = " +TYPE:\"{http://www.alfresco.org/model/content/1.0}content\"" + " +PATH:\"" + node.qnamePath + "/*\""; + luceneQuery += " +(@\\{http\\://www.alfresco.org/model/content/1.0\\}content.mimetype:application/octet-stream OR"; + luceneQuery += " @\\{http\\://www.alfresco.org/model/content/1.0\\}content.mimetype:text/html)" + // include all published + my drafts luceneQuery += " +((" +