[mb-commits] r13646 - in search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet: . mmd2
[email protected] Thu, 28 Feb 2013 13:01:03 +0000
| Newsgroups | gmane.comp.audio.musicbrainz.cvs |
|---|---|
| Message-ID | <E1UB36d-0002Wn-6T@wiley> |
Author: ijabz
Date: 2013-02-28 13:01:01 +0000 (Thu, 28 Feb 2013)
New Revision: 13646
Modified:
search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServerServlet.java
search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/AnnotationWriter.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/CDStubWriter.java
search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/FreeDBWriter.java
search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/LabelWriter.java
search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/RecordingWriter.java
search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ReleaseGroupWriter.java
search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ReleaseWriter.java
search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/TagWriter.java
search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/WorkWriter.java
Log:
Catching runtimeexception to try and identify wierd error
Modified: search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServerServlet.java
===================================================================
--- search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServerServlet.java 2013-02-28 11:50:14 UTC (rev 13645)
+++ search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServerServlet.java 2013-02-28 13:01:01 UTC (rev 13646)
@@ -636,9 +636,17 @@
response.setDateHeader("Last-Modified", writer.getLastUpdateDate().getTime());
}
- PrintWriter out = new PrintWriter(new BufferedWriter(new OutputStreamWriter(response.getOutputStream(), CHARSET)));
- writer.write(out, results, responseFormat, isPretty);
- out.close();
+ try
+ {
+ PrintWriter out = new PrintWriter(new BufferedWriter(new OutputStreamWriter(response.getOutputStream(), CHARSET)));
+ writer.write(out, results, responseFormat, isPretty);
+ out.close();
+ }
+ catch(RuntimeException ex)
+ {
+ ex.printStackTrace();
+ throw ex;
+ }
}
/**
Modified: search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/AnnotationWriter.java
===================================================================
--- search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/AnnotationWriter.java 2013-02-28 11:50:14 UTC (rev 13645)
+++ search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/AnnotationWriter.java 2013-02-28 13:01:01 UTC (rev 13646)
@@ -44,6 +44,12 @@
public class AnnotationWriter extends ResultsWriter {
+ /**
+ *
+ * @param metadata
+ * @param results
+ * @throws IOException
+ */
public void write(Metadata metadata, Results results) throws IOException {
ObjectFactory of = new ObjectFactory();
Modified: 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/ArtistWriter.java 2013-02-28 11:50:14 UTC (rev 13645)
+++ search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ArtistWriter.java 2013-02-28 13:01:01 UTC (rev 13646)
@@ -44,6 +44,12 @@
public class ArtistWriter extends ResultsWriter
{
+ /**
+ *
+ * @param metadata
+ * @param results
+ * @throws IOException
+ */
public void write(Metadata metadata, Results results) throws IOException
{
ObjectFactory of = new ObjectFactory();
@@ -61,6 +67,12 @@
}
+ /**
+ *
+ * @param list
+ * @param results
+ * @throws IOException
+ */
public void write(List list, Results results) throws IOException
{
for (Result result : results.results)
@@ -69,6 +81,12 @@
}
}
+ /**
+ *
+ * @param list
+ * @param result
+ * @throws IOException
+ */
public void write(List list, Result result) throws IOException
{
ObjectFactory of = new ObjectFactory();
Modified: search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/CDStubWriter.java
===================================================================
--- search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/CDStubWriter.java 2013-02-28 11:50:14 UTC (rev 13645)
+++ search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/CDStubWriter.java 2013-02-28 13:01:01 UTC (rev 13646)
@@ -44,6 +44,12 @@
public class CDStubWriter extends ResultsWriter {
+ /**
+ *
+ * @param metadata
+ * @param results
+ * @throws IOException
+ */
public void write(Metadata metadata, Results results) throws IOException {
ObjectFactory of = new ObjectFactory();
Modified: search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/FreeDBWriter.java
===================================================================
--- search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/FreeDBWriter.java 2013-02-28 11:50:14 UTC (rev 13645)
+++ search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/FreeDBWriter.java 2013-02-28 13:01:01 UTC (rev 13646)
@@ -44,6 +44,12 @@
public class FreeDBWriter extends ResultsWriter {
+ /**
+ *
+ * @param metadata
+ * @param results
+ * @throws IOException
+ */
public void write(Metadata metadata, Results results) throws IOException {
ObjectFactory of = new ObjectFactory();
Modified: search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/LabelWriter.java
===================================================================
--- search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/LabelWriter.java 2013-02-28 11:50:14 UTC (rev 13645)
+++ search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/LabelWriter.java 2013-02-28 13:01:01 UTC (rev 13646)
@@ -42,11 +42,14 @@
public class LabelWriter extends ResultsWriter {
- public void write(EntityList list, Results results) throws IOException
- {
- write(list.getArtistAndReleaseAndReleaseGroup(), results);
- }
+ /**
+ * Write Search results
+ *
+ * @param metadata
+ * @param results
+ * @throws IOException
+ */
public void write(Metadata metadata, Results results) throws IOException
{
ObjectFactory of = new ObjectFactory();
@@ -63,6 +66,13 @@
metadata.setLabelList(labelList);
}
+ /**
+ * Write Search All Results
+ *
+ * @param list
+ * @param results
+ * @throws IOException
+ */
public void write(List list, Results results) throws IOException
{
for (Result result : results.results)
@@ -71,6 +81,13 @@
}
}
+ /**
+ * Write result and add to the list
+ *
+ * @param list
+ * @param result
+ * @throws IOException
+ */
public void write(List list, Result result) throws IOException
{
ObjectFactory of = new ObjectFactory();
Modified: search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/RecordingWriter.java
===================================================================
--- search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/RecordingWriter.java 2013-02-28 11:50:14 UTC (rev 13645)
+++ search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/RecordingWriter.java 2013-02-28 13:01:01 UTC (rev 13646)
@@ -66,7 +66,12 @@
return vaCredit;
}
-
+ /**
+ *
+ * @param metadata
+ * @param results
+ * @throws IOException
+ */
public void write(Metadata metadata, Results results) throws IOException
{
ObjectFactory of = new ObjectFactory();
@@ -82,6 +87,13 @@
recordingList.setOffset(BigInteger.valueOf(results.getOffset()));
metadata.setRecordingList(recordingList);
}
+
+ /**
+ *
+ * @param list
+ * @param results
+ * @throws IOException
+ */
public void write(List list, Results results) throws IOException
{
for (Result result : results.results)
@@ -90,6 +102,12 @@
}
}
+ /**
+ *
+ * @param list
+ * @param result
+ * @throws IOException
+ */
public void write(List list, Result result) throws IOException
{
ObjectFactory of = new ObjectFactory();
Modified: search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ReleaseGroupWriter.java
===================================================================
--- search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ReleaseGroupWriter.java 2013-02-28 11:50:14 UTC (rev 13645)
+++ search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ReleaseGroupWriter.java 2013-02-28 13:01:01 UTC (rev 13646)
@@ -42,6 +42,12 @@
public class ReleaseGroupWriter extends ResultsWriter {
+ /**
+ *
+ * @param metadata
+ * @param results
+ * @throws IOException
+ */
public void write(Metadata metadata, Results results) throws IOException
{
ObjectFactory of = new ObjectFactory();
@@ -58,6 +64,12 @@
metadata.setReleaseGroupList(releaseGroupList);
}
+ /**
+ *
+ * @param list
+ * @param results
+ * @throws IOException
+ */
public void write(List list, Results results) throws IOException
{
for (Result result : results.results)
@@ -66,6 +78,12 @@
}
}
+ /**
+ *
+ * @param list
+ * @param result
+ * @throws IOException
+ */
public void write(List list, Result result) throws IOException
{
ObjectFactory of = new ObjectFactory();
Modified: search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ReleaseWriter.java
===================================================================
--- search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ReleaseWriter.java 2013-02-28 11:50:14 UTC (rev 13645)
+++ search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ReleaseWriter.java 2013-02-28 13:01:01 UTC (rev 13646)
@@ -48,6 +48,12 @@
public class ReleaseWriter extends ResultsWriter {
+ /**
+ *
+ * @param metadata
+ * @param results
+ * @throws IOException
+ */
public void write(Metadata metadata, Results results) throws IOException
{
ObjectFactory of = new ObjectFactory();
@@ -64,6 +70,12 @@
metadata.setReleaseList(releaseList);
}
+ /**
+ *
+ * @param list
+ * @param results
+ * @throws IOException
+ */
public void write(List list, Results results) throws IOException
{
for (Result result : results.results)
@@ -72,6 +84,12 @@
}
}
+ /**
+ *
+ * @param list
+ * @param result
+ * @throws IOException
+ */
public void write(List list, Result result) throws IOException
{
ObjectFactory of = new ObjectFactory();
Modified: search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/TagWriter.java
===================================================================
--- search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/TagWriter.java 2013-02-28 11:50:14 UTC (rev 13645)
+++ search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/TagWriter.java 2013-02-28 13:01:01 UTC (rev 13646)
@@ -42,6 +42,12 @@
public class TagWriter extends ResultsWriter {
+ /**
+ *
+ * @param metadata
+ * @param results
+ * @throws IOException
+ */
public void write(Metadata metadata, Results results) throws IOException {
ObjectFactory of = new ObjectFactory();
TagList tagList = of.createTagList();
Modified: search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/WorkWriter.java
===================================================================
--- search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/WorkWriter.java 2013-02-28 11:50:14 UTC (rev 13645)
+++ search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/WorkWriter.java 2013-02-28 13:01:01 UTC (rev 13646)
@@ -39,16 +39,21 @@
import java.math.BigInteger;
import java.util.List;
-public class WorkWriter extends ResultsWriter {
+public class WorkWriter extends ResultsWriter
+{
-
+ /**
+ * @param metadata
+ * @param results
+ * @throws IOException
+ */
public void write(Metadata metadata, Results results) throws IOException
{
ObjectFactory of = new ObjectFactory();
WorkList workList = of.createWorkList();
- for(Result result:results.results)
+ for (Result result : results.results)
{
result.setNormalizedScore(results.getMaxScore());
}
@@ -59,6 +64,11 @@
metadata.setWorkList(workList);
}
+ /**
+ * @param list
+ * @param results
+ * @throws IOException
+ */
public void write(List list, Results results) throws IOException
{
for (Result result : results.results)
@@ -67,80 +77,91 @@
}
}
+ /**
+ * @param list
+ * @param result
+ * @throws IOException
+ */
public void write(List list, Result result) throws IOException
{
ObjectFactory of = new ObjectFactory();
WorkList workList = of.createWorkList();
- MbDocument doc = result.getDoc();
- Work work = of.createWork();
- work.setId(doc.get(WorkIndexField.WORK_ID));
- work.setScore(String.valueOf(result.getNormalizedScore()));
+ MbDocument doc = result.getDoc();
+ Work work = of.createWork();
+ work.setId(doc.get(WorkIndexField.WORK_ID));
+ work.setScore(String.valueOf(result.getNormalizedScore()));
- String name = doc.get(WorkIndexField.WORK);
- if (name != null) {
- work.setTitle(name);
- }
+ String name = doc.get(WorkIndexField.WORK);
+ if (name != null)
+ {
+ work.setTitle(name);
+ }
- String comment = doc.get(WorkIndexField.COMMENT);
- if (isNotNoValue(comment)) {
- work.setDisambiguation(comment);
- }
+ String comment = doc.get(WorkIndexField.COMMENT);
+ if (isNotNoValue(comment))
+ {
+ work.setDisambiguation(comment);
+ }
- String type = doc.get(WorkIndexField.TYPE);
- if (isNotNoValue(type)) {
- work.setType(type);
- }
+ String type = doc.get(WorkIndexField.TYPE);
+ if (isNotNoValue(type))
+ {
+ work.setType(type);
+ }
- String lyricsLanguage = doc.get(WorkIndexField.LYRICS_LANG);
- if (isNotNoValue(lyricsLanguage)) {
- work.setLanguage(lyricsLanguage);
- }
-
- String[] iswcs = doc.getValues(WorkIndexField.ISWC);
- if(iswcs.length>0)
- {
- IswcList iswcList = of.createIswcList();
- for(int i=0;i<iswcs.length;i++)
- {
- iswcList.getIswc().add(iswcs[i]);
- }
- work.setIswcList(iswcList);
- }
+ String lyricsLanguage = doc.get(WorkIndexField.LYRICS_LANG);
+ if (isNotNoValue(lyricsLanguage))
+ {
+ work.setLanguage(lyricsLanguage);
+ }
- String artistRelation = doc.get(WorkIndexField.ARTIST_RELATION);
- if(artistRelation!=null)
+ String[] iswcs = doc.getValues(WorkIndexField.ISWC);
+ if (iswcs.length > 0)
+ {
+ IswcList iswcList = of.createIswcList();
+ for (int i = 0; i < iswcs.length; i++)
{
- RelationList rc = (RelationList) MMDSerializer.unserialize(artistRelation, RelationList.class);
- work.getRelationList().add(rc);
+ iswcList.getIswc().add(iswcs[i]);
}
+ work.setIswcList(iswcList);
+ }
- String[] aliases = doc.getValues(WorkIndexField.ALIAS);
- if(aliases.length>0)
+ String artistRelation = doc.get(WorkIndexField.ARTIST_RELATION);
+ if (artistRelation != null)
+ {
+ RelationList rc = (RelationList) MMDSerializer.unserialize(artistRelation, RelationList.class);
+ work.getRelationList().add(rc);
+ }
+
+ String[] aliases = doc.getValues(WorkIndexField.ALIAS);
+ if (aliases.length > 0)
+ {
+ AliasList aliasList = of.createAliasList();
+ for (int i = 0; i < aliases.length; i++)
{
- AliasList aliasList = of.createAliasList();
- for(int i = 0;i<aliases.length;i++) {
- Alias alias = of.createAlias();
- alias.setContent(aliases[i]);
- aliasList.getAlias().add(alias);
- }
- work.setAliasList(aliasList);
+ Alias alias = of.createAlias();
+ alias.setContent(aliases[i]);
+ aliasList.getAlias().add(alias);
}
+ work.setAliasList(aliasList);
+ }
- String[] tags = doc.getValues(WorkIndexField.TAG);
- String[] tagCounts = doc.getValues(WorkIndexField.TAGCOUNT);
- if(tags.length>0)
+ String[] tags = doc.getValues(WorkIndexField.TAG);
+ String[] tagCounts = doc.getValues(WorkIndexField.TAGCOUNT);
+ if (tags.length > 0)
+ {
+ TagList tagList = of.createTagList();
+ for (int i = 0; i < tags.length; i++)
{
- TagList tagList = of.createTagList();
- for(int i = 0;i<tags.length;i++) {
- Tag tag = of.createTag();
- tag.setName(tags[i]);
- tag.setCount(new BigInteger(tagCounts[i]));
- tagList.getTag().add(tag);
- }
- work.setTagList(tagList);
+ Tag tag = of.createTag();
+ tag.setName(tags[i]);
+ tag.setCount(new BigInteger(tagCounts[i]));
+ tagList.getTag().add(tag);
}
- list.add(work);
+ work.setTagList(tagList);
}
+ list.add(work);
+ }
}
\ No newline at end of file