Author: oching
Date: Thu Jul 10 03:44:08 2008
New Revision: 675505
URL: http://svn.apache.org/viewvc?rev=675505&view=rev
Log:
-in the search results, display repository (with link) where artifact is located
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResultHit.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResults.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/showArtifactLink.tag
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResultHit.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResultHit.java?rev=675505&r1=675504&r2=675505&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResultHit.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResultHit.java
Thu Jul 10 03:44:08 2008
@@ -46,6 +46,8 @@
private String artifactId;
private String version = "";
+
+ private String repositoryId = "";
// Advanced hit, if artifact, all versions of artifact
private List artifacts = new ArrayList();
@@ -138,4 +140,14 @@
{
return versions;
}
+
+ public String getRepositoryId()
+ {
+ return repositoryId;
+ }
+
+ public void setRepositoryId( String repositoryId )
+ {
+ this.repositoryId = repositoryId;
+ }
}
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResults.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResults.java?rev=675505&r1=675504&r2=675505&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResults.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResults.java
Thu Jul 10 03:44:08 2008
@@ -126,6 +126,7 @@
// Only need to worry about this hit if it is truely new.
hit = new SearchResultHit();
+ hit.setRepositoryId( filecontent.getRepositoryId() );
hit.setUrl( filecontent.getRepositoryId() + "/" +
filecontent.getFilename() );
hit.setContext( null ); // TODO: handle context + highlight later.
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp?rev=675505&r1=675504&r2=675505&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
Thu Jul 10 03:44:08 2008
@@ -124,7 +124,7 @@
</h3>
<p>
<my:showArtifactLink groupId="${record.groupId}"
artifactId="${record.artifactId}"
- version="${record.version}"
versions="${record.versions}"/>
+ version="${record.version}"
versions="${record.versions}" repositoryId="${record.repositoryId}"/>
</p>
</c:when>
<c:otherwise>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/showArtifactLink.tag
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/showArtifactLink.tag?rev=675505&r1=675504&r2=675505&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/showArtifactLink.tag
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/showArtifactLink.tag
Thu Jul 10 03:44:08 2008
@@ -27,11 +27,14 @@
<%@ attribute name="classifier" %>
<%@ attribute name="scope" %>
<%@ attribute name="versions" type="java.util.List" %>
+<%@ attribute name="repositoryId" %>
<span class="artifact-link">
+ <a
href="${pageContext.request.contextPath}/repository/${repositoryId}">${repositoryId}</a>
+ <strong> : </strong>
<archiva:groupIdLink var="${groupId}" includeTop="false" />
- <c:if test="${!empty(artifactId)}">
+ <c:if test="${!empty(artifactId)}">
<c:set var="url">
<ww:url action="browseArtifact" namespace="/">
<ww:param name="groupId" value="%{'${groupId}'}"/>
@@ -73,5 +76,5 @@
</c:if>
<c:if test="${!empty(classifier)}">
| <strong>Classifier:</strong> ${classifier}
- </c:if>
+ </c:if>
</span>
