[mb-commits] r13634 - in search_server/trunk: index/src/main/java/org/musicbrainz/search/analysis index/src/main/java/org/musicbrainz/search/index servlet/src/test/java/org/musicbrainz/search/servlet

Author: ijabz
Date: 2013-02-27 10:09:23 +0000 (Wed, 27 Feb 2013)
New Revision: 13634

Added:
   search_server/trunk/index/src/main/java/org/musicbrainz/search/analysis/StripSpacesAndSeparatorsAnalyzer.java
Removed:
   search_server/trunk/index/src/main/java/org/musicbrainz/search/analysis/StripSpacesAnalyzer.java
Modified:
   search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ReleaseIndex.java
   search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ReleaseIndexField.java
   search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseTest.java
   search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/IssueSearch174Test.java
Log:
#SEARCH-238:Trimmed catalogue number (catno) search remove -,: and _

Modified: search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ReleaseIndex.java
===================================================================
--- search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ReleaseIndex.java	2013-02-27 09:14:47 UTC (rev 13633)
+++ search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ReleaseIndex.java	2013-02-27 10:09:23 UTC (rev 13634)
@@ -393,7 +393,7 @@
             for (List<String> entry : labelInfo.get(id)) {
                 doc.addFieldOrNoValue(ReleaseIndexField.LABEL_ID, entry.get(0));
                 doc.addFieldOrNoValue(ReleaseIndexField.LABEL, entry.get(1));
-                doc.addFieldOrNoValue(ReleaseIndexField.CATALOG_NO, entry.get(2));
+                doc.addFieldOrUnknown(ReleaseIndexField.CATALOG_NO, entry.get(2));
             }
         }
 

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-02-27 09:14:47 UTC (rev 13633)
+++ search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ReleaseIndexField.java	2013-02-27 10:09:23 UTC (rev 13634)
@@ -18,7 +18,7 @@
     ARTIST_NAME         ("artistname",		MusicBrainzFieldTypes.TEXT_NOT_STORED_ANALYZED, new MusicbrainzWithPosGapAnalyzer()),
     ARTIST_NAMECREDIT   ("creditname",	    MusicBrainzFieldTypes.TEXT_NOT_STORED_ANALYZED, new MusicbrainzWithPosGapAnalyzer()),
     BARCODE			    ("barcode",		    MusicBrainzFieldTypes.TEXT_STORED_ANALYZED_NO_NORMS, new StripLeadingZeroesAnalyzer()),
-    CATALOG_NO		    ("catno",		    MusicBrainzFieldTypes.TEXT_STORED_ANALYZED_NO_NORMS, new StripSpacesAnalyzer()),
+    CATALOG_NO		    ("catno",		    MusicBrainzFieldTypes.TEXT_STORED_ANALYZED_NO_NORMS, new StripSpacesAndSeparatorsAnalyzer()),
     COMMENT		        ("comment",		    MusicBrainzFieldTypes.TEXT_STORED_ANALYZED),
     COUNTRY			    ("country",		    MusicBrainzFieldTypes.TEXT_STORED_ANALYZED_NO_NORMS, new CaseInsensitiveKeywordAnalyzer()),
     DATE			    ("date",		    MusicBrainzFieldTypes.TEXT_STORED_NOT_ANALYZED_NO_NORMS, new KeywordAnalyzer()),

Modified: search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseTest.java
===================================================================
--- search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseTest.java	2013-02-27 09:14:47 UTC (rev 13633)
+++ search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseTest.java	2013-02-27 10:09:23 UTC (rev 13634)
@@ -110,7 +110,7 @@
     doc.addField(ReleaseIndexField.LABEL, "Wrath Records");
     doc.addField(ReleaseIndexField.LABEL_ID, Index.NO_VALUE);
 
-    doc.addField(ReleaseIndexField.CATALOG_NO, "LP001");
+    doc.addField(ReleaseIndexField.CATALOG_NO, "LP-001");
     doc.addField(ReleaseIndexField.LABEL, "Major Records");
     doc.addField(ReleaseIndexField.LABEL_ID, "c1dfaf9c-d498-4f6c-b040-f7714315fcea");
 
@@ -309,6 +309,16 @@
     assertEquals("Wrath Records", doc.get(ReleaseIndexField.LABEL));
   }
 
+
+    @Test
+    public void testFindReleaseByCatNoIgnoreHypens() throws Exception {
+        Results res = ss.search("catno:LP001", 0, 10);
+        assertEquals(1, res.totalHits);
+        Result result = res.results.get(0);
+        MbDocument doc = result.doc;
+        assertEquals("Our Glorious 5 Year Plan", doc.get(ReleaseIndexField.RELEASE));
+        assertEquals("Wrath Records", doc.get(ReleaseIndexField.LABEL));
+    }
   @Test
   public void testFindReleaseByBarcodeWithoutZero() throws Exception {
     Results res = ss.search("barcode:7599273202", 0, 10);

Modified: search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/IssueSearch174Test.java
===================================================================
--- search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/IssueSearch174Test.java	2013-02-27 09:14:47 UTC (rev 13633)
+++ search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/IssueSearch174Test.java	2013-02-27 10:09:23 UTC (rev 13634)
@@ -43,7 +43,7 @@
     {
       MbDocument doc = new MbDocument();
       doc.addField(ReleaseIndexField.RELEASE_ID, "11111111-1cf0-4d1f-aca7-2a6f89e34b36");
-      doc.addField(ReleaseIndexField.CATALOG_NO, Index.NO_VALUE);
+      doc.addField(ReleaseIndexField.STATUS, Index.NO_VALUE);
       writer.addDocument(doc.getLuceneDocument());
     }
 
@@ -58,7 +58,7 @@
 
     IndexReader ir = DirectoryReader.open(ramDir);
     Fields fields = MultiFields.getFields(ir);
-    Terms terms = fields.terms("catno");
+    Terms terms = fields.terms("status");
     TermsEnum termsEnum = terms.iterator(null);
     termsEnum.next();
     assertEquals(1, termsEnum.docFreq());
@@ -75,7 +75,7 @@
     SearcherManager searcherManager = ss.getSearcherManager();
     IndexSearcher searcher = searcherManager.acquire();
     try {
-      Query q = ss.parseQuery("catno:\\-");
+      Query q = ss.parseQuery("status:\\-");
       System.out.println(q);
       TopDocs topdocs = searcher.search(q, 10);
       assertEquals(1, topdocs.scoreDocs.length);