[mb-commits] r13724 - in search_server/trunk: index/src/main/java/org/musicbrainz/search/index index/src/test/java/org/musicbrainz/search/index servlet/src/main/java/org/musicbrainz/search/servlet/mmd2 servlet/src/main/resources servlet/src/test/java/org/musicbrainz/search/servlet
[email protected] Thu, 03 Oct 2013 19:34:34 +0000
| Newsgroups | gmane.comp.audio.musicbrainz.cvs |
|---|---|
| Message-ID | <E1VRofS-0006QX-Gv@wiley> |
Author: ijabz
Date: 2013-10-03 19:34:34 +0000 (Thu, 03 Oct 2013)
New Revision: 13724
Modified:
search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java
search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndexField.java
search_server/trunk/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java
search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ReleaseGroupWriter.java
search_server/trunk/servlet/src/main/resources/oxml.xml
search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindRecordingTest.java
Log:
SEARCH-323:add video to recording xml/json
Modified: search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java
===================================================================
--- search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java 2013-10-03 19:08:13 UTC (rev 13723)
+++ search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java 2013-10-03 19:34:34 UTC (rev 13724)
@@ -810,8 +810,7 @@
boolean video = rs.getBoolean("video");
if(video) {
doc.addField(RecordingIndexField.VIDEO, Boolean.toString(video));
- //TODO waiting on schema
- //recording.setVideo("true);
+ recording.setVideo("true");
}
if (isrcs.containsKey(id)) {
Modified: search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndexField.java
===================================================================
--- search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndexField.java 2013-10-03 19:08:13 UTC (rev 13723)
+++ search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndexField.java 2013-10-03 19:34:34 UTC (rev 13724)
@@ -45,7 +45,7 @@
TAG ("tag", MusicBrainzFieldTypes.TEXT_NOT_STORED_ANALYZED, new MusicbrainzWithPosGapAnalyzer()),
TRACKNUM ("tnum", MusicBrainzFieldTypes.TEXT_STORED_NOT_ANALYZED_NO_NORMS, new KeywordAnalyzer()),
TRACK_ID ("tid", MusicBrainzFieldTypes.TEXT_NOT_STORED_NOT_ANALYZED_NO_NORMS, new KeywordAnalyzer()),
- VIDEO ("ended", MusicBrainzFieldTypes.TEXT_NOT_STORED_ANALYZED_NO_NORMS, new CaseInsensitiveKeywordAnalyzer()),
+ VIDEO ("video", MusicBrainzFieldTypes.TEXT_NOT_STORED_ANALYZED_NO_NORMS, new CaseInsensitiveKeywordAnalyzer()),
RECORDING_STORE ("recordingstore", MusicBrainzFieldTypes.TEXT_STORED_NOT_INDEXED),
Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java 2013-10-03 19:08:13 UTC (rev 13723)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java 2013-10-03 19:34:34 UTC (rev 13724)
@@ -899,6 +899,7 @@
ArtistCredit ac = recording.getArtistCredit();
assertEquals("Echo & Bunneymen", ac.getNameCredit().get(0).getArtist().getAliasList().getAlias().get(0).getContent());
assertEquals("Bunneymen & Echo", ac.getNameCredit().get(0).getArtist().getAliasList().getAlias().get(0).getSortName());
+ assertEquals("true",recording.getVideo());
ReleaseList releaseList = recording.getReleaseList();
Release release = releaseList.getRelease().get(0);
@@ -960,6 +961,8 @@
assertEquals("A4", track.getNumber());
assertEquals("c3b8dbc9-c1ff-4743-9015-8d762819134e",track.getId());
+
+
}
ir.close();
}
Modified: search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ReleaseGroupWriter.java
===================================================================
--- search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ReleaseGroupWriter.java 2013-10-03 19:08:13 UTC (rev 13723)
+++ search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ReleaseGroupWriter.java 2013-10-03 19:34:34 UTC (rev 13724)
@@ -166,10 +166,7 @@
{
for (Alias alias : nc.getArtist().getAliasList().getAlias()) {
//On Xml output as primary, but in json they have changed to true/false
- if (alias.getPrimary() == null) {
- alias.setPrimary("false");
- }
- else {
+ if (alias.getPrimary() != null) {
alias.setPrimary("true");
}
}
Modified: search_server/trunk/servlet/src/main/resources/oxml.xml
===================================================================
--- search_server/trunk/servlet/src/main/resources/oxml.xml 2013-10-03 19:08:13 UTC (rev 13723)
+++ search_server/trunk/servlet/src/main/resources/oxml.xml 2013-10-03 19:34:34 UTC (rev 13724)
@@ -98,6 +98,9 @@
<java-type name="Recording">
<java-attributes>
<xml-element java-attribute="artistCredit" xml-path="."/>
+ <xml-element java-attribute="video" nillable="true">
+ <xml-java-type-adapter value="org.musicbrainz.search.servlet.moxy.BooleanStringAdapter"/>
+ </xml-element>
</java-attributes>
</java-type>
<java-type name="IpiList">
Modified: search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindRecordingTest.java
===================================================================
--- search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindRecordingTest.java 2013-10-03 19:08:13 UTC (rev 13723)
+++ search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindRecordingTest.java 2013-10-03 19:34:34 UTC (rev 13724)
@@ -60,8 +60,9 @@
doc.addField(RecordingIndexField.RELEASE_ID, "1d9e8ed6-3893-4d3b-aa7d-6cd79609e386");
doc.addField(RecordingIndexField.RELEASE, "Our Glorious 5 Year Plan");
+ doc.addField(RecordingIndexField.VIDEO,"true");
+ recording.setVideo("true");
-
doc.addField(RecordingIndexField.FORMAT, "Vinyl");
ReleaseList releaseList = of.createReleaseList();
Release release = of.createRelease();
@@ -269,6 +270,13 @@
}
@Test
+ public void testFindRecordingByVideo() throws Exception {
+ Results res = ss.search("video:\"true\"", 0, 10);
+ assertEquals(1, res.getTotalHits());
+ assertEquals("7ca7782b-a602-448b-b108-bb881a7be2d6", getRecordingId(res.results.get(0).getDoc()));
+ }
+
+ @Test
public void testFindRecordingByDemo() throws Exception {
Results res = ss.search("comment:\"demo\"", 0, 10);
assertEquals(1, res.getTotalHits());
@@ -538,7 +546,7 @@
assertTrue(output.contains("<name>United Kingdom</name>"));
assertTrue(output.contains("<sort-name>Kingdom of United</sort-name>"));
assertTrue(output.contains("<iso-3166-1-code-list><iso-3166-1-code>UK</iso-3166-1-code></iso-3166-1-code-list>"));
-
+ assertTrue(output.contains("<video>true</video>"));
}
@@ -577,6 +585,7 @@
assertTrue(output.contains("\"name\":\"United Kingdom\","));
assertTrue(output.contains("\"sort-name\":\"Kingdom of United\","));
assertTrue(output.contains("\"iso-3166-1-code-list\":{\"iso-3166-1-code\":[\"UK\"]}"));
+ assertTrue(output.contains("\"video\":\"true\""));
}
@Test
@@ -617,6 +626,7 @@
assertTrue(output.contains("\"name\":\"United Kingdom\","));
assertTrue(output.contains("\"sort-name\":\"Kingdom of United\","));
assertTrue(output.contains("\"iso-3166-1-codes\":[\"UK\"]"));
+ assertTrue(output.contains("\"video\":true"));
}
@Test