[MRM-330]: Searching gives an HTTP 500

Functionality is now the same as archiva 0.9

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@541723 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 32 insertions, 41 deletions

diff --git a/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
index 5c11f5a4c..1da2664af 100644
--- a/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
+++ b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
@@ -40,7 +40,7 @@
   <h1>Results</h1>
 
   <div id="resultsBox">
-    <p>Hits: ${fn:length(results.hits)}</p>
+    <p>Hits: ${fn:length(results.hits)} of ${results.totalHits}</p>
     
     <c:choose>
       <c:when test="${empty results.hits}">
@@ -48,34 +48,25 @@
       </c:when>
       <c:otherwise>
         <c:forEach items="${results.hits}" var="record" varStatus="i">
-          <p>${record.url}</p>
-          <p>${record.groupId}</p>
-          <p>${record.artifactId}</p>
+          <c:choose>
+            <c:when test="${not empty (record.groupId)}">
+              <h3 class="artifact-title">
+                <my:showArtifactTitle groupId="${record.groupId}" artifactId="${record.artifactId}"
+                                      version="${record.version}"/>
+              </h3>
+              <p>
+                <my:showArtifactLink groupId="${record.groupId}" artifactId="${record.artifactId}"
+                                     version="${record.version}" versions="${record.versions}"/>
+              </p>
+            </c:when>
+            <c:otherwise>
+              <p>
+                <c:url var="hiturl" value="/repository/${record.url}" />
+                <a href="${hiturl}">${record.urlFilename}</a>
+              </p>
+            </c:otherwise>
+          </c:choose>
         </c:forEach>
-        <%--
-        <c:forEach items="${results.hachcodeHits}" var="record" varStatus="i">
-          <p>${record}</p>
-          <h3 class="artifact-title">
-            <my:showArtifactTitle groupId="${record.groupId}" artifactId="${record.artifactId}"
-                                  version="${record.version}"/>
-          </h3>
-          <p>
-            <my:showArtifactLink groupId="${record.groupId}" artifactId="${record.artifactId}"
-                                 version="${record.version}" versions="${record.versions}"/>
-          </p>
-        </c:forEach>
-        <c:forEach items="${results.bytecodeHits}" var="record" varStatus="i">
-          <p>${record}</p>
-          <h3 class="artifact-title">
-            <my:showArtifactTitle groupId="${record.groupId}" artifactId="${record.artifactId}"
-                                  version="${record.version}"/>
-          </h3>
-          <p>
-            <my:showArtifactLink groupId="${record.groupId}" artifactId="${record.artifactId}"
-                                 version="${record.version}" versions="${record.versions}"/>
-          </p>
-        </c:forEach>
-         --%>
       </c:otherwise>
     </c:choose>
   </div>
diff --git a/archiva-web/archiva-webapp/src/sql/mysql/drop_archiva_tables.sql b/archiva-web/archiva-webapp/src/sql/mysql/drop_archiva_tables.sql
index 55c6ffe97..edcee164b 100644
--- a/archiva-web/archiva-webapp/src/sql/mysql/drop_archiva_tables.sql
+++ b/archiva-web/archiva-webapp/src/sql/mysql/drop_archiva_tables.sql
@@ -10,23 +10,23 @@ DROP TABLE IF EXISTS `ARCHIVAPROJECTMODEL_PLUGINS` ;
 DROP TABLE IF EXISTS `ARCHIVAPROJECTMODEL_REPORTS` ;
 DROP TABLE IF EXISTS `ARCHIVAPROJECTMODEL_REPOSITORIES` ;
 DROP TABLE IF EXISTS `ARCHIVA_ARTIFACT` ;
-DROP TABLE IF EXISTS `ARCHIVA_ARTIFACT_REFERENCE` ;
-DROP TABLE IF EXISTS `ARCHIVA_CIMANAGEMENT` ;
-DROP TABLE IF EXISTS `ARCHIVA_DEPENDENCY` ;
-DROP TABLE IF EXISTS `ARCHIVA_EXCLUSIONS` ;
+DROP TABLE IF EXISTS `INDIVIDUAL_ROLES` ;
 DROP TABLE IF EXISTS `ARCHIVA_INDIVIDUAL` ;
-DROP TABLE IF EXISTS `ARCHIVA_ISSUE_MANAGEMENT` ;
+DROP TABLE IF EXISTS `ARCHIVA_EXCLUSIONS` ;
+DROP TABLE IF EXISTS `ARCHIVA_DEPENDENCY` ;
+DROP TABLE IF EXISTS `DEPENDENCY_EXCLUSIONS` ;
+DROP TABLE IF EXISTS `SEQUENCE_TABLE` ;
 DROP TABLE IF EXISTS `ARCHIVA_LICENSES` ;
+DROP TABLE IF EXISTS `ARCHIVA_PROJECT_REPOSITORIES` ;
+DROP TABLE IF EXISTS `ARCHIVA_REPOSITORY_STATS` ;
+DROP TABLE IF EXISTS `MAILINGLIST_OTHERARCHIVES` ;
 DROP TABLE IF EXISTS `ARCHIVA_MAILING_LISTS` ;
-DROP TABLE IF EXISTS `ARCHIVA_ORGANIZATION` ;
+
 DROP TABLE IF EXISTS `ARCHIVA_PROJECT` ;
-DROP TABLE IF EXISTS `ARCHIVA_PROJECT_REPOSITORIES` ;
+DROP TABLE IF EXISTS `ARCHIVA_CIMANAGEMENT` ;
 DROP TABLE IF EXISTS `ARCHIVA_REPOSITORIES` ;
-DROP TABLE IF EXISTS `ARCHIVA_REPOSITORY_STATS` ;
 DROP TABLE IF EXISTS `ARCHIVA_SCM` ;
+DROP TABLE IF EXISTS `ARCHIVA_ORGANIZATION` ;
+DROP TABLE IF EXISTS `ARCHIVA_ISSUE_MANAGEMENT` ;
+DROP TABLE IF EXISTS `ARCHIVA_ARTIFACT_REFERENCE` ;
 DROP TABLE IF EXISTS `ARCHIVA_VERSIONED_REFERENCE` ;
-DROP TABLE IF EXISTS `DEPENDENCY_EXCLUSIONS` ;
-DROP TABLE IF EXISTS `INDIVIDUAL_ROLES` ;
-DROP TABLE IF EXISTS `MAILINGLIST_OTHERARCHIVES` ;
-DROP TABLE IF EXISTS `SEQUENCE_TABLE` ;
-