Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/util
In directory
james.mmbase.org:/tmp/cvs-serv25922/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/util
Modified Files:
TagCloudUtil.java
Log Message:
CMSC-1066 Worked on with implementing the tag cloud module
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/util
See also: http://www.mmbase.org/jira/browse/CMSC-1066
Index: TagCloudUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/util/TagCloudUtil.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- TagCloudUtil.java 23 Sep 2008 15:19:25 -0000 1.4
+++ TagCloudUtil.java 14 Oct 2008 12:31:08 -0000 1.5
@@ -31,37 +31,37 @@
public static final String ORDERBY_NAME = "name";
- private static final String SQL_STAGING_SELECT_TAGS = "SELECT
tag.number,tag.name,tag.description,tag.number FROM mm_tag tag";
- private static final String SQL_LIVE_SELECT_TAGS = "SELECT
tag.number,tag.name,tag.description,tag.number FROM live_tag tag";
+ private static final String SQL_STAGING_SELECT_TAGS = "SELECT
tag.number,tag.name,tag.description,tag.number FROM mm_tag tag WHERE tag.name
is not null ";
+ private static final String SQL_LIVE_SELECT_TAGS = "SELECT
tag.number,tag.name,tag.description,tag.number FROM live_tag tag WHERE tag.name
is not null ";
/*
*/
private static final String SQL_STAGING_SELECT_TAGS_COUNT = " SELECT
tag.number,COUNT(insrel.number) AS cnt "
+ "FROM mm_tag tag,mm_insrel insrel "
- + "WHERE (tag.number=insrel.dnumber) "
+ + "WHERE (tag.number=insrel.dnumber) AND tag.name is not null "
+ "GROUP BY tag.number";
private static final String SQL_LIVE_SELECT_TAGS_COUNT = "SELECT
tag.number,COUNT(contentelement.number) AS cnt "
+ "FROM live_tag tag,live_insrel insrel,live_contentelement
contentelement "
- + "WHERE (tag.number=insrel.dnumber AND
contentelement.number=insrel.snumber) "
+ + "WHERE (tag.number=insrel.dnumber AND
contentelement.number=insrel.snumber) AND tag.name is not null "
+ "GROUP BY tag.name";
private static final String SQL_STAGING_SELECT_CONTENT_RELATED_TAGS =
"SELECT tag.number,tag.name,tag.description "
+ "FROM mm_tag tag,mm_insrel insrel "
- + "WHERE (tag.number=insrel.dnumber AND
CONTENTELEMENT_NUMBER=insrel.snumber) "
+ + "WHERE (tag.number=insrel.dnumber AND
CONTENTELEMENT_NUMBER=insrel.snumber) AND tag.name is not null "
+ "ORDER BY tag.name";
private static final String SQL_LIVE_SELECT_CONTENT_RELATED_TAGS =
"SELECT tag.number,tag.name,tag.description "
+ "FROM live_tag tag,live_insrel insrel "
- + "WHERE (tag.number=insrel.dnumber AND
CONTENTELEMENT_NUMBER=insrel.snumber) "
+ + "WHERE (tag.number=insrel.dnumber AND
CONTENTELEMENT_NUMBER=insrel.snumber) AND tag.name is not null "
+ "ORDER BY tag.name";
private static final String SQL_STAGING_SELECT_CHANNEL_RELATED_TAGS = "
SELECT tag.number, tag.name,tag.description,COUNT(contentelement.number) AS
cnt "+
"FROM mm_tag tag,mm_insrel insrel,mm_contentelement
contentelement, mm_contentrel contentrel "+
- "WHERE tag.number=insrel.dnumber AND
contentelement.number=insrel.snumber AND contentelement.number =
contentrel.dnumber AND contentrel.snumber = CONTENTCHANNEL_NUMBER "+
+ "WHERE tag.number=insrel.dnumber AND
contentelement.number=insrel.snumber AND contentelement.number =
contentrel.dnumber AND contentrel.snumber = CONTENTCHANNEL_NUMBER AND tag.name
is not null "+
"GROUP BY tag.name,tag.description";
private static final String SQL_LIVE_SELECT_CHANNEL_RELATED_TAGS = "
SELECT tag.number, tag.name,tag.description,COUNT(contentelement.number) AS
cnt "+
"FROM live_tag tag,live_insrel insrel,live_contentelement
contentelement, live_contentrel contentrel "+
- "WHERE tag.number=insrel.dnumber AND
contentelement.number=insrel.snumber AND contentelement.number =
contentrel.dnumber AND contentrel.snumber = CONTENTCHANNEL_NUMBER "+
+ "WHERE tag.number=insrel.dnumber AND
contentelement.number=insrel.snumber AND contentelement.number =
contentrel.dnumber AND contentrel.snumber = CONTENTCHANNEL_NUMBER AND tag.name
is not null "+
"GROUP BY tag.name,tag.description";
@@ -69,14 +69,14 @@
"FROM mm_tag source_tag,mm_insrel
source_insrel,mm_contentelement contentelement, mm_insrel target_insrel, mm_tag
target_tag "+
"WHERE source_tag.number=source_insrel.dnumber AND
contentelement.number=source_insrel.snumber "+
"AND target_tag.number=target_insrel.dnumber AND
contentelement.number=target_insrel.snumber "+
- "AND LOWER(source_tag.name) = 'TAG_NAME' "+
+ "AND LOWER(source_tag.name) = 'TAG_NAME' AND tag.name is not
null "+
"GROUP BY target_tag.name,target_tag.description ";
private static final String SQL_LIVE_SELECT_TAG_RELATED_TAGS = "SELECT
target_tag.number,target_tag.name,target_tag.description,COUNT(contentelement.number)
AS cnt "+
"FROM live_tag source_tag,live_insrel
source_insrel,live_contentelement contentelement, live_insrel target_insrel,
live_tag target_tag "+
"WHERE source_tag.number=source_insrel.dnumber AND
contentelement.number=source_insrel.snumber "+
"AND target_tag.number=target_insrel.dnumber AND
contentelement.number=target_insrel.snumber "+
- "AND LOWER(source_tag.name) = 'TAG_NAME' "+
+ "AND LOWER(source_tag.name) = 'TAG_NAME' AND tag.name is not
null "+
"GROUP BY target_tag.name,target_tag.description ";
private static Connection getConnection() {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
