Author: ijabz
Date: 2009-11-03 13:29:32 +0000 (Tue, 03 Nov 2009)
New Revision: 12285
Modified:
search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java
search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/RecordingIndexField.java
search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/TrackWrapper.java
search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/RecordingXmlWriter.java
search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindRecordingTest.java
Log:
Now searching by recording finds recording where the recording itself or an associated track match on name, this seems to make more sense then seperate fields.
Modified: search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java
===================================================================
--- search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java 2009-11-03 12:52:48 UTC (rev 12284)
+++ search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java 2009-11-03 13:29:32 UTC (rev 12285)
@@ -84,9 +84,11 @@
"order by re.id,acn.position ");
addPreparedStatement("TRACKS",
- "SELECT t.recording, t.position,tl.trackcount, " +
+ "SELECT tn.name as trackname, t.recording, t.position,tl.trackcount, " +
"r.gid as releaseid,rn.name as releasename,rgt.name as type " +
"FROM track t " +
+ "INNER JOIN track_name tn " +
+ "ON t.name=tn.id " +
"INNER JOIN tracklist tl " +
"ON t.tracklist=tl.id " +
"INNER JOIN medium m " +
@@ -181,6 +183,7 @@
tw.setReleaseName(rs.getString("releasename"));
tw.setTrackCount(rs.getInt("trackcount"));
tw.setTrackPosition(rs.getInt("position"));
+ tw.setTrackName(rs.getString("trackname"));
list.add(tw);
}
return tracks;
@@ -228,7 +231,8 @@
MbDocument doc = new MbDocument();
doc.addField(RecordingIndexField.RECORDING_ID, rs.getString("trackid"));
- doc.addNonEmptyField(RecordingIndexField.RECORDING, rs.getString("trackname"));
+ doc.addNonEmptyField(RecordingIndexField.RECORDING, rs.getString("trackname")); //Search
+ doc.addNonEmptyField(RecordingIndexField.RECORDING_OUTPUT, rs.getString("trackname")); //Output
doc.addNumericField(RecordingIndexField.DURATION, rs.getInt("duration"));
doc.addNumericField(RecordingIndexField.QUANTIZED_DURATION, rs.getInt("duration") / QUANTIZED_DURATION);
@@ -240,6 +244,10 @@
doc.addFieldOrHyphen(RecordingIndexField.RELEASE_TYPE, track.getReleaseGroupType());
doc.addField(RecordingIndexField.RELEASE_ID, track.getReleaseId());
doc.addField(RecordingIndexField.RELEASE, track.getReleaseName());
+ //Added to TRACK_OUTPUT for outputting xml, and to recording for searching
+ doc.addField(RecordingIndexField.TRACK_OUTPUT, track.getTrackName());
+ doc.addField(RecordingIndexField.RECORDING, track.getTrackName());
+
}
}
Modified: search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/RecordingIndexField.java
===================================================================
--- search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/RecordingIndexField.java 2009-11-03 12:52:48 UTC (rev 12284)
+++ search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/RecordingIndexField.java 2009-11-03 13:29:32 UTC (rev 12285)
@@ -24,7 +24,10 @@
QUANTIZED_DURATION ("qdur", Field.Store.YES, Field.Index.NOT_ANALYZED, new KeywordAnalyzer()),
TRACKNUM ("tnum", Field.Store.YES, Field.Index.NOT_ANALYZED, new KeywordAnalyzer()),
RELEASE_TYPE ("type", Field.Store.YES, Field.Index.NOT_ANALYZED, new KeywordAnalyzer()),
- ARTIST_COMMENT ("comment", Field.Store.YES, Field.Index.ANALYZED),;
+ ARTIST_COMMENT ("comment", Field.Store.YES, Field.Index.ANALYZED),
+ TRACK_OUTPUT ("trackoutoutput", Field.Store.YES, Field.Index.NO),
+ RECORDING_OUTPUT ("recordinungoutput", Field.Store.YES, Field.Index.NO),
+ ;
private String name;
private Field.Store store;
Modified: search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/TrackWrapper.java
===================================================================
--- search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/TrackWrapper.java 2009-11-03 12:52:48 UTC (rev 12284)
+++ search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/TrackWrapper.java 2009-11-03 13:29:32 UTC (rev 12285)
@@ -11,6 +11,7 @@
private String releaseId;
private String releaseName;
private String releaseGroupType;
+ private String trackName;
public int getTrackPosition() {
@@ -52,4 +53,12 @@
public void setReleaseGroupType(String releaseGroupType) {
this.releaseGroupType = releaseGroupType;
}
+
+ public String getTrackName() {
+ return trackName;
+ }
+
+ public void setTrackName(String trackName) {
+ this.trackName = trackName;
+ }
}
\ No newline at end of file
Modified: search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java
===================================================================
--- search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java 2009-11-03 12:52:48 UTC (rev 12284)
+++ search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java 2009-11-03 13:29:32 UTC (rev 12285)
@@ -79,10 +79,11 @@
stmt.addBatch("INSERT INTO tracklist(id, trackcount) VALUES (1,2)");
stmt.addBatch("INSERT INTO track(id, recording, tracklist, position, name, artist_credit,length, editpending) "
- + "VALUES (1, 1, 1, 4, 1, 1,33100, 1)");
+ + "VALUES (1, 1, 1, 4, 2, 1,33100, 1)");
stmt.addBatch("INSERT INTO recording(id, gid, name, artist_credit, length, comment, editpending)"
+ "VALUES (1, '2f250ed2-6285-40f1-aa2a-14f1c05e9765', 1,1,33000, null,1)");
stmt.addBatch("INSERT INTO track_name(id, name, refcount)VALUES (1, 'Do It Clean', 1) ");
+ stmt.addBatch("INSERT INTO track_name(id, name, refcount)VALUES (2, 'Do It Cleans', 1) ");
stmt.executeBatch();
stmt.close();
conn.close();
@@ -148,7 +149,7 @@
*
* @throws Exception
*/
- public void testIndexTrack() throws Exception {
+ public void testIndexRecording() throws Exception {
addTrackOne();
RAMDirectory ramDir = new RAMDirectory();
@@ -158,6 +159,9 @@
assertEquals(1, ir.numDocs());
{
Document doc = ir.document(0);
+ assertEquals(2, doc.getFields(RecordingIndexField.RECORDING.getName()).length);
+ assertEquals(1, doc.getFields(RecordingIndexField.RECORDING_OUTPUT.getName()).length);
+ assertEquals(1, doc.getFields(RecordingIndexField.TRACK_OUTPUT.getName()).length);
assertEquals(1, doc.getFields(RecordingIndexField.RECORDING_ID.getName()).length);
assertEquals("2f250ed2-6285-40f1-aa2a-14f1c05e9765", doc.getField(RecordingIndexField.RECORDING_ID.getName()).stringValue());
assertEquals("Do It Clean", doc.getField(RecordingIndexField.RECORDING.getName()).stringValue());
@@ -189,7 +193,7 @@
assertEquals(1, ir.numDocs());
{
Document doc = ir.document(0);
- assertEquals(1, doc.getFields(RecordingIndexField.RECORDING.getName()).length);
+ assertEquals(1, doc.getFields(RecordingIndexField.RECORDING_OUTPUT.getName()).length);
assertEquals(1, doc.getFields(RecordingIndexField.RELEASE_TYPE.getName()).length);
assertEquals("Non-Album Tracks", doc.getField(RecordingIndexField.RELEASE_TYPE.getName()).stringValue());
@@ -212,7 +216,7 @@
assertEquals(1, ir.numDocs());
{
Document doc = ir.document(0);
- assertEquals(1, doc.getFields(RecordingIndexField.RECORDING.getName()).length);
+ assertEquals(1, doc.getFields(RecordingIndexField.RECORDING_OUTPUT.getName()).length);
assertEquals(1, doc.getFields(RecordingIndexField.ARTIST_SORTNAME.getName()).length);
assertEquals("Echo and The Bunnymen", doc.getField(RecordingIndexField.ARTIST_SORTNAME.getName()).stringValue());
@@ -235,7 +239,7 @@
assertEquals(1, ir.numDocs());
{
Document doc = ir.document(0);
- assertEquals(1, doc.getFields(RecordingIndexField.RECORDING.getName()).length);
+ assertEquals(1, doc.getFields(RecordingIndexField.RECORDING_OUTPUT.getName()).length);
assertEquals(1, doc.getFields(RecordingIndexField.RELEASE_TYPE.getName()).length);
assertEquals("-", doc.getField(RecordingIndexField.RELEASE_TYPE.getName()).stringValue());
}
@@ -257,7 +261,7 @@
assertEquals(1, ir.numDocs());
{
Document doc = ir.document(0);
- assertEquals(1, doc.getFields(RecordingIndexField.RECORDING.getName()).length);
+ assertEquals(1, doc.getFields(RecordingIndexField.RECORDING_OUTPUT.getName()).length);
assertEquals(1, doc.getFields(RecordingIndexField.RELEASE_TYPE.getName()).length);
assertEquals(1, doc.getFields(RecordingIndexField.ARTIST_COMMENT.getName()).length);
assertEquals("-", doc.getField(RecordingIndexField.ARTIST_COMMENT.getName()).stringValue());
@@ -280,7 +284,7 @@
assertEquals(1, ir.numDocs());
{
Document doc = ir.document(0);
- assertEquals(1, doc.getFields(RecordingIndexField.RECORDING.getName()).length);
+ assertEquals(1, doc.getFields(RecordingIndexField.RECORDING_OUTPUT.getName()).length);
assertEquals(1, doc.getFields(RecordingIndexField.ARTIST_COMMENT.getName()).length);
assertEquals("a comment", doc.getField(RecordingIndexField.ARTIST_COMMENT.getName()).stringValue());
@@ -288,6 +292,33 @@
ir.close();
}
+ /**
+ *
+ * @throws Exception
+ */
+
+ public void testTrackName() throws Exception {
+
+ addTrackOne();
+ RAMDirectory ramDir = new RAMDirectory();
+ createIndex(ramDir);
+
+ IndexReader ir = IndexReader.open(ramDir, true);
+ assertEquals(1, ir.numDocs());
+ {
+ Document doc = ir.document(0);
+ assertEquals(1, doc.getFields(RecordingIndexField.RECORDING_OUTPUT.getName()).length);
+ assertEquals("Do It Clean", doc.getField(RecordingIndexField.RECORDING_OUTPUT.getName()).stringValue());
+ assertEquals(1, doc.getFields(RecordingIndexField.RELEASE_TYPE.getName()).length);
+ assertEquals(1, doc.getFields(RecordingIndexField.TRACK_OUTPUT.getName()).length);
+ assertEquals("Do It Cleans", doc.getField(RecordingIndexField.TRACK_OUTPUT.getName()).stringValue());
+
+
+ }
+ ir.close();
+ }
+
+
public void testToAvoidWarnings()
{
assertEquals(1,1);
Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/RecordingXmlWriter.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/RecordingXmlWriter.java 2009-11-03 12:52:48 UTC (rev 12284)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/RecordingXmlWriter.java 2009-11-03 13:29:32 UTC (rev 12285)
@@ -57,7 +57,7 @@
recording.getOtherAttributes().put(getScore(), String.valueOf((int) (result.score * 100)));
- String name = doc.get(RecordingIndexField.RECORDING);
+ String name = doc.get(RecordingIndexField.RECORDING_OUTPUT);
if (name != null) {
recording.setTitle(name);
@@ -98,6 +98,7 @@
String[] releaseTypes = doc.getValues(RecordingIndexField.RELEASE_TYPE);
String[] trackNos = doc.getValues(RecordingIndexField.TRACKNUM);
String[] numTracks = doc.getValues(RecordingIndexField.NUM_TRACKS);
+ String[] trackName = doc.getValues(RecordingIndexField.TRACK_OUTPUT);
if(releaseNames.length>0)
{
@@ -114,9 +115,12 @@
release.getReleaseGroup().getType().add(releaseTypes[i].toLowerCase(Locale.US));
}
+ Track track = of.createTrack();
+ track.setTitle(trackName[i]);
TrackList releaseTrackList = of.createTrackList();
releaseTrackList.setOffset(BigInteger.valueOf(NumericUtils.prefixCodedToInt(trackNos[i]) - 1));
releaseTrackList.setCount(BigInteger.valueOf(NumericUtils.prefixCodedToInt(numTracks[i])));
+ releaseTrackList.getTrack().add(track);
Medium medium = of.createMedium();
medium.setTrackList(releaseTrackList);
Modified: search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindRecordingTest.java
===================================================================
--- search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindRecordingTest.java 2009-11-03 12:52:48 UTC (rev 12284)
+++ search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindRecordingTest.java 2009-11-03 13:29:32 UTC (rev 12285)
@@ -14,7 +14,6 @@
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.util.EnumMap;
/**
* Assumes an index has been built stored and in the data folder, I've picked a fairly obscure bside so hopefully
@@ -42,6 +41,7 @@
MbDocument doc = new MbDocument();
doc.addField(RecordingIndexField.RECORDING_ID, "7ca7782b-a602-448b-b108-bb881a7be2d6");
doc.addField(RecordingIndexField.RECORDING, "Gravitational Lenz");
+ doc.addField(RecordingIndexField.RECORDING_OUTPUT, "Gravitational Lenz");
doc.addField(RecordingIndexField.RELEASE_ID, "1d9e8ed6-3893-4d3b-aa7d-6cd79609e386");
doc.addField(RecordingIndexField.RELEASE, "Our Glorious 5 Year Plan");
doc.addField(RecordingIndexField.ARTIST_ID, "4302e264-1cf0-4d1f-aca7-2a6f89e34b36");
@@ -55,6 +55,8 @@
doc.addNumericField(RecordingIndexField.QUANTIZED_DURATION, (234000 / 2000));
doc.addNumericField(RecordingIndexField.NUM_TRACKS,10);
doc.addNumericField(RecordingIndexField.TRACKNUM, 5);
+ doc.addField(RecordingIndexField.TRACK_OUTPUT, "Gravitational Lens");
+ doc.addField(RecordingIndexField.RECORDING, "Gravitational Lens");
doc.addField(RecordingIndexField.RELEASE_TYPE, ReleaseGroupType.ALBUM.getName());
writer.addDocument(doc.getLuceneDocument());
writer.close();
@@ -92,6 +94,7 @@
assertEquals(5, NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.TRACKNUM)));
assertEquals("Our Glorious 5 Year Plan", doc.get(RecordingIndexField.RELEASE));
assertEquals(234000, NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.DURATION)));
+ assertEquals("Gravitational Lens", doc.get(RecordingIndexField.TRACK_OUTPUT));
}
public void testFindRecordingByV1TrackId() throws Exception {
@@ -100,14 +103,6 @@
Result result = res.results.get(0);
MbDocument doc = result.doc;
assertEquals("7ca7782b-a602-448b-b108-bb881a7be2d6", doc.get(RecordingIndexField.RECORDING_ID));
- assertEquals("Gravitational Lenz", doc.get(RecordingIndexField.RECORDING));
- assertEquals("4302e264-1cf0-4d1f-aca7-2a6f89e34b36", doc.get(RecordingIndexField.ARTIST_ID));
- assertEquals("Farming Incident", doc.get(RecordingIndexField.ARTIST));
- assertEquals("1d9e8ed6-3893-4d3b-aa7d-6cd79609e386", doc.get(RecordingIndexField.RELEASE_ID));
- assertEquals("Our Glorious 5 Year Plan", doc.get(RecordingIndexField.RELEASE));
- assertEquals(5, NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.TRACKNUM)));
- assertEquals("Our Glorious 5 Year Plan", doc.get(RecordingIndexField.RELEASE));
- assertEquals(234000, NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.DURATION)));
}
public void testFindRecordingById() throws Exception {
@@ -116,14 +111,6 @@
Result result = res.results.get(0);
MbDocument doc = result.doc;
assertEquals("7ca7782b-a602-448b-b108-bb881a7be2d6", doc.get(RecordingIndexField.RECORDING_ID));
- assertEquals("Gravitational Lenz", doc.get(RecordingIndexField.RECORDING));
- assertEquals("4302e264-1cf0-4d1f-aca7-2a6f89e34b36", doc.get(RecordingIndexField.ARTIST_ID));
- assertEquals("Farming Incident", doc.get(RecordingIndexField.ARTIST));
- assertEquals("1d9e8ed6-3893-4d3b-aa7d-6cd79609e386", doc.get(RecordingIndexField.RELEASE_ID));
- assertEquals("Our Glorious 5 Year Plan", doc.get(RecordingIndexField.RELEASE));
- assertEquals(5, NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.TRACKNUM)));
- assertEquals("Our Glorious 5 Year Plan", doc.get(RecordingIndexField.RELEASE));
- assertEquals(234000, NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.DURATION)));
}
public void testFindRecordingByReleaseId() throws Exception {
@@ -132,14 +119,6 @@
Result result = res.results.get(0);
MbDocument doc = result.doc;
assertEquals("7ca7782b-a602-448b-b108-bb881a7be2d6", doc.get(RecordingIndexField.RECORDING_ID));
- assertEquals("Gravitational Lenz", doc.get(RecordingIndexField.RECORDING));
- assertEquals("4302e264-1cf0-4d1f-aca7-2a6f89e34b36", doc.get(RecordingIndexField.ARTIST_ID));
- assertEquals("Farming Incident", doc.get(RecordingIndexField.ARTIST));
- assertEquals("1d9e8ed6-3893-4d3b-aa7d-6cd79609e386", doc.get(RecordingIndexField.RELEASE_ID));
- assertEquals("Our Glorious 5 Year Plan", doc.get(RecordingIndexField.RELEASE));
- assertEquals(5, NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.TRACKNUM)));
- assertEquals("Our Glorious 5 Year Plan", doc.get(RecordingIndexField.RELEASE));
- assertEquals(234000, NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.DURATION)));
}
public void testFindRecordingByArtistId() throws Exception {
@@ -148,14 +127,6 @@
Result result = res.results.get(0);
MbDocument doc = result.doc;
assertEquals("7ca7782b-a602-448b-b108-bb881a7be2d6", doc.get(RecordingIndexField.RECORDING_ID));
- assertEquals("Gravitational Lenz", doc.get(RecordingIndexField.RECORDING));
- assertEquals("4302e264-1cf0-4d1f-aca7-2a6f89e34b36", doc.get(RecordingIndexField.ARTIST_ID));
- assertEquals("Farming Incident", doc.get(RecordingIndexField.ARTIST));
- assertEquals("1d9e8ed6-3893-4d3b-aa7d-6cd79609e386", doc.get(RecordingIndexField.RELEASE_ID));
- assertEquals("Our Glorious 5 Year Plan", doc.get(RecordingIndexField.RELEASE));
- assertEquals(5,NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.TRACKNUM)));
- assertEquals("Our Glorious 5 Year Plan", doc.get(RecordingIndexField.RELEASE));
- assertEquals(234000, NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.DURATION)));
}
public void testFindRecordingByArtistName() throws Exception {
@@ -164,30 +135,23 @@
Result result = res.results.get(0);
MbDocument doc = result.doc;
assertEquals("7ca7782b-a602-448b-b108-bb881a7be2d6", doc.get(RecordingIndexField.RECORDING_ID));
- assertEquals("Gravitational Lenz", doc.get(RecordingIndexField.RECORDING));
- assertEquals("4302e264-1cf0-4d1f-aca7-2a6f89e34b36", doc.get(RecordingIndexField.ARTIST_ID));
- assertEquals("Farming Incident", doc.get(RecordingIndexField.ARTIST));
- assertEquals("1d9e8ed6-3893-4d3b-aa7d-6cd79609e386", doc.get(RecordingIndexField.RELEASE_ID));
- assertEquals("Our Glorious 5 Year Plan", doc.get(RecordingIndexField.RELEASE));
- assertEquals(5,NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.TRACKNUM)));
- assertEquals("Our Glorious 5 Year Plan", doc.get(RecordingIndexField.RELEASE));
- assertEquals(234000, NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.DURATION)));
}
+ /** Searches recording field, whihc should include names of associated tracks) */
+ public void testFindRecordingByTrackName() throws Exception {
+ Results res = ss.searchLucene("recording:\"Gravitational Lens\"", 0, 10);
+ assertEquals(1, res.totalHits);
+ Result result = res.results.get(0);
+ MbDocument doc = result.doc;
+ assertEquals("7ca7782b-a602-448b-b108-bb881a7be2d6", doc.get(RecordingIndexField.RECORDING_ID));
+ }
+
public void testFindRecordingByArtistSortname() throws Exception {
Results res = ss.searchLucene("sortname:\"Incident, Farming\"", 0, 10);
assertEquals(1, res.totalHits);
Result result = res.results.get(0);
MbDocument doc = result.doc;
assertEquals("7ca7782b-a602-448b-b108-bb881a7be2d6", doc.get(RecordingIndexField.RECORDING_ID));
- assertEquals("Gravitational Lenz", doc.get(RecordingIndexField.RECORDING));
- assertEquals("4302e264-1cf0-4d1f-aca7-2a6f89e34b36", doc.get(RecordingIndexField.ARTIST_ID));
- assertEquals("Farming Incident", doc.get(RecordingIndexField.ARTIST));
- assertEquals("1d9e8ed6-3893-4d3b-aa7d-6cd79609e386", doc.get(RecordingIndexField.RELEASE_ID));
- assertEquals("Our Glorious 5 Year Plan", doc.get(RecordingIndexField.RELEASE));
- assertEquals(5,NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.TRACKNUM)));
- assertEquals("Our Glorious 5 Year Plan", doc.get(RecordingIndexField.RELEASE));
- assertEquals(234000, NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.DURATION)));
}
public void testFindRecordingByReleaseType() throws Exception {
@@ -196,14 +160,6 @@
Result result = res.results.get(0);
MbDocument doc = result.doc;
assertEquals("7ca7782b-a602-448b-b108-bb881a7be2d6", doc.get(RecordingIndexField.RECORDING_ID));
- assertEquals("Gravitational Lenz", doc.get(RecordingIndexField.RECORDING));
- assertEquals("4302e264-1cf0-4d1f-aca7-2a6f89e34b36", doc.get(RecordingIndexField.ARTIST_ID));
- assertEquals("Farming Incident", doc.get(RecordingIndexField.ARTIST));
- assertEquals("1d9e8ed6-3893-4d3b-aa7d-6cd79609e386", doc.get(RecordingIndexField.RELEASE_ID));
- assertEquals("Our Glorious 5 Year Plan", doc.get(RecordingIndexField.RELEASE));
- assertEquals(5, NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.TRACKNUM)));
- assertEquals("Our Glorious 5 Year Plan", doc.get(RecordingIndexField.RELEASE));
- assertEquals(234000, NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.DURATION)));
}
public void testFindRecordingByReleaseTypeNumeric() throws Exception {
@@ -212,14 +168,6 @@
Result result = res.results.get(0);
MbDocument doc = result.doc;
assertEquals("7ca7782b-a602-448b-b108-bb881a7be2d6", doc.get(RecordingIndexField.RECORDING_ID));
- assertEquals("Gravitational Lenz", doc.get(RecordingIndexField.RECORDING));
- assertEquals("4302e264-1cf0-4d1f-aca7-2a6f89e34b36", doc.get(RecordingIndexField.ARTIST_ID));
- assertEquals("Farming Incident", doc.get(RecordingIndexField.ARTIST));
- assertEquals("1d9e8ed6-3893-4d3b-aa7d-6cd79609e386", doc.get(RecordingIndexField.RELEASE_ID));
- assertEquals("Our Glorious 5 Year Plan", doc.get(RecordingIndexField.RELEASE));
- assertEquals(5, NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.TRACKNUM)));
- assertEquals("Our Glorious 5 Year Plan", doc.get(RecordingIndexField.RELEASE));
- assertEquals(234000, NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.DURATION)));
}
public void testFindRecordingByNumberOfTracksOnRelease() throws Exception {
Results res = ss.searchLucene("tracks:10", 0, 10);
@@ -227,14 +175,6 @@
Result result = res.results.get(0);
MbDocument doc = result.doc;
assertEquals("7ca7782b-a602-448b-b108-bb881a7be2d6", doc.get(RecordingIndexField.RECORDING_ID));
- assertEquals("Gravitational Lenz", doc.get(RecordingIndexField.RECORDING));
- assertEquals("4302e264-1cf0-4d1f-aca7-2a6f89e34b36", doc.get(RecordingIndexField.ARTIST_ID));
- assertEquals("Farming Incident", doc.get(RecordingIndexField.ARTIST));
- assertEquals("1d9e8ed6-3893-4d3b-aa7d-6cd79609e386", doc.get(RecordingIndexField.RELEASE_ID));
- assertEquals("Our Glorious 5 Year Plan", doc.get(RecordingIndexField.RELEASE));
- assertEquals(5, NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.TRACKNUM)));
- assertEquals("Our Glorious 5 Year Plan", doc.get(RecordingIndexField.RELEASE));
- assertEquals(234000, NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.DURATION)));
}
public void testFindRecordingByDuration() throws Exception {
@@ -243,13 +183,6 @@
Result result = res.results.get(0);
MbDocument doc = result.doc;
assertEquals("7ca7782b-a602-448b-b108-bb881a7be2d6", doc.get(RecordingIndexField.RECORDING_ID));
- assertEquals("Gravitational Lenz", doc.get(RecordingIndexField.RECORDING));
- assertEquals("4302e264-1cf0-4d1f-aca7-2a6f89e34b36", doc.get(RecordingIndexField.ARTIST_ID));
- assertEquals("Farming Incident", doc.get(RecordingIndexField.ARTIST));
- assertEquals("1d9e8ed6-3893-4d3b-aa7d-6cd79609e386", doc.get(RecordingIndexField.RELEASE_ID));
- assertEquals(5, NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.TRACKNUM)));
- assertEquals("Our Glorious 5 Year Plan", doc.get(RecordingIndexField.RELEASE));
- assertEquals(234000, NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.DURATION)));
}
@@ -370,6 +303,7 @@
assertTrue(output.contains("count=\"10\""));
assertTrue(output.contains("offset=\"0\""));
assertTrue(output.contains("count=\"1\""));
+ assertTrue(output.contains("<title>Gravitational Lens</title>"));
}
}
_______________________________________________
MusicBrainz-commits mailing list
MusicBrainz-commits@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-commits
