headers
root | 20 May 2013 14:11
Favicon

[mb-commits] r13690 - in search_server/tags: . release-2013-05-20

Author: ijabz
Date: 2013-05-20 12:11:03 +0000 (Mon, 20 May 2013)
New Revision: 13690

Added:
   search_server/tags/release-2013-05-20/
Log:

Property changes on: search_server/tags/release-2013-05-20
___________________________________________________________________
Added: svn:mergeinfo
   + /search_server/branches/lucene-java:12117-12127
/search_server/trunk:12128-12159
Permalink | Reply | 0 comments |
headers
root | 20 May 2013 13:58
Favicon

[mb-commits] r13689 - search_server/trunk

Author: ijabz
Date: 2013-05-20 11:58:40 +0000 (Mon, 20 May 2013)
New Revision: 13689

Modified:
   search_server/trunk/README
Log:
Updated README

Modified: search_server/trunk/README
===================================================================
--- search_server/trunk/README	2013-05-20 10:46:39 UTC (rev 13688)
+++ search_server/trunk/README	2013-05-20 11:58:40 UTC (rev 13689)
 <at>  <at>  -7,7 +7,7  <at>  <at> 
 ------------

 This server can be run on linux/osx/windows, but these instructions assume 
-that you will be running linux and will be using the tomcat6 server to host
+that you will be running linux and will be using the tomcat7 server to host
 the servlet.

 It also assumes you have created a user called search with a home folder of /home/search
 <at>  <at>  -23,12 +23,12  <at>  <at> 
 You will also need these tools:

     - Java complete with JDK 1.6, not just the JRE
-    - Apache Tomcat 6
+    - Apache Tomcat 7
     - Maven 2
(Continue reading)

Permalink | Reply | 0 comments |
headers
root | 20 May 2013 12:46
Favicon

[mb-commits] r13688 - search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1

Author: ijabz
Date: 2013-05-20 10:46:39 +0000 (Mon, 20 May 2013)
New Revision: 13688

Modified:
   search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/ReleaseMmd1XmlWriter.java
Log:
SEARCH-298:ws/1 release search output broken for releases with no labels

Modified: search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/ReleaseMmd1XmlWriter.java
===================================================================
---
search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/ReleaseMmd1XmlWriter.java	2013-05-20
09:23:17 UTC (rev 13687)
+++
search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/ReleaseMmd1XmlWriter.java	2013-05-20
10:46:39 UTC (rev 13688)
 <at>  <at>  -89,7 +89,7  <at>  <at> 

             TextRepresentation tr = of.createTextRepresentation();
             org.musicbrainz.mmd2.TextRepresentation tr2 = releasev2.getTextRepresentation();
-            if (tr != null) {
+            if (tr2 != null) {
                 if (!Strings.isNullOrEmpty(tr2.getScript())) {
                     tr.setScript(tr2.getScript());
                 }
 <at>  <at>  -119,7 +119,7  <at>  <at> 
             //Just use format of first medium
             Medium firstMediumv2 = releasev2.getMediumList().getMedium().get(0);
             LabelInfoList lilv2 = releasev2.getLabelInfoList();
(Continue reading)

Permalink | Reply | 0 comments |
headers
root | 20 May 2013 11:23
Favicon

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

Author: ijabz
Date: 2013-05-20 09:23:17 +0000 (Mon, 20 May 2013)
New Revision: 13687

Modified:
   search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ReleaseIndex.java
   search_server/trunk/index/src/test/java/org/musicbrainz/search/index/ReleaseIndexTest.java
Log:
SEARCH-294:Search results no longer include medium-list count attribute

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-05-16
09:29:38 UTC (rev 13686)
+++
search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ReleaseIndex.java	2013-05-20
09:23:17 UTC (rev 13687)
 <at>  <at>  -561,11 +561,12  <at>  <at> 
                 DiscList discList = of.createDiscList();
                 discList.setCount(BigInteger.valueOf(numDiscsOnMedium));
                 medium.setDiscList(discList);
-
                 mediumList.getMedium().add(medium);
-                release.setMediumList(mediumList);
             }
+            mediumList.setCount(BigInteger.valueOf(mediumList.getMedium().size()));
+            release.setMediumList(mediumList);

+
(Continue reading)

Permalink | Reply | 0 comments |
headers
root | 16 May 2013 11:29
Favicon

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

Author: ijabz
Date: 2013-05-16 09:29:38 +0000 (Thu, 16 May 2013)
New Revision: 13686

Modified:
   search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java
   search_server/trunk/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java
Log:
SEARCH-290:Fixed with the bug present the behaviour was that whenever there was track artist credit that
was different to the recording artist credit then it would in fact output the recording artist credit as
the track artist credit.

Modified: search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java
===================================================================
---
search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java	2013-05-10
13:14:08 UTC (rev 13685)
+++
search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java	2013-05-16
09:29:38 UTC (rev 13686)
 <at>  <at>  -867,7 +867,7  <at>  <at> 
                                         RecordingIndexField.ARTIST_NAMECREDIT,
                                         RecordingIndexField.ARTIST_ID,
                                         RecordingIndexField.ARTIST_NAME);
