Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

-in the search results, display repository (with link) where artifact is located 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@675505 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Maria Odea B. Ching 2008-07-10 10:44:08 +00:00
parent ce121d314f
commit f8cfdfa447
4 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResultHit.java
View File

@ -47,6 +47,8 @@ public class SearchResultHit
private String version = ""; private String version = "";
private String repositoryId = "";
// Advanced hit, if artifact, all versions of artifact // Advanced hit, if artifact, all versions of artifact
private List artifacts = new ArrayList(); private List artifacts = new ArrayList();
@ -138,4 +140,14 @@ public class SearchResultHit
{ {
return versions; return versions;
} }
public String getRepositoryId()
{
return repositoryId;
}
public void setRepositoryId( String repositoryId )
{
this.repositoryId = repositoryId;
}
} }

1
archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResults.java
View File

@ -126,6 +126,7 @@ public class SearchResults
// Only need to worry about this hit if it is truely new. // Only need to worry about this hit if it is truely new.
hit = new SearchResultHit(); hit = new SearchResultHit();
hit.setRepositoryId( filecontent.getRepositoryId() );
hit.setUrl( filecontent.getRepositoryId() + "/" + filecontent.getFilename() ); hit.setUrl( filecontent.getRepositoryId() + "/" + filecontent.getFilename() );
hit.setContext( null ); // TODO: handle context + highlight later. hit.setContext( null ); // TODO: handle context + highlight later.

2
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
View File

@ -124,7 +124,7 @@
</h3> </h3>
<p> <p>
<my:showArtifactLink groupId="${record.groupId}" artifactId="${record.artifactId}" <my:showArtifactLink groupId="${record.groupId}" artifactId="${record.artifactId}"
version="${record.version}" versions="${record.versions}"/> version="${record.version}" versions="${record.versions}" repositoryId="${record.repositoryId}"/>
</p> </p>
</c:when> </c:when>
<c:otherwise> <c:otherwise>

3
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/showArtifactLink.tag
View File

@ -27,8 +27,11 @@
<%@ attribute name="classifier" %> <%@ attribute name="classifier" %>
<%@ attribute name="scope" %> <%@ attribute name="scope" %>
<%@ attribute name="versions" type="java.util.List" %> <%@ attribute name="versions" type="java.util.List" %>
<%@ attribute name="repositoryId" %>
<span class="artifact-link"> <span class="artifact-link">
<a href="${pageContext.request.contextPath}/repository/${repositoryId}">${repositoryId}</a>
<strong> : </strong>
<archiva:groupIdLink var="${groupId}" includeTop="false" /> <archiva:groupIdLink var="${groupId}" includeTop="false" />
<c:if test="${!empty(artifactId)}"> <c:if test="${!empty(artifactId)}">