Author: ijabz
Date: 2009-10-30 22:13:58 +0000 (Fri, 30 Oct 2009)
New Revision: 12270
Added:
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/test/java/org/musicbrainz/search/index/RecordingIndexTest.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/RecordingQueryParser.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/RecordingSearch.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
Removed:
search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/TrackIndex.java
search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/TrackIndexField.java
search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/TrackIndexTest.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/TrackQueryParser.java
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/mmd2/TrackXmlWriter.java
search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindTrackTest.java
Modified:
search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/IndexBuilder.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ReleaseGroupQueryParser.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ResourceType.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServerFactory.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/TrackHtmlWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/TrackMmd1XmlWriter.java
search_server/branches/ngs/servlet/src/main/resources/track.html.vtl
Log:
Renamed from track to recording whilst maintaining support for searching type=track for V1
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-30 20:37:52 UTC (rev 12269)
+++ search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/IndexBuilder.java 2009-10-30 22:13:58 UTC (rev 12270)
@@ -33,9 +33,6 @@
import java.sql.*;
import java.io.*;
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.PerFieldAnalyzerWrapper;
-import org.musicbrainz.search.analysis.StandardUnaccentAnalyzer;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.store.FSDirectory;
@@ -132,7 +129,7 @@
new ArtistIndex(mainDbConn),
new ReleaseIndex(mainDbConn),
new ReleaseGroupIndex(mainDbConn),
- new TrackIndex(mainDbConn),
+ new RecordingIndex(mainDbConn),
new LabelIndex(mainDbConn),
new WorkIndex(mainDbConn),
new AnnotationIndex(mainDbConn),
@@ -319,8 +316,8 @@
public String getFreeDBDump() { return freeDBDump; }
// Selection of indexes to build
- @Option(name="--indexes", usage="A comma-separated list of indexes to build (artist,releasegroup,release,track,label,work,annotation,cdstub)")
- private String indexes = "artist,label,release,track,releasegroup,work,annotation,cdstub";
+ @Option(name="--indexes", usage="A comma-separated list of indexes to build (artist,releasegroup,release,recording,label,work,annotation,cdstub)")
+ private String indexes = "artist,label,release,recording,releasegroup,work,annotation,cdstub";
public ArrayList<String> selectedIndexes() { return new ArrayList<String>(Arrays.asList(indexes.split(","))); }
public boolean buildIndex(String indexName) { return selectedIndexes().contains(indexName); }
Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ReleaseGroupQueryParser.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ReleaseGroupQueryParser.java 2009-10-30 20:37:52 UTC (rev 12269)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ReleaseGroupQueryParser.java 2009-10-30 22:13:58 UTC (rev 12270)
@@ -5,9 +5,6 @@
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.search.TermRangeQuery;
-import org.apache.lucene.util.NumericUtils;
-import org.musicbrainz.search.index.TrackIndexField;
import org.musicbrainz.search.index.ReleaseGroupType;
import org.musicbrainz.search.index.ReleaseGroupIndexField;
Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ResourceType.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ResourceType.java 2009-10-30 20:37:52 UTC (rev 12269)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ResourceType.java 2009-10-30 22:13:58 UTC (rev 12270)
@@ -9,7 +9,7 @@
LABEL("label"),
RELEASE("release"),
RELEASE_GROUP("release-group"),
- TRACK("track"),
+ RECORDING("recording"),
CDSTUB("cdstub"),
FREEDB("freedb"),
ANNOTATION("annotation"),
Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServerFactory.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServerFactory.java 2009-10-30 20:37:52 UTC (rev 12269)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServerFactory.java 2009-10-30 22:13:58 UTC (rev 12270)
@@ -12,7 +12,7 @@
search.put(ResourceType.LABEL, new LabelSearch(indexDir));
search.put(ResourceType.RELEASE, new ReleaseSearch(indexDir));
search.put(ResourceType.RELEASE_GROUP, new ReleaseGroupSearch(indexDir));
- search.put(ResourceType.TRACK, new TrackSearch(indexDir));
+ search.put(ResourceType.RECORDING, new RecordingSearch(indexDir));
search.put(ResourceType.WORK, new WorkSearch(indexDir));
search.put(ResourceType.ANNOTATION, new AnnotationSearch(indexDir));
search.put(ResourceType.FREEDB, new FreeDBSearch(indexDir));
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-30 20:37:52 UTC (rev 12269)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServerServlet.java 2009-10-30 22:13:58 UTC (rev 12270)
@@ -135,8 +135,13 @@
return;
}
+ //V1 Compatability
+ if(type.equals("track"))
+ {
+ type=ResourceType.RECORDING.getName();
+ }
//TEMPORARY FIX mb_server uses release_group instead of release-group
- if (type.equals("release_group"))
+ else if (type.equals("release_group"))
{
type=ResourceType.RELEASE_GROUP.getName();
}
@@ -154,10 +159,10 @@
- //Default to html if not provided
+ //Default to xml if not provided
String responseFormat = request.getParameter(RequestParameter.FORMAT.getName());
if (responseFormat == null || responseFormat.isEmpty()) {
- responseFormat = RESPONSE_HTML;
+ responseFormat = RESPONSE_XML;
}
String responseVersion = request.getParameter(RequestParameter.VERSION.getName());
@@ -207,7 +212,7 @@
}
break;
- case TRACK: {
+ case RECORDING: {
String tport = request.getParameter(RequestParameter.TAGGER_PORT.getName());
String rel = request.getParameter(RequestParameter.RELATIONSHIPS.getName());
String oldLink = request.getParameter(RequestParameter.OLD_STYLE_LINK.getName());
Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/TrackHtmlWriter.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/TrackHtmlWriter.java 2009-10-30 20:37:52 UTC (rev 12269)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/TrackHtmlWriter.java 2009-10-30 22:13:58 UTC (rev 12270)
@@ -35,7 +35,7 @@
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.FieldMethodizer;
-import org.musicbrainz.search.index.TrackIndexField;
+import org.musicbrainz.search.index.RecordingIndexField;
public class TrackHtmlWriter extends HtmlWriter {
@@ -57,10 +57,10 @@
context.put("Utils",Utils.class);
context.put("Math", Math.class);
// Make IndexField enum available in template context
- context.put("TrackIndexField", new FieldMethodizer( "org.musicbrainz.search.index.TrackIndexField" ));
+ context.put("RecordingIndexField", new FieldMethodizer( "org.musicbrainz.search.index.RecordingIndexField" ));
if(results.results.size()==1) {
- context.put("redirect",results.results.get(0).getDoc().get(TrackIndexField.TRACK_ID));
+ context.put("redirect",results.results.get(0).getDoc().get(RecordingIndexField.RECORDING_ID));
}
if(extraInfoMap.get(RequestParameter.TAGGER_PORT)!=null) {
Modified: 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/mmd1/TrackMmd1XmlWriter.java 2009-10-30 20:37:52 UTC (rev 12269)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/TrackMmd1XmlWriter.java 2009-10-30 22:13:58 UTC (rev 12270)
@@ -37,8 +37,7 @@
import com.jthink.brainz.mmd.TrackList;
import org.apache.lucene.util.NumericUtils;
import org.apache.commons.lang.StringUtils;
-import org.musicbrainz.search.index.TrackIndexField;
-import org.musicbrainz.search.index.ReleaseIndexField;
+import org.musicbrainz.search.index.RecordingIndexField;
import org.musicbrainz.search.servlet.MbDocument;
import org.musicbrainz.search.servlet.Result;
import org.musicbrainz.search.servlet.Results;
@@ -60,38 +59,38 @@
MbDocument doc = result.doc;
Track track = of.createTrack();
- track.setId(doc.get(TrackIndexField.TRACK_ID));
+ track.setId(doc.get(RecordingIndexField.RECORDING_ID));
track.getOtherAttributes().put(getScore(), String.valueOf((int) (result.score * 100)));
- String name = doc.get(TrackIndexField.TRACK);
+ String name = doc.get(RecordingIndexField.RECORDING);
if (name != null) {
track.setTitle(name);
}
- String duration = doc.get(TrackIndexField.DURATION);
+ String duration = doc.get(RecordingIndexField.DURATION);
if (duration != null) {
track.setDuration(BigInteger.valueOf(NumericUtils.prefixCodedToInt(duration)));
}
- String artistName = doc.get(TrackIndexField.ARTIST);
+ String artistName = doc.get(RecordingIndexField.ARTIST);
if (artistName != null) {
Artist artist = of.createArtist();
artist.setName(artistName);
- artist.setId(doc.get(TrackIndexField.ARTIST_ID));
- artist.setSortName(doc.get(TrackIndexField.ARTIST_SORTNAME));
+ artist.setId(doc.get(RecordingIndexField.ARTIST_ID));
+ artist.setSortName(doc.get(RecordingIndexField.ARTIST_SORTNAME));
track.setArtist(artist);
}
- String[] releaseIds = doc.getValues(TrackIndexField.RELEASE_ID);
- String[] releaseTypes = doc.getValues(TrackIndexField.RELEASE_TYPE);
- String[] numTracks = doc.getValues(TrackIndexField.NUM_TRACKS);
- String[] trackNos = doc.getValues(TrackIndexField.TRACKNUM);
- String[] releases = doc.getValues(TrackIndexField.RELEASE);
+ String[] releaseIds = doc.getValues(RecordingIndexField.RELEASE_ID);
+ String[] releaseTypes = doc.getValues(RecordingIndexField.RELEASE_TYPE);
+ String[] numTracks = doc.getValues(RecordingIndexField.NUM_TRACKS);
+ String[] trackNos = doc.getValues(RecordingIndexField.TRACKNUM);
+ String[] releases = doc.getValues(RecordingIndexField.RELEASE);
ReleaseList releaseList = of.createReleaseList();
for (int i = 0; i < releaseIds.length; i++) {
Property changes on: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/RecordingXmlWriter.java
___________________________________________________________________
Added: svn:mergeinfo
+ /search_server/branches/lucene-java/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/TrackMmd1XmlWriter.java:12117-12127
/search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/TrackMmd1XmlWriter.java:12128-12159
Modified: search_server/branches/ngs/servlet/src/main/resources/track.html.vtl
===================================================================
--- search_server/branches/ngs/servlet/src/main/resources/track.html.vtl 2009-10-30 20:37:52 UTC (rev 12269)
+++ search_server/branches/ngs/servlet/src/main/resources/track.html.vtl 2009-10-30 22:13:58 UTC (rev 12270)
@@ -36,44 +36,44 @@
#end
<tr class="searchresults$oddeven">
<td>$score</td>
- <td align="center">$doc.getAsText($TrackIndexField.TRACKNUM)</td>
+ <td align="center">$doc.getAsText($RecordingIndexField.TRACKNUM)</td>
<td>
- <a href="/track/${doc.get($TrackIndexField.TRACK_ID)}.html">$doc.get($TrackIndexField.TRACK)</a>
+ <a href="/track/${doc.get($RecordingIndexField.RECORDING_ID)}.html">$doc.get($RecordingIndexField.RECORDING)</a>
</td>
- #if( $doc.get($TrackIndexField.DURATION) && $doc.getAsNumber($TrackIndexField.DURATION) > 0 )
+ #if( $doc.get($RecordingIndexField.DURATION) && $doc.getAsNumber($RecordingIndexField.DURATION) > 0 )
#if ($dur)
- <td class="$Utils.getTlenClassForDuration($doc.getAsNumber($TrackIndexField.DURATION),$dur)" align="center">$Utils.convertMsToMinutesAndSeconds($doc.getAsNumber($TrackIndexField.DURATION))</td>
+ <td class="$Utils.getTlenClassForDuration($doc.getAsNumber($RecordingIndexField.DURATION),$dur)" align="center">$Utils.convertMsToMinutesAndSeconds($doc.getAsNumber($RecordingIndexField.DURATION))</td>
#else
- <td class="tlen" align="center">$Utils.convertMsToMinutesAndSeconds($doc.getAsNumber($TrackIndexField.DURATION))</td>
+ <td class="tlen" align="center">$Utils.convertMsToMinutesAndSeconds($doc.getAsNumber($RecordingIndexField.DURATION))</td>
#end
#else
<td class="tlen" align="center"> </td>
#end
- <td>$!doc.get($TrackIndexField.RELEASE_TYPE)</td>
+ <td>$!doc.get($RecordingIndexField.RELEASE_TYPE)</td>
<td>
- <a href="/artist/${doc.get($TrackIndexField.ARTIST_ID)}.html">$doc.get($TrackIndexField.ARTIST)</a>
- #if( $doc.get($TrackIndexField.ARTIST_COMMENT) )
- ($doc.get($TrackIndexField.ARTIST_COMMENT))
+ <a href="/artist/${doc.get($RecordingIndexField.ARTIST_ID)}.html">$doc.get($RecordingIndexField.ARTIST)</a>
+ #if( $doc.get($RecordingIndexField.ARTIST_COMMENT) )
+ ($doc.get($RecordingIndexField.ARTIST_COMMENT))
#end
</td>
<td>
- <a href="/release/${doc.get($TrackIndexField.RELEASE_ID)}.html">$doc.get($TrackIndexField.RELEASE)</a>
+ <a href="/release/${doc.get($RecordingIndexField.RELEASE_ID)}.html">$doc.get($RecordingIndexField.RELEASE)</a>
</td>
- <td align="center">$doc.getAsNumber($TrackIndexField.NUM_TRACKS)</td>
+ <td align="center">$doc.getAsNumber($RecordingIndexField.NUM_TRACKS)</td>
#if ( $tport )
<td style="white-space: nowrap">
- <a href="
http://127.0.0.1:${tport}/openalbum?id=${doc.get($TrackIndexField.RELEASE_ID)}&t=$time"
+ <a href="
http://127.0.0.1:${tport}/openalbum?id=${doc.get($RecordingIndexField.RELEASE_ID)}&t=$time"
target="hiddeniframe" title="Open in Tagger" border="0"><img
src="/images/mblookup-tagger.png" border="0" alt="Open in tagger"></a>
</td>
#elseif ( $oldstylelink )
<td style="white-space: nowrap">
- <a href="tag:${doc.get($TrackIndexField.TRACK_ID)}:${doc.get($TrackIndexField.RELEASE_ID)}">
+ <a href="tag:${doc.get($RecordingIndexField.RECORDING_ID)}:${doc.get($RecordingIndexField.RELEASE_ID)}">
<img src="/images/mblookup-tag.gif" alt="Tag" title="Tag the current track"
height="13" width="28" align="middle" border="0">
</td>
#elseif ( $relationships )
- <td><a href="/show/track/relationships.html?trackid=${doc.get($TrackIndexField.TRACK_ID)}&addrel=1">rel</a></td>
+ <td><a href="/show/track/relationships.html?trackid=${doc.get($RecordingIndexField.TRACK_ID)}&addrel=1">rel</a></td>
#end
</tr>
Property changes on: search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindRecordingTest.java
___________________________________________________________________
Added: svn:eol-style
+ native
_______________________________________________
MusicBrainz-commits mailing list
MusicBrainz-commits@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-commits
