[mb-commits] r12229 - in search_server: branches/ngs/index/src/main/java/org/musicbrainz/search/analysis branches/ngs/index/src/main/java/org/musicbrainz/search/index branches/ngs/index/src/test/java/org/musicbrainz/search/analysis branches/ngs/servlet branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1 branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2 branches/ngs/servlet/src/main/webapp/WEB-INF branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet trunk trunk/index/src/main/java/org/musicbrainz/search/analysis
root at musicbrainz.org
root at musicbrainz.org
Fri Oct 16 13:33:59 UTC 2009
Author: ijabz
Date: 2009-10-16 13:33:58 +0000 (Fri, 16 Oct 2009)
New Revision: 12229
Added:
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/ArtistMmd1XmlWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/LabelMmd1XmlWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/Mmd1XmlWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/ReleaseGroupMmd1XmlWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/ReleaseMmd1XmlWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/TrackMmd1XmlWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ArtistXmlWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/XmlWriter.java
search_server/trunk/index.iml
search_server/trunk/index/src/main/java/org/musicbrainz/search/analysis/CaseInsensitiveKeywordAnalyzer.java
search_server/trunk/searchserver.iml
search_server/trunk/servlet.iml
Removed:
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ArtistXmlWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/LabelXmlWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ReleaseGroupXmlWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ReleaseXmlWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/TrackXmlWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/XmlWriter.java
Modified:
search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/analysis/CaseInsensitiveKeywordAnalyzer.java
search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/IndexBuilder.java
search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/analysis/CompareNormalizationFiltersTest.java
search_server/branches/ngs/servlet/pom.xml
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/AnnotationSearch.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ArtistSearch.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/CDStubSearch.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/FreeDBSearch.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/LabelSearch.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ReleaseGroupSearch.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ReleaseSearch.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/RequestParameter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServer.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServerServlet.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/TrackSearch.java
search_server/branches/ngs/servlet/src/main/webapp/WEB-INF/web.xml
search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindArtistTest.java
search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindLabelTest.java
search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseGroupTest.java
search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseTest.java
search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindTrackTest.java
Log:
Support for V2 XML Basic Test
V1 XML classes renamed, added new version switch, if set to 1 returns v1 XML, if set to 2 (or not set) returns V2 XML (if its written)
Added code for Artist to show the gender attribute for V2 XML as proof of concept.
Removed code that threw exception if no results , now ust returns an empty set.
(Warning:This code depends on MMD2 JAXB classes which are not yet checked in yet)
Modified: search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/analysis/CaseInsensitiveKeywordAnalyzer.java
===================================================================
--- search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/analysis/CaseInsensitiveKeywordAnalyzer.java 2009-10-15 14:42:08 UTC (rev 12228)
+++ search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/analysis/CaseInsensitiveKeywordAnalyzer.java 2009-10-16 13:33:58 UTC (rev 12229)
@@ -19,7 +19,7 @@
public TokenStream tokenStream(String fieldName,
final Reader reader) {
TokenStream result = new KeywordTokenizer(reader);
- result = new LowerCaseFilter(result);
+ result = new LowercaseFilter(result);
return result;
}
@@ -36,7 +36,7 @@
streams = new SavedStreams();
setPreviousTokenStream(streams);
streams.tokenStream = new KeywordTokenizer(reader);
- streams.filteredTokenStream = new LowerCaseFilter(streams.tokenStream);
+ streams.filteredTokenStream = new LowercaseFilter(streams.tokenStream);
} else {
streams.tokenStream.reset(reader);
}
Modified: search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/IndexBuilder.java
===================================================================
--- search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/IndexBuilder.java 2009-10-15 14:42:08 UTC (rev 12228)
+++ search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/IndexBuilder.java 2009-10-16 13:33:58 UTC (rev 12229)
@@ -259,7 +259,7 @@
private static void prepareDbConnection(Connection connection) throws SQLException
{
Statement st = connection.createStatement();
- st.executeUpdate("SET search_path TO '" + DB_SCHEMA + "'");
+ //st.executeUpdate("SET search_path TO '" + DB_SCHEMA + "'");
}
}
Modified: search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/analysis/CompareNormalizationFiltersTest.java
===================================================================
--- search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/analysis/CompareNormalizationFiltersTest.java 2009-10-15 14:42:08 UTC (rev 12228)
+++ search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/analysis/CompareNormalizationFiltersTest.java 2009-10-16 13:33:58 UTC (rev 12229)
@@ -73,15 +73,21 @@
{
changedByASCIIAndNFKC ++;
}
- /* if(!t.term().equals(t2.term()))
+ if(
+ (!t0.term().equals(t2.term()))
+ &&
+ (t0.term().equals(t.term()))
+ )
+
+
{
- printAsHexAndValue(t0.term());
- printAsHexAndValue(t.term());
- printAsHexAndValue(t2.term());
- printAsHexAndValue(t3.term());
- System.out.println();
+ //printAsHexAndValue(t0.term());
+ //printAsHexAndValue(t.term());
+ //printAsHexAndValue(t2.term());
+ //printAsHexAndValue(t3.term());
+ //System.out.println();
- }*/
+ }
}
System.out.println("Accent Filter changed "+ changedByAccent + " chars");
System.out.println("ASCII Filter changed "+ changedByASCII + " chars");
Modified: search_server/branches/ngs/servlet/pom.xml
===================================================================
--- search_server/branches/ngs/servlet/pom.xml 2009-10-15 14:42:08 UTC (rev 12228)
+++ search_server/branches/ngs/servlet/pom.xml 2009-10-16 13:33:58 UTC (rev 12229)
@@ -53,9 +53,14 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>org.musicbrainz.mmd2</groupId>
+ <artifactId>mmd2</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ <dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.0.5</version>
+ <version>2.1.12</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/AnnotationSearch.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/AnnotationSearch.java 2009-10-15 14:42:08 UTC (rev 12228)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/AnnotationSearch.java 2009-10-16 13:33:58 UTC (rev 12229)
@@ -11,7 +11,7 @@
public class AnnotationSearch extends SearchServer {
private AnnotationSearch() throws Exception {
- xmlWriter = null;
+ mmd1XmlWriter = null;
htmlWriter = new AnnotationHtmlWriter();
defaultFields = new ArrayList<String>();
defaultFields.add(AnnotationIndexField.TEXT.getName());
Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ArtistSearch.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ArtistSearch.java 2009-10-15 14:42:08 UTC (rev 12228)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ArtistSearch.java 2009-10-16 13:33:58 UTC (rev 12229)
@@ -4,6 +4,8 @@
import org.apache.lucene.queryParser.QueryParser;
import org.musicbrainz.search.index.ArtistIndexField;
import org.musicbrainz.search.index.ArtistAnalyzer;
+import org.musicbrainz.search.servlet.mmd1.ArtistMmd1XmlWriter;
+import org.musicbrainz.search.servlet.mmd2.ArtistXmlWriter;
import java.util.ArrayList;
@@ -12,6 +14,7 @@
private ArtistSearch() throws Exception {
xmlWriter = new ArtistXmlWriter();
+ mmd1XmlWriter = new ArtistMmd1XmlWriter();
htmlWriter = new ArtistHtmlWriter();
defaultFields = new ArrayList<String>();
defaultFields.add(ArtistIndexField.ARTIST.getName());
Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/CDStubSearch.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/CDStubSearch.java 2009-10-15 14:42:08 UTC (rev 12228)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/CDStubSearch.java 2009-10-16 13:33:58 UTC (rev 12229)
@@ -12,7 +12,7 @@
public class CDStubSearch extends SearchServer {
private CDStubSearch() throws Exception {
- xmlWriter = null;
+ mmd1XmlWriter = null;
htmlWriter = new CDStubHtmlWriter();
defaultFields = new ArrayList<String>();
defaultFields.add(CDStubIndexField.ARTIST.getName());
Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/FreeDBSearch.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/FreeDBSearch.java 2009-10-15 14:42:08 UTC (rev 12228)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/FreeDBSearch.java 2009-10-16 13:33:58 UTC (rev 12229)
@@ -12,7 +12,7 @@
public class FreeDBSearch extends SearchServer {
private FreeDBSearch() throws Exception {
- xmlWriter = null;
+ mmd1XmlWriter = null;
htmlWriter = new FreeDBHtmlWriter();
defaultFields = new ArrayList<String>();
defaultFields.add(FreeDBIndexField.ARTIST.getName());
Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/LabelSearch.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/LabelSearch.java 2009-10-15 14:42:08 UTC (rev 12228)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/LabelSearch.java 2009-10-16 13:33:58 UTC (rev 12229)
@@ -4,6 +4,7 @@
import org.apache.lucene.queryParser.QueryParser;
import org.musicbrainz.search.index.LabelIndexField;
import org.musicbrainz.search.index.LabelAnalyzer;
+import org.musicbrainz.search.servlet.mmd1.LabelMmd1XmlWriter;
import java.util.ArrayList;
@@ -12,7 +13,7 @@
public LabelSearch() throws Exception {
- xmlWriter = new LabelXmlWriter();
+ mmd1XmlWriter = new LabelMmd1XmlWriter();
htmlWriter = new LabelHtmlWriter();
defaultFields = new ArrayList<String>();
defaultFields.add(LabelIndexField.LABEL.getName());
Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ReleaseGroupSearch.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ReleaseGroupSearch.java 2009-10-15 14:42:08 UTC (rev 12228)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ReleaseGroupSearch.java 2009-10-16 13:33:58 UTC (rev 12229)
@@ -4,6 +4,7 @@
import org.apache.lucene.queryParser.QueryParser;
import org.musicbrainz.search.index.ReleaseGroupIndexField;
import org.musicbrainz.search.index.ReleaseGroupAnalyzer;
+import org.musicbrainz.search.servlet.mmd1.ReleaseGroupMmd1XmlWriter;
import java.util.ArrayList;
@@ -12,7 +13,7 @@
public ReleaseGroupSearch() throws Exception
{
- xmlWriter = new ReleaseGroupXmlWriter();
+ mmd1XmlWriter = new ReleaseGroupMmd1XmlWriter();
htmlWriter = new ReleaseGroupHtmlWriter();
defaultFields = new ArrayList<String>();
defaultFields.add(ReleaseGroupIndexField.RELEASEGROUP.getName());
Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ReleaseSearch.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ReleaseSearch.java 2009-10-15 14:42:08 UTC (rev 12228)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ReleaseSearch.java 2009-10-16 13:33:58 UTC (rev 12229)
@@ -4,6 +4,7 @@
import org.apache.lucene.queryParser.QueryParser;
import org.musicbrainz.search.index.ReleaseIndexField;
import org.musicbrainz.search.index.ReleaseAnalyzer;
+import org.musicbrainz.search.servlet.mmd1.ReleaseMmd1XmlWriter;
import java.util.ArrayList;
@@ -12,7 +13,7 @@
public ReleaseSearch() throws Exception {
- xmlWriter = new ReleaseXmlWriter();
+ mmd1XmlWriter = new ReleaseMmd1XmlWriter();
htmlWriter = new ReleaseHtmlWriter();
defaultFields = new ArrayList<String>();
defaultFields.add(ReleaseIndexField.RELEASE.getName());
Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/RequestParameter.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/RequestParameter.java 2009-10-15 14:42:08 UTC (rev 12228)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/RequestParameter.java 2009-10-16 13:33:58 UTC (rev 12229)
@@ -40,7 +40,7 @@
RELATIONSHIPS("rel"),
OLD_STYLE_LINK("mbt"),
COUNT("count"),
-
+ VERSION("version"),
;
private String name;
Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServer.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServer.java 2009-10-15 14:42:08 UTC (rev 12228)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServer.java 2009-10-16 13:33:58 UTC (rev 12229)
@@ -29,32 +29,34 @@
package org.musicbrainz.search.servlet;
import org.apache.lucene.analysis.PerFieldAnalyzerWrapper;
-import org.apache.lucene.queryParser.MultiFieldQueryParser;
+import org.apache.lucene.index.IndexReader;
import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.search.TopScoreDocCollector;
-import org.apache.lucene.index.IndexReader;
import org.apache.lucene.store.NIOFSDirectory;
import org.apache.lucene.util.NumericUtils;
import org.musicbrainz.search.index.MetaIndexField;
+import org.musicbrainz.search.servlet.mmd1.Mmd1XmlWriter;
+import org.musicbrainz.search.servlet.mmd2.XmlWriter;
+import java.io.File;
import java.io.IOException;
-import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.List;
-import java.util.Date;
import java.util.Locale;
import java.util.TimeZone;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.logging.Logger;
-import java.text.SimpleDateFormat;
public abstract class SearchServer {
protected PerFieldAnalyzerWrapper analyzer;
protected XmlWriter xmlWriter;
+ protected Mmd1XmlWriter mmd1XmlWriter;
protected HtmlWriter htmlWriter;
protected List<String> defaultFields;
protected IndexSearcher indexSearcher;
@@ -109,6 +111,10 @@
return xmlWriter;
}
+ public Mmd1XmlWriter getXmlV1Writer() {
+ return mmd1XmlWriter;
+ }
+
public HtmlWriter getHtmlWriter() {
return htmlWriter;
}
@@ -122,9 +128,22 @@
}
- public ResultsWriter getWriter(String fmt) {
+ public ResultsWriter getWriter(String fmt, String version) {
if (SearchServerServlet.RESPONSE_XML.equals(fmt)) {
- return getXmlWriter();
+ if(SearchServerServlet.VERSION_1.equals(version)) {
+ return getXmlV1Writer();
+ }
+ else {
+ //TODO whilst in dev fall back to v1 if don't have a v2 one yet
+ ResultsWriter writer = getXmlWriter();
+ if(writer==null) {
+ return getXmlV1Writer();
+ } else {
+ return writer;
+ }
+
+ }
+
} else {
return getHtmlWriter();
}
Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServerServlet.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServerServlet.java 2009-10-15 14:42:08 UTC (rev 12228)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServerServlet.java 2009-10-16 13:33:58 UTC (rev 12229)
@@ -55,6 +55,9 @@
final static String RESPONSE_XML = "xml";
final static String RESPONSE_HTML = "html";
+ final static String VERSION_1 = "1";
+ final static String VERSION_2 = "2";
+
final static String CHARSET = "UTF-8";
private boolean isServletInitialized = false;
@@ -107,7 +110,7 @@
//Ensure encoding set to UTF8
request.setCharacterEncoding(CHARSET);
- //If we receive Count Parameter then we just return a count imediately, the options are the same as for the type
+ //If we receive Count Parameter then we just return a count immediately, the options are the same as for the type
//parameter
String count = request.getParameter(RequestParameter.COUNT.getName());
if(count!=null) {
@@ -157,6 +160,11 @@
responseFormat = RESPONSE_HTML;
}
+ String responseVersion = request.getParameter(RequestParameter.VERSION.getName());
+ if (responseVersion == null || responseVersion.isEmpty()) {
+ responseVersion = VERSION_2;
+ }
+
Integer offset = DEFAULT_OFFSET;
String strOffset = request.getParameter(RequestParameter.OFFSET.getName());
if (strOffset != null && !strOffset.isEmpty()) {
@@ -233,14 +241,8 @@
SearchServer searchServer = SearchServerFactory.getSearchServer(resourceType);
Results results = searchServer.search(query, offset, limit);
- //TODO Doesnt seem right to throw this exception, but it is currently expected by mb_server when have no results
- if (results.results.size() == 0) {
- response.sendError(HttpServletResponse.SC_NOT_FOUND, ErrorMessage.NO_MATCHES.getMsg(query));
- return;
- }
+ ResultsWriter writer = searchServer.getWriter(responseFormat, responseVersion);
- ResultsWriter writer = searchServer.getWriter(responseFormat);
-
if (writer == null) {
response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, ErrorMessage.NO_HANDLER_FOR_TYPE_AND_FORMAT.getMsg(resourceType, responseFormat));
return;
Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/TrackSearch.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/TrackSearch.java 2009-10-15 14:42:08 UTC (rev 12228)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/TrackSearch.java 2009-10-16 13:33:58 UTC (rev 12229)
@@ -4,6 +4,7 @@
import org.apache.lucene.queryParser.QueryParser;
import org.musicbrainz.search.index.TrackIndexField;
import org.musicbrainz.search.index.TrackAnalyzer;
+import org.musicbrainz.search.servlet.mmd1.TrackMmd1XmlWriter;
import java.util.ArrayList;
@@ -13,7 +14,7 @@
public TrackSearch() throws Exception {
- xmlWriter = new TrackXmlWriter();
+ mmd1XmlWriter = new TrackMmd1XmlWriter();
htmlWriter = new TrackHtmlWriter();
defaultFields = new ArrayList<String>();
defaultFields.add(TrackIndexField.TRACK.getName());
Modified: search_server/branches/ngs/servlet/src/main/webapp/WEB-INF/web.xml
===================================================================
--- search_server/branches/ngs/servlet/src/main/webapp/WEB-INF/web.xml 2009-10-15 14:42:08 UTC (rev 12228)
+++ search_server/branches/ngs/servlet/src/main/webapp/WEB-INF/web.xml 2009-10-16 13:33:58 UTC (rev 12229)
@@ -20,7 +20,7 @@
<servlet-class>org.musicbrainz.search.servlet.SearchServerServlet</servlet-class>
<init-param>
<param-name>index_dir</param-name>
- <param-value>/home/search/indexdata</param-value>
+ <param-value>/users/paul/musicbrainzindexes</param-value>
</init-param>
</servlet>
<servlet-mapping>
Modified: search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindArtistTest.java
===================================================================
--- search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindArtistTest.java 2009-10-15 14:42:08 UTC (rev 12228)
+++ search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindArtistTest.java 2009-10-16 13:33:58 UTC (rev 12229)
@@ -6,21 +6,20 @@
import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.analysis.PerFieldAnalyzerWrapper;
import org.apache.velocity.app.Velocity;
-import org.musicbrainz.search.analysis.StandardUnaccentAnalyzer;
import org.musicbrainz.search.index.ArtistIndexField;
import org.musicbrainz.search.index.ArtistType;
import org.musicbrainz.search.index.Index;
import org.musicbrainz.search.index.ArtistAnalyzer;
import org.musicbrainz.search.servlet.ArtistHtmlWriter;
import org.musicbrainz.search.servlet.ArtistSearch;
-import org.musicbrainz.search.servlet.ArtistXmlWriter;
+import org.musicbrainz.search.servlet.mmd1.ArtistMmd1XmlWriter;
import org.musicbrainz.search.servlet.MbDocument;
import org.musicbrainz.search.servlet.Result;
import org.musicbrainz.search.servlet.Results;
import org.musicbrainz.search.servlet.ResultsWriter;
import org.musicbrainz.search.servlet.SearchServer;
import org.musicbrainz.search.servlet.SearchServerServlet;
-import org.musicbrainz.search.servlet.XmlWriter;
+import org.musicbrainz.search.servlet.mmd1.Mmd1XmlWriter;
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -235,10 +234,10 @@
public void testOutputAsXml() throws Exception {
Results res = ss.searchLucene("artist:\"Farming Incident\"", 0, 1);
- XmlWriter writer = new ArtistXmlWriter();
+ Mmd1XmlWriter v1Writer = new ArtistMmd1XmlWriter();
StringWriter sw = new StringWriter();
PrintWriter pr = new PrintWriter(sw);
- writer.write(pr, res);
+ v1Writer.write(pr, res);
pr.close();
String output = sw.toString();
@@ -286,10 +285,10 @@
public void testOutputAsXmlSpecialCharacters() throws Exception {
Results res = ss.searchLucene("alias:\"Echo And The Bunnymen\"", 0, 1);
- XmlWriter writer = new ArtistXmlWriter();
+ Mmd1XmlWriter v1Writer = new ArtistMmd1XmlWriter();
StringWriter sw = new StringWriter();
PrintWriter pr = new PrintWriter(sw);
- writer.write(pr, res);
+ v1Writer.write(pr, res);
pr.close();
String output = sw.toString();
@@ -325,7 +324,7 @@
assertEquals(1, res.totalHits);
Date start = new Date();
- ResultsWriter writer = new ArtistXmlWriter();
+ ResultsWriter writer = new ArtistMmd1XmlWriter();
StringWriter sw = new StringWriter();
PrintWriter pr = new PrintWriter(sw);
for (int i = 0; i < 1000; i++) {
@@ -363,7 +362,7 @@
public void testOutputAsXmlFragment() throws Exception {
Results res = ss.searchLucene("artist:\"Farming Incident\"", 0, 1);
- XmlWriter writer = new ArtistXmlWriter();
+ Mmd1XmlWriter writer = new ArtistMmd1XmlWriter();
StringWriter sw = new StringWriter();
PrintWriter pr = new PrintWriter(sw);
writer.write(pr, res);
Modified: search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindLabelTest.java
===================================================================
--- search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindLabelTest.java 2009-10-15 14:42:08 UTC (rev 12228)
+++ search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindLabelTest.java 2009-10-16 13:33:58 UTC (rev 12229)
@@ -6,10 +6,9 @@
import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.analysis.PerFieldAnalyzerWrapper;
import org.apache.velocity.app.Velocity;
-import org.musicbrainz.search.analysis.StandardUnaccentAnalyzer;
import org.musicbrainz.search.index.*;
import org.musicbrainz.search.servlet.LabelSearch;
-import org.musicbrainz.search.servlet.LabelXmlWriter;
+import org.musicbrainz.search.servlet.mmd1.LabelMmd1XmlWriter;
import org.musicbrainz.search.servlet.MbDocument;
import org.musicbrainz.search.servlet.Result;
import org.musicbrainz.search.servlet.Results;
@@ -251,7 +250,7 @@
public void testOutputAsXml() throws Exception {
Results res = ss.searchLucene("label:\"Jockey Slut\"", 0, 1);
- ResultsWriter writer = new LabelXmlWriter();
+ ResultsWriter writer = new LabelMmd1XmlWriter();
StringWriter sw = new StringWriter();
PrintWriter pr = new PrintWriter(sw);
writer.write(pr, res);
Modified: search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseGroupTest.java
===================================================================
--- search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseGroupTest.java 2009-10-15 14:42:08 UTC (rev 12228)
+++ search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseGroupTest.java 2009-10-16 13:33:58 UTC (rev 12229)
@@ -6,11 +6,10 @@
import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.analysis.PerFieldAnalyzerWrapper;
import org.apache.velocity.app.Velocity;
-import org.musicbrainz.search.analysis.StandardUnaccentAnalyzer;
import org.musicbrainz.search.index.*;
import org.musicbrainz.search.servlet.MbDocument;
import org.musicbrainz.search.servlet.ReleaseGroupSearch;
-import org.musicbrainz.search.servlet.ReleaseGroupXmlWriter;
+import org.musicbrainz.search.servlet.mmd1.ReleaseGroupMmd1XmlWriter;
import org.musicbrainz.search.servlet.Result;
import org.musicbrainz.search.servlet.Results;
import org.musicbrainz.search.servlet.ResultsWriter;
@@ -168,7 +167,7 @@
public void testOutputAsXml() throws Exception {
Results res = ss.searchLucene("releasegroup:\"Nobody's Twisting Your Arm\"", 0, 1);
- ResultsWriter writer = new ReleaseGroupXmlWriter();
+ ResultsWriter writer = new ReleaseGroupMmd1XmlWriter();
StringWriter sw = new StringWriter();
PrintWriter pr = new PrintWriter(sw);
writer.write(pr, res);
Modified: search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseTest.java
===================================================================
--- search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseTest.java 2009-10-15 14:42:08 UTC (rev 12228)
+++ search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseTest.java 2009-10-16 13:33:58 UTC (rev 12229)
@@ -4,15 +4,12 @@
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.store.RAMDirectory;
-import org.apache.lucene.analysis.KeywordAnalyzer;
import org.apache.lucene.analysis.PerFieldAnalyzerWrapper;
import org.apache.velocity.app.Velocity;
-import org.musicbrainz.search.analysis.StandardUnaccentAnalyzer;
-import org.musicbrainz.search.analysis.CaseInsensitiveKeywordAnalyzer;
import org.musicbrainz.search.index.*;
import org.musicbrainz.search.servlet.MbDocument;
import org.musicbrainz.search.servlet.ReleaseSearch;
-import org.musicbrainz.search.servlet.ReleaseXmlWriter;
+import org.musicbrainz.search.servlet.mmd1.ReleaseMmd1XmlWriter;
import org.musicbrainz.search.servlet.ResourceType;
import org.musicbrainz.search.servlet.Result;
import org.musicbrainz.search.servlet.Results;
@@ -640,7 +637,7 @@
public void testOutputAsXml() throws Exception {
Results res = ss.searchLucene("release:\"Our Glorious 5 Year Plan\"", 0, 1);
- ResultsWriter writer = new ReleaseXmlWriter();
+ ResultsWriter writer = new ReleaseMmd1XmlWriter();
StringWriter sw = new StringWriter();
PrintWriter pr = new PrintWriter(sw);
writer.write(pr, res);
Modified: search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindTrackTest.java
===================================================================
--- search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindTrackTest.java 2009-10-15 14:42:08 UTC (rev 12228)
+++ search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindTrackTest.java 2009-10-16 13:33:58 UTC (rev 12229)
@@ -1,15 +1,12 @@
package org.musicbrainz.search.servlet;
import junit.framework.TestCase;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.NumberTools;
-import org.apache.lucene.document.NumericField;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.analysis.PerFieldAnalyzerWrapper;
import org.apache.lucene.util.NumericUtils;
import org.apache.velocity.app.Velocity;
-import org.musicbrainz.search.analysis.StandardUnaccentAnalyzer;
import org.musicbrainz.search.index.*;
import org.musicbrainz.search.servlet.MbDocument;
import org.musicbrainz.search.servlet.Result;
@@ -18,7 +15,7 @@
import org.musicbrainz.search.servlet.SearchServer;
import org.musicbrainz.search.servlet.SearchServerServlet;
import org.musicbrainz.search.servlet.TrackSearch;
-import org.musicbrainz.search.servlet.TrackXmlWriter;
+import org.musicbrainz.search.servlet.mmd1.TrackMmd1XmlWriter;
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -302,7 +299,7 @@
public void testOutputAsXml() throws Exception {
Results res = ss.searchLucene("track:\"Gravitational Lenz\"", 0, 10);
- ResultsWriter writer = new TrackXmlWriter();
+ ResultsWriter writer = new TrackMmd1XmlWriter();
StringWriter sw = new StringWriter();
PrintWriter pr = new PrintWriter(sw);
writer.write(pr, res);
More information about the MusicBrainz-commits
mailing list