Author: ijabz
Date: 2009-10-31 08:33:03 +0000 (Sat, 31 Oct 2009)
New Revision: 12271
Modified:
search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/LabelIndex.java
search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/LabelIndexField.java
search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/LabelIndexTest.java
Log:
Fix bug in Label indexing, Storing labelid rather thasn label guid
Modified: search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/LabelIndex.java
===================================================================
--- search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/LabelIndex.java 2009-10-30 22:13:58 UTC (rev 12270)
+++ search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/LabelIndex.java 2009-10-31 08:33:03 UTC (rev 12271)
@@ -126,7 +126,7 @@
Document doc = new Document();
int labelId = rs.getInt("id");
- addFieldToDocument(doc, LabelIndexField.LABEL_GID, rs.getString("gid"));
+ addFieldToDocument(doc, LabelIndexField.LABEL_ID, rs.getString("gid"));
addFieldToDocument(doc, LabelIndexField.LABEL, rs.getString("name"));
addFieldToDocument(doc, LabelIndexField.SORTNAME, rs.getString("sortname"));
Modified: search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/LabelIndexField.java
===================================================================
--- search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/LabelIndexField.java 2009-10-30 22:13:58 UTC (rev 12270)
+++ search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/LabelIndexField.java 2009-10-31 08:33:03 UTC (rev 12271)
@@ -10,7 +10,6 @@
*/
public enum LabelIndexField implements IndexField {
- LABEL_GID ("lagid", Field.Store.YES, Field.Index.NOT_ANALYZED, new KeywordAnalyzer()),
LABEL_ID ("laid", Field.Store.YES, Field.Index.NOT_ANALYZED, new KeywordAnalyzer()),
LABEL ("label", Field.Store.YES, Field.Index.ANALYZED),
COUNTRY ("country", Field.Store.YES, Field.Index.ANALYZED),
Modified: search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/LabelIndexTest.java
===================================================================
--- search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/LabelIndexTest.java 2009-10-30 22:13:58 UTC (rev 12270)
+++ search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/LabelIndexTest.java 2009-10-31 08:33:03 UTC (rev 12271)
@@ -111,7 +111,26 @@
conn.close();
}
+ public void testIndexLabel() throws Exception {
+ addLabelThree();
+ 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(LabelIndexField.LABEL_ID.getName()).length);
+ assertEquals("a539bb1e-f2e1-4b45-9db8-8053841e7503", doc.getField(LabelIndexField.LABEL_ID.getName()).stringValue());
+ assertEquals(1, doc.getFields(LabelIndexField.COUNTRY.getName()).length);
+ assertEquals("af", doc.getField(LabelIndexField.COUNTRY.getName()).stringValue());
+ }
+ ir.close();
+
+ }
+
+
public void testIndexLabelWithNoCountry() throws Exception {
addLabelOne();
_______________________________________________
MusicBrainz-commits mailing list
MusicBrainz-commits@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-commits
