[mb-commits] r13693 - 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 servlet/src/main/java/org/musicbrainz/search/servlet/mmd2 servlet/src/test/java/org/musicbrainz/search/servlet

Author: ijabz
Date: 2013-06-04 19:37:16 +0000 (Tue, 04 Jun 2013)
New Revision: 13693

Added:
   search_server/trunk/index/src/main/java/org/musicbrainz/search/index/AreaIndex.java
   search_server/trunk/index/src/main/java/org/musicbrainz/search/index/AreaIndexField.java
   search_server/trunk/index/src/test/java/org/musicbrainz/search/index/AreaIndexTest.java
   search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/AreaDismaxSearch.java
   search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/AreaQueryParser.java
   search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/AreaSearch.java
   search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/AreaWriter.java
   search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindAreaTest.java
Modified:
   search_server/trunk/index/src/main/java/org/musicbrainz/search/index/IndexBuilder.java
   search_server/trunk/index/src/main/java/org/musicbrainz/search/index/IndexOptions.java
   search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/ResourceType.java
Log:
SEARCH-286:Add basic index of areas

Modified: search_server/trunk/index/src/main/java/org/musicbrainz/search/index/IndexBuilder.java
===================================================================
--- search_server/trunk/index/src/main/java/org/musicbrainz/search/index/IndexBuilder.java	2013-06-04 17:03:20 UTC (rev 13692)
+++ search_server/trunk/index/src/main/java/org/musicbrainz/search/index/IndexBuilder.java	2013-06-04 19:37:16 UTC (rev 13693)
@@ -120,6 +120,7 @@
                 new ArtistIndex(mainDbConn),
                 new ReleaseGroupIndex(mainDbConn),
                 new LabelIndex(mainDbConn),
+                new AreaIndex(mainDbConn),
                 new AnnotationIndex(mainDbConn),
                 new TagIndex(mainDbConn),
                 new CDStubIndex(mainDbConn), //Note different db

Modified: search_server/trunk/index/src/main/java/org/musicbrainz/search/index/IndexOptions.java
===================================================================
--- search_server/trunk/index/src/main/java/org/musicbrainz/search/index/IndexOptions.java	2013-06-04 17:03:20 UTC (rev 13692)
+++ search_server/trunk/index/src/main/java/org/musicbrainz/search/index/IndexOptions.java	2013-06-04 19:37:16 UTC (rev 13693)
@@ -69,8 +69,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,recording,label,work,tag,annotation,cdstub,freedb)")
-    private String indexes = "artist,label,release,recording,releasegroup,work,tag,annotation,cdstub,freedb";
+    @Option(name="--indexes", usage="A comma-separated list of indexes to build (area,artist,releasegroup,release,recording,label,work,tag,annotation,cdstub,freedb)")
+    private String indexes = "area,artist,label,release,recording,releasegroup,work,tag,annotation,cdstub,freedb";
     public ArrayList<String> selectedIndexes() { return new ArrayList<String>(Arrays.asList(indexes.split(","))); }
     public boolean buildIndex(String indexName) { return selectedIndexes().contains(indexName); }
 

Modified: search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/ResourceType.java
===================================================================
--- search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/ResourceType.java	2013-06-04 17:03:20 UTC (rev 13692)
+++ search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/ResourceType.java	2013-06-04 19:37:16 UTC (rev 13693)
@@ -4,23 +4,13 @@
 import org.musicbrainz.search.analysis.MusicbrainzSimilarity;
 import org.musicbrainz.search.analysis.RecordingSimilarity;
 import org.musicbrainz.search.analysis.ReleaseGroupSimilarity;
-import org.musicbrainz.search.index.AnnotationIndex;
-import org.musicbrainz.search.index.ArtistIndex;
-import org.musicbrainz.search.index.CDStubIndex;
-import org.musicbrainz.search.index.FreeDBIndex;
-import org.musicbrainz.search.index.Index;
-import org.musicbrainz.search.index.LabelIndex;
-import org.musicbrainz.search.index.RecordingIndex;
-import org.musicbrainz.search.index.ReleaseGroupIndex;
-import org.musicbrainz.search.index.ReleaseIndex;
-import org.musicbrainz.search.index.TagIndex;
-import org.musicbrainz.search.index.WorkIndex;
+import org.musicbrainz.search.index.*;
 
 /**
  * Defines the name of the webservice resources as defined at http://wiki.musicbrainz.org/XML_Web_Service#The_URL_Schema
  */
 public enum ResourceType {
-
+  AREA("area", AreaIndex.class, AreaSearch.class, AreaDismaxSearch.class, MusicbrainzSimilarity.class, false),
   ARTIST("artist", ArtistIndex.class, ArtistSearch.class, ArtistDismaxSearch.class, MusicbrainzSimilarity.class, true),
   LABEL("label", LabelIndex.class, LabelSearch.class, LabelDismaxSearch.class, MusicbrainzSimilarity.class, true),
   RELEASE("release", ReleaseIndex.class, ReleaseSearch.class, ReleaseDismaxSearch.class, true),