-                        track.setArtistCredit(ac.getArtistCredit());
+                        track.setArtistCredit(taw.getArtistCredit());
                     }
                 }
             }
(Continue reading)

Permalink | Reply | 0 comments |
headers
root | 10 May 2013 15:14
Favicon

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

Author: ijabz
Date: 2013-05-10 13:14:08 +0000 (Fri, 10 May 2013)
New Revision: 13685

Modified:
   search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java
   search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ReleaseEventHelper.java
   search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ReleaseIndex.java
   search_server/trunk/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java
   search_server/trunk/index/src/test/java/org/musicbrainz/search/index/ReleaseIndexTest.java
   search_server/trunk/servlet/src/main/resources/oxml.xml
   search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindRecordingTest.java
   search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseTest.java
Log:
SEARCH-274:Updated to reflect latest changes to schema for areas

Modified: search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java
===================================================================
---
search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java	2013-05-09
21:01:54 UTC (rev 13684)
+++
search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java	2013-05-10
13:14:08 UTC (rev 13685)
 <at>  <at>  -592,7 +592,14  <at>  <at> 
             }
             ReleaseEvent re = of.createReleaseEvent();
             re.setDate(Strings.emptyToNull(Utils.formatDate(rs.getInt("date_year"),
rs.getInt("date_month"), rs.getInt("date_day"))));
-            re.setCountry((rs.getString("country")));
(Continue reading)

Permalink | Reply | 0 comments |
headers
root | 9 May 2013 23:01
Favicon

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

Author: ijabz
Date: 2013-05-09 21:01:54 +0000 (Thu, 09 May 2013)
New Revision: 13684

Modified:
   search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java
Log:
Fixed multiple mediums being displayed under recoridng releases

