[mb-commits] r13716 - search_server/trunk/index/src/main/java/org/musicbrainz/search/index

Author: ijabz
Date: 2013-10-02 15:01:43 +0000 (Wed, 02 Oct 2013)
New Revision: 13716

Modified:
   search_server/trunk/index/src/main/java/org/musicbrainz/search/index/AnnotationIndex.java
   search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ArtistCreditHelper.java
   search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ReleaseIndexField.java
Log:
SEARCH-242: The searcher can't guess that the artist name one's looking for is alias or artist name ?\226?\152?\158 look for both

Modified: search_server/trunk/index/src/main/java/org/musicbrainz/search/index/AnnotationIndex.java
===================================================================
--- search_server/trunk/index/src/main/java/org/musicbrainz/search/index/AnnotationIndex.java	2013-10-02 13:01:59 UTC (rev 13715)
+++ search_server/trunk/index/src/main/java/org/musicbrainz/search/index/AnnotationIndex.java	2013-10-02 15:01:43 UTC (rev 13716)
@@ -67,7 +67,7 @@
         for (AnnotationType type : annotationTypeInfos.keySet()) {
             AnnotationTypeInfo info = annotationTypeInfos.get(type);
             addPreparedStatement(type.getName(), 
-                "SELECT a.id, e.gid, a.text, e.name " +
+                "SELECT a.id, e.gid, a.text, e.name, e.comment " +
                 " FROM annotation a " +
                 "  INNER JOIN " + info.entityDbName + "_annotation ea ON a.id=ea.annotation " +
                 "  INNER JOIN (SELECT DISTINCT ea2." + info.entityDbName + " as id, max(created) as created_date " +

Modified: search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ArtistCreditHelper.java
===================================================================
--- search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ArtistCreditHelper.java	2013-10-02 13:01:59 UTC (rev 13715)
+++ search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ArtistCreditHelper.java	2013-10-02 15:01:43 UTC (rev 13716)
@@ -254,16 +254,12 @@
                 doc.addField(artistId, nc.getArtist().getId());
                 doc.addField(artistName, nc.getArtist().getName());
 
-                //If there is an english locale based alias we add this to help when looking up releases
-                //by artists who name is in non-latin script
+                //Add all aliases
                 if(nc.getArtist().getAliasList()!=null && nc.getArtist().getAliasList().getAlias().size()>0)
                 {
                     for(Alias alias:nc.getArtist().getAliasList().getAlias())
                     {
-                        if(alias.getLocale()!=null)
-                        {
-                            aliasWithLocales.add(alias.getContent());
-                        }
+                        aliasWithLocales.add(alias.getContent());
                     }
                 }
 

Modified: search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ReleaseIndexField.java
===================================================================
--- search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ReleaseIndexField.java	2013-10-02 13:01:59 UTC (rev 13715)
+++ search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ReleaseIndexField.java	2013-10-02 15:01:43 UTC (rev 13716)
@@ -14,7 +14,6 @@
     AMAZON_ID		    ("asin",		    MusicBrainzFieldTypes.TEXT_NOT_STORED_ANALYZED_NO_NORMS, new CaseInsensitiveKeywordAnalyzer()),
     ARTIST_ID		    ("arid",			MusicBrainzFieldTypes.TEXT_NOT_STORED_ANALYZED_NO_NORMS, new KeywordAnalyzer()),
     ARTIST              ("artist",          MusicBrainzFieldTypes.TEXT_NOT_STORED_ANALYZED, new MusicbrainzWithPosGapAnalyzer()),
-    ARTIST_CREDIT       ("artistcredit",    MusicBrainzFieldTypes.TEXT_STORED_NOT_INDEXED),
     ARTIST_NAME         ("artistname",		MusicBrainzFieldTypes.TEXT_NOT_STORED_ANALYZED, new MusicbrainzWithPosGapAnalyzer()),
     ARTIST_NAMECREDIT   ("creditname",	    MusicBrainzFieldTypes.TEXT_NOT_STORED_ANALYZED, new MusicbrainzWithPosGapAnalyzer()),
     BARCODE			    ("barcode",		    MusicBrainzFieldTypes.TEXT_NOT_STORED_ANALYZED_NO_NORMS, new StripLeadingZeroesAnalyzer()),