Author: chathura
Date: Wed Dec 19 00:27:55 2007
New Revision: 11503
Log:
Minor fix in the database code.
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/TagsDAO.java
trunk/registry/modules/webapps/src/main/webapp/admin/search.jsp
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/TagsDAO.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/TagsDAO.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/TagsDAO.java
Wed Dec 19 00:27:55 2007
@@ -151,10 +151,10 @@
sql = "SELECT R.PATH FROM ARTIFACTS R, TAGS T WHERE R.AID=T.AID
AND T.TAG_NAME=?";
} else if (tags.length == 2) {
sql =
- "SELECT R.PATH FROM ARTIFACTS R, TAGS T WHERE R.AID=T.AID
AND (T.TAG_NAME=? OR T.TAG_NAME=?)";
+ "SELECT DISTINCT R.PATH FROM ARTIFACTS R, TAGS T WHERE
R.AID=T.AID AND (T.TAG_NAME=? OR T.TAG_NAME=?)";
} else if (tags.length == 3) {
sql =
- "SELECT R.PATH FROM ARTIFACTS R, TAGS T WHERE R.AID=T.AID
AND (T.TAG_NAME=? OR T.TAG_NAME=? OR T.TAG_NAME=?)";
+ "SELECT DISTINCT R.PATH FROM ARTIFACTS R, TAGS T WHERE
R.AID=T.AID AND (T.TAG_NAME=? OR T.TAG_NAME=? OR T.TAG_NAME=?)";
}
PreparedStatement s = conn.prepareStatement(sql);
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/search.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/search.jsp
(original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/search.jsp Wed Dec
19 00:27:55 2007
@@ -3,6 +3,7 @@
<%@ page import="java.util.Iterator" %>
<%@ page import="org.wso2.registry.web.actions.utils.ResourceData" %>
<%@ page import="org.wso2.registry.web.actions.SearchAction" %>
+<%@ page import="java.util.Map" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd";>
@@ -16,98 +17,113 @@
<div class="page-sizer">
- <%
- SearchAction searchAction = (SearchAction)
request.getSession().getAttribute(UIConstants.SEARCH_BEAN);
- %>
-
- <!-- START header content -->
- <jsp:include page="header.jsp" />
-
- <! START body content -->
- <div class="content">
- <h1 class="headding-search">Search</h1>
-
- <!-- Hear comes the box1 table -->
- <div class="box1-head">
- <table cellspacing="0" cellpadding="0"
border="0" style="width:100%">
- <tr>
- <td valign="top"
style="padding-top:0px;width:14px;"><img
src="/wso2registry/admin/images/box1-lefttop.jpg" /></td>
- <td valign="top">
- <h2>Search Results</h2>
- </td>
- <td align="right" valign="top">
- <a href="#"
onclick="showHideCommon('userIconExpanded');showHideCommon('userIconMinimized');showHideCommon('userExpanded');showHideCommon('userMinimized');">
- <img
src="/wso2registry/admin/images/icon-expanded.gif" border="0" align="top"
id="userIconExpanded" />
- <img
src="/wso2registry/admin/images/icon-minimized.gif" border="0" align="top"
id="userIconMinimized" style="display:none;" />
- </a>
- </td>
- <td valign="top" align="right"
style="width:14px; padding-top:0px;" ><img
src="/wso2registry/admin/images/box1-righttop.jpg" /></td>
- </tr>
- </table>
- </div>
- <div class="box1-mid" id="userMinimized"
style="display:none;">
- Expand to view details
- </div>
- <div class="box1-mid" id="userExpanded">
- <!-- all the content goes here -->
-
- <!-- Search results display -->
-
- <table cellpadding="0" cellspacing="0"
border="0" style="width:100%" class="data-table">
- <tr>
- <th></th>
- <th>Created Date</th>
- <th>Author</th>
- <th>Rating</th>
- <th>Description</th>
- <th>Action</th>
-
- </tr>
-
- <%
- List resourceDataList =
searchAction.getResourceDataList();
- Iterator i =
resourceDataList.iterator();
- while (i.hasNext()) {
- ResourceData resourceData =
(ResourceData) i.next();
- %>
- <tr id="1">
- <td><a
href="/wso2registry/web/<%=resourceData.getRelativePath()%>"
class="folder-small"><%=resourceData.getResourcePath()%></a></td>
-
<td><%=resourceData.getCreatedOn()%></td>
-
<td><%=resourceData.getAuthorUserName()%></td>
- <td>Rating</td>
- <td><a href="#"
onclick="showDescription('1-des')"><img border="0" src="images/icon-show.gif"
/></a></td>
- <td>
- <a href="#" title="Sub
Items"><img src="images/icon-subitems.gif" border="0" /></a>
- <a href="#" title="Show
Details" style="margin-left:5px;"><img src="images/icon-details.gif" border="0"
/></a>
- <a href="#" title="Delete"
style="margin-left:5px;"><img src="images/icon-trash.gif" border="0" /></a>
- </td>
-
-
- </tr>
- <tr id="1-des" style="display:none;">
- <td colspan="6"
class="table-description">
-
<%=resourceData.getDescription()%>
- </td>
- </tr>
-
- <% } %>
-
- </table>
- <!-- End box1-mid div -->
- </div>
- <div class="box1-bot">
- <table cellspacing="0" cellpadding="0"
border="0" style="width:100%" >
- <tr>
- <td><img
src="/wso2registry/admin/images/box1-leftbot.jpg" /></td>
- <td align="right"><img
src="/wso2registry/admin/images/box1-rightbot.jpg" /></td>
- </tr>
- </table>
- </div>
-
-
-
-
-
+<%
+ SearchAction searchAction = (SearchAction)
request.getSession().getAttribute(UIConstants.SEARCH_BEAN);
+%>
+
+<!-- START header content -->
+<jsp:include page="header.jsp" />
+
+<! START body content -->
+<div class="content">
+ <h1 class="headding-search">Search</h1>
+
+ <!-- Hear comes the box1 table -->
+ <div class="box1-head">
+ <table cellspacing="0" cellpadding="0" border="0" style="width:100%">
+ <tr>
+ <td valign="top" style="padding-top:0px;width:14px;"><img
src="/wso2registry/admin/images/box1-lefttop.jpg" /></td>
+ <td valign="top">
+ <h2>Search Results</h2>
+ </td>
+ <td align="right" valign="top">
+ <a href="#"
onclick="showHideCommon('userIconExpanded');showHideCommon('userIconMinimized');showHideCommon('userExpanded');showHideCommon('userMinimized');">
+ <img
src="/wso2registry/admin/images/icon-expanded.gif" border="0" align="top"
id="userIconExpanded" />
+ <img
src="/wso2registry/admin/images/icon-minimized.gif" border="0" align="top"
id="userIconMinimized" style="display:none;" />
+ </a>
+ </td>
+ <td valign="top" align="right" style="width:14px;
padding-top:0px;" ><img src="/wso2registry/admin/images/box1-righttop.jpg"
/></td>
+ </tr>
+ </table>
+ </div>
+ <div class="box1-mid" id="userMinimized" style="display:none;">
+ Expand to view details
+ </div>
+ <div class="box1-mid" id="userExpanded">
+ <!-- all the content goes here -->
+
+ <!-- Search results display -->
+
+ <table cellpadding="0" cellspacing="0" border="0" style="width:100%"
class="data-table">
+ <tr>
+ <th></th>
+ <th>Created Date</th>
+ <th>Author</th>
+ <th>Rating</th>
+ <th>Description</th>
+ <th>Action</th>
+
+ </tr>
+
+ <%
+ List resourceDataList = searchAction.getResourceDataList();
+ Iterator i = resourceDataList.iterator();
+ while (i.hasNext()) {
+ ResourceData resourceData = (ResourceData) i.next();
+ %>
+ <tr id="1">
+ <td><a
href="/wso2registry/web/<%=resourceData.getRelativePath()%>"
class="folder-small"><%=resourceData.getResourcePath()%></a></td>
+ <td><%=resourceData.getCreatedOn()%></td>
+ <td><%=resourceData.getAuthorUserName()%></td>
+ <td>Rating</td>
+ <td><a href="#" onclick="showDescription('1-des')"><img
border="0" src="images/icon-show.gif" /></a></td>
+ <td>
+ <a href="#" title="Sub Items"><img
src="images/icon-subitems.gif" border="0" /></a>
+ <a href="#" title="Show Details"
style="margin-left:5px;"><img src="images/icon-details.gif" border="0" /></a>
+ <a href="#" title="Delete" style="margin-left:5px;"><img
src="images/icon-trash.gif" border="0" /></a>
+ </td>
+ </tr>
+ <tr id="1-des" style="display:none;">
+ <td colspan="6" class="table-description">
+ <%=resourceData.getDescription()%>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="6">
+ <%
+ Map tagCounts = resourceData.getTagCounts();
+ Iterator iCounts = tagCounts.keySet().iterator();
+ while (iCounts.hasNext()) {
+ String tag = (String) iCounts.next();
+ String count = ((Long)
tagCounts.get(tag)).toString();
+ if (((Long) tagCounts.get(tag)).longValue() > 0) {
+ %>
+
+ <%=tag%> (<%=count%>) <% if (iCounts.hasNext()) { %> | <%
} %>
+
+ <% }} %>
+
+ </td>
+ </tr>
+
+ <% } %>
+
+ </table>
+ <!-- End box1-mid div -->
+ </div>
+ <div class="box1-bot">
+ <table cellspacing="0" cellpadding="0" border="0" style="width:100%" >
+ <tr>
+ <td><img src="/wso2registry/admin/images/box1-leftbot.jpg"
/></td>
+ <td align="right"><img
src="/wso2registry/admin/images/box1-rightbot.jpg" /></td>
+ </tr>
+ </table>
+ </div>
+
+
+
+
+
</div>
<!-- START footer content -->
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