Modified: search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java
===================================================================
---
search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java	2013-05-09
15:25:01 UTC (rev 13683)
+++
search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java	2013-05-09
21:01:54 UTC (rev 13684)
 <at>  <at>  -738,14 +738,26  <at>  <at> 

             // For each track that uses recording
             for (TrackWrapper trackWrapper : tracks.get(id)) {
-                //Set the release details for this track
-                Release release = releases.get(trackWrapper.getReleaseId());
-                releaseList.getRelease().add(release);
+                //Get the release details for this track
+                Release origRelease = releases.get(trackWrapper.getReleaseId());

-                if (release != null) {

+                if (origRelease != null) {
(Continue reading)

Permalink | Reply | 0 comments |
headers
root | 9 May 2013 17:25
Favicon

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

Author: ijabz
Date: 2013-05-09 15:25:01 +0000 (Thu, 09 May 2013)
New Revision: 13683

Modified:
   search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ReleaseIndex.java
   search_server/trunk/index/src/test/java/org/musicbrainz/search/index/ReleaseIndexTest.java
Log:
Fixed primaryType and status fields in release output

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-05-09
15:05:11 UTC (rev 13682)
+++
search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ReleaseIndex.java	2013-05-09
15:25:01 UTC (rev 13683)
 <at>  <at>  -419,7 +419,7  <at>  <at> 
         ReleaseGroup rg = of.createReleaseGroup();
         release.setReleaseGroup(rg);
         if (primaryType!=null && !primaryType.isEmpty()){
-            release.getReleaseGroup().setType(primaryType);
+            release.getReleaseGroup().setPrimaryType(primaryType);
         }

         if (secondaryTypes.containsKey(id)) {
 <at>  <at>  -444,7 +444,7  <at>  <at> 
         String status = rs.getString("status");
         doc.addFieldOrUnknown(ReleaseIndexField.STATUS, status);
(Continue reading)

Permalink | Reply | 0 comments |
headers
root | 9 May 2013 17:05
Favicon

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

Author: ijabz
Date: 2013-05-09 15:05:11 +0000 (Thu, 09 May 2013)
New Revision: 13682

Modified:
   search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java
Log:
Fixed ReleaseGroupType missing from Recording index output

Modified: search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java
===================================================================
---
search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java	2013-05-09
14:50:05 UTC (rev 13681)
+++
search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java	2013-05-09
15:05:11 UTC (rev 13682)
 <at>  <at>  -763,6 +763,7  <at>  <at> 
                         rg.setType(type);
                     } else {
                         doc.addFieldOrNoValue(RecordingIndexField.RELEASE_TYPE, release.getReleaseGroup().getPrimaryType());
+                        rg.setType(release.getReleaseGroup().getPrimaryType());
                     }

                     doc.addNumericField(RecordingIndexField.NUM_TRACKS, trackWrapper.getTrackCount());
Permalink | Reply | 0 comments |
headers
root | 9 May 2013 16:50
Favicon

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

Author: ijabz
Date: 2013-05-09 14:50:05 +0000 (Thu, 09 May 2013)
New Revision: 13681

Modified:
   search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ArtistIndex.java
   search_server/trunk/index/src/main/java/org/musicbrainz/search/index/LabelIndex.java
   search_server/trunk/index/src/main/java/org/musicbrainz/search/index/LabelIndexField.java
   search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ReleaseIndex.java
   search_server/trunk/index/src/test/java/org/musicbrainz/search/index/AbstractIndexTest.java
   search_server/trunk/index/src/test/java/org/musicbrainz/search/index/ArtistIndexTest.java
   search_server/trunk/index/src/test/java/org/musicbrainz/search/index/LabelIndexTest.java
   search_server/trunk/index/src/test/java/org/musicbrainz/search/index/ReleaseIndexTest.java
   search_server/trunk/index/src/test/java/org/musicbrainz/search/index/WorkIndexTest.java
   search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/LabelMmd1XmlWriter.java
   search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/LabelWriter.java
   search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindLabelTest.java
   search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/SearchAll2Test.java
Log:
SEARCH-268:Add extended alias info to the ws search results for labels.

Modified: search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ArtistIndex.java
===================================================================
--- search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ArtistIndex.java	2013-05-09 11:15:51 UTC (rev 13680)
+++ search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ArtistIndex.java	2013-05-09 14:50:05 UTC (rev 13681)
 <at>  <at>  -307,7 +307,7  <at>  <at> 
             lifespan.setBegin(begin);
         }
         if(!Strings.isNullOrEmpty(end)) {
-            lifespan.setBegin(end);
(Continue reading)

Permalink | Reply | 0 comments |
headers
root | 9 May 2013 13:15
Favicon

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

Author: ijabz
Date: 2013-05-09 11:15:51 +0000 (Thu, 09 May 2013)
New Revision: 13680

Modified:
   search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ArtistIndex.java
   search_server/trunk/index/src/test/java/org/musicbrainz/search/index/AbstractIndexTest.java
   search_server/trunk/index/src/test/java/org/musicbrainz/search/index/ArtistIndexTest.java
   search_server/trunk/index/src/test/java/org/musicbrainz/search/index/ReleaseGroupIndexTest.java
   search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ArtistWriter.java
   search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ResultsWriter.java
   search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindArtistTest.java
Log:
SEARCH-268:Add extended alias info to the ws search results

Modified: search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ArtistIndex.java
===================================================================
---
search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ArtistIndex.java	2013-05-09
08:47:07 UTC (rev 13679)
+++
search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ArtistIndex.java	2013-05-09
11:15:51 UTC (rev 13680)
 <at>  <at>  -109,11 +109,14  <at>  <at> 
                         " WHERE artist between ? AND ?");

         addPreparedStatement("ALIASES",
-                "SELECT artist_alias.artist as artist, n.name as alias, sn.name as alias_sortname " +
-                        " FROM artist_alias " +
-                        "  JOIN artist_name n ON (artist_alias.name = n.id) " +
(Continue reading)

Permalink | Reply | 0 comments |

Gmane