Nabble - MusicBrainz

r12291 - in mb_server/trunk: admin/sql lib/MusicBrainz/Server lib/MusicBrainz/Server/Controller lib/MusicBrainz/Server/Data lib/MusicBrainz/Server/Edit/Medium lib/MusicBrainz/Server/Edit/Tracklist lib/MusicBrainz/Server/Form t t/sql

2009-11-08T08:37:14Z

Author: acid2
Date: 2009-11-08 16:37:14 +0000 (Sun, 08 Nov 2009)
New Revision: 12291

Added:
mb_server/trunk/lib/MusicBrainz/Server/Edit/Medium/Delete.pm
mb_server/trunk/lib/MusicBrainz/Server/Edit/Tracklist/Create.pm
mb_server/trunk/t/controller_release_edit.t
mb_server/trunk/t/edit_medium_delete.t
mb_server/trunk/t/edit_tracklist_create.t
mb_server/trunk/t/sql/create_tracklist.sql
Modified:
mb_server/trunk/admin/sql/InsertTestData.sql
mb_server/trunk/lib/MusicBrainz/Server/Constants.pm
mb_server/trunk/lib/MusicBrainz/Server/Controller/Release.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/Tracklist.pm
mb_server/trunk/lib/MusicBrainz/Server/Edit/Tracklist/AddTrack.pm
mb_server/trunk/lib/MusicBrainz/Server/EditRegistry.pm
mb_server/trunk/lib/MusicBrainz/Server/Form/Release.pm
mb_server/trunk/t/data_tracklist.t
Log:
Support for entering all the edit release edit types

See review 453

Modified: mb_server/trunk/admin/sql/InsertTestData.sql
===================================================================
--- mb_server/trunk/admin/sql/InsertTestData.sql 2009-11-08 14:43:39 UTC (rev 12290)
+++ mb_server/trunk/admin/sql/InsertTestData.sql 2009-11-08 16:37:14 UTC (rev 12291)
@@ -119,20 +119,24 @@
TRUNCATE release_status CASCADE;

INSERT INTO release_status (id, name) VALUES (1, 'Official');
+INSERT INTO release_status (id, name) VALUES (2, 'Promotional');

TRUNCATE release_packaging CASCADE;

INSERT INTO release_packaging (id, name) VALUES (1, 'Jewel Case');
+INSERT INTO release_packaging (id, name) VALUES (2, 'Digipak');

TRUNCATE language CASCADE;

INSERT INTO language (id, isocode_3t, isocode_3b, isocode_2, name, frequency)
- VALUES (1, 'deu', 'ger', 'de', 'German', 2);
+ VALUES (1, 'deu', 'ger', 'de', 'German', 2),
+ (2, 'lit', 'lit', 'lt', 'Lithuanian', 1);

TRUNCATE script CASCADE;

INSERT INTO script (id, isocode, isonumber, name, frequency)
- VALUES (1, 'Ugar', '040', 'Ugaritic', 2);
+ VALUES (1, 'Ugar', '040', 'Ugaritic', 2),
+ (2, 'Hebr', '125', 'Hebrew', 4);

TRUNCATE label_type CASCADE;

@@ -462,6 +466,7 @@
ALTER SEQUENCE artist_id_seq RESTART 10;
ALTER SEQUENCE artist_credit_id_seq RESTART 5;
ALTER SEQUENCE label_id_seq RESTART 4;
+ALTER SEQUENCE medium_id_seq RESTART 7;
ALTER SEQUENCE recording_id_seq RESTART 18;
ALTER SEQUENCE release_id_seq RESTART 4;
ALTER SEQUENCE release_group_id_seq RESTART 5;
@@ -477,6 +482,8 @@

ALTER SEQUENCE artist_alias_id_seq RESTART 8;
ALTER SEQUENCE label_alias_id_seq RESTART 8;
+ALTER SEQUENCE track_id_seq RESTART 20;
+ALTER SEQUENCE medium_id_seq RESTART 7;

ALTER SEQUENCE tag_id_seq RESTART 100;

Modified: mb_server/trunk/lib/MusicBrainz/Server/Constants.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Constants.pm 2009-11-08 14:43:39 UTC (rev 12290)
+++ mb_server/trunk/lib/MusicBrainz/Server/Constants.pm 2009-11-08 16:37:14 UTC (rev 12291)
@@ -75,12 +75,13 @@

Readonly our $EDIT_MEDIUM_CREATE => 51;
Readonly our $EDIT_MEDIUM_EDIT => 52;
+Readonly our $EDIT_MEDIUM_DELETE => 53;

Readonly our $EDIT_TRACK_EDIT => 62;

Readonly our $EDIT_RECORDING_ADD_ANNOTATION => 75;

-
+Readonly our $EDIT_TRACKLIST_CREATE => 81;
Readonly our $EDIT_TRACKLIST_ADDTRACK => 85;
Readonly our $EDIT_TRACKLIST_DELETETRACK => 86;

Modified: mb_server/trunk/lib/MusicBrainz/Server/Controller/Release.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Controller/Release.pm 2009-11-08 14:43:39 UTC (rev 12290)
+++ mb_server/trunk/lib/MusicBrainz/Server/Controller/Release.pm 2009-11-08 16:37:14 UTC (rev 12291)
@@ -15,7 +15,16 @@
use MusicBrainz::Server::Adapter qw(Google);
use MusicBrainz::Server::Controller::TagRole;

-use MusicBrainz::Server::Constants qw( $EDIT_RELEASE_EDIT );
+use MusicBrainz::Server::Constants qw(
+ $EDIT_RELEASE_EDIT
+ $EDIT_TRACK_EDIT
+ $EDIT_TRACKLIST_DELETETRACK
+ $EDIT_TRACKLIST_ADDTRACK
+ $EDIT_TRACKLIST_CREATE
+ $EDIT_MEDIUM_CREATE
+ $EDIT_MEDIUM_DELETE
+ $EDIT_MEDIUM_EDIT
+);

# A duration lookup has to match within this many milliseconds
use constant DURATION_LOOKUP_RANGE => 10000;
@@ -317,22 +326,117 @@

my $form = $c->form(form => 'Release', init_object => $release);
if ($c->form_posted && $form->submitted_and_valid($c->req->params)) {
- my %args = map { $_ => $form->field($_)->value }
- qw( name comment packaging_id status_id script_id language_id
- country_id barcode artist_credit date );
-
- my $edit = $c->model('Edit')->create(
- edit_type => $EDIT_RELEASE_EDIT,
- editor_id => $c->user->id,
+ my $release_edit = $self->_create_edit($c, $EDIT_RELEASE_EDIT,
+ $form => [qw( name comment packaging_id status_id script_id language_id
+ country_id barcode artist_credit date )],
release => $release,
- %args
- );
+ ),

+ my %track_id = map { $_->id => $_ } @tracks;
+ my %medium_id = map { $_->id => $_ } @mediums;
+
+ for my $medium_field ($form->field('mediums')->fields) {
+ # Editing mediums
+ # First check if we need to create a new tracklist
+ my $tracklist_id = $medium_field->field('tracklist')->field('id')->value;
+
+ # Editing tracks
+ for my $track_field ($medium_field->field('tracklist')->field('tracks')->fields) {
+ if ($track_field->field('id')->has_value) {
+ my $track = $track_id{ $track_field->field('id')->value };
+ if ($track_field->field('deleted')->value) {
+ $c->model('Edit')->create(
+ editor_id => $c->user->id,
+ edit_type => $EDIT_TRACKLIST_DELETETRACK,
+ track_id => $track->id
+ );
+ }
+ else {
+ # Editing an existing track
+ $self->_create_edit($c, $EDIT_TRACK_EDIT,
+ $track_field => [qw( position name artist_credit )],
+ track => $track,
+ );
+ }
+ }
+ elsif ($tracklist_id) {
+ # We are creating a new track (and not a new tracklist)
+ $self->_create_edit($c, $EDIT_TRACKLIST_ADDTRACK,
+ $track_field => [qw( position name artist_credit )],
+ tracklist_id => $tracklist_id,
+ );
+ }
+ }
+
+ my $has_tracks = $medium_field->field('tracklist')->field('tracks')->has_fields;
+ if(!$tracklist_id && $has_tracks) {
+ # We have some tracks but no tracklist ID - so create a new tracklist
+ my @tracks = map { +{
+ name => $_->field('name')->value,
+ position => $_->field('position')->value,
+ artist_credit => $_->field('artist_credit')->value,
+ } } $medium_field->field('tracklist')->field('tracks')->fields;
+
+ my $create_tl = $c->model('Edit')->create(
+ editor_id => $c->user->id,
+ edit_type => $EDIT_TRACKLIST_CREATE,
+ tracks => \@tracks,
+ );
+
+ $tracklist_id = $create_tl->tracklist_id;
+ }
+
+ if($medium_field->field('id')->has_value) {
+ my $medium = $medium_id{ $medium_field->field('id')->value };
+ # Edit existing medium
+ if($medium_field->field('deleted')->value) {
+ $c->model('Edit')->create(
+ editor_id => $c->user->id,
+ edit_type => $EDIT_MEDIUM_DELETE,
+ medium_id => $medium->id
+ );
+ }
+ else {
+ $self->_create_edit(
+ $c, $EDIT_MEDIUM_EDIT,
+ $medium_field => [qw( name format_id position )],
+ medium => $medium
+ );
+ }
+ }
+ else {
+ # Create a new medium
+ $self->_create_edit($c, $EDIT_MEDIUM_CREATE,
+ $medium_field => [qw( name format_id position )],
+ tracklist_id => $tracklist_id,
+ release_id => $release->id
+ );
+ }
+ }
+
$c->response->redirect($c->uri_for_action('/release/show', [ $release->gid ]));
$c->detach;
}
}

+sub _create_edit {
+ my ($self, $c, $type, $parent, $fields, %extra) = @_;
+
+ my %args = map { $_ => $parent->field($_)->value }
+ grep { $parent->field($_)->has_value }
+ @$fields;
+
+ return unless %args;
+
+ $args{$_} = $extra{$_} for keys %extra;
+
+ $c->model('Edit')->create(
+ edit_type => $type,
+ editor_id => $c->user->id,
+ %args,
+ );
+}
+
=head2 duplicate

Duplicate a release into the add release editor

Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/Tracklist.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/Tracklist.pm 2009-11-08 14:43:39 UTC (rev 12290)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/Tracklist.pm 2009-11-08 16:37:14 UTC (rev 12291)
@@ -2,6 +2,7 @@

use Moose;
use MusicBrainz::Server::Entity::Tracklist;
+use MusicBrainz::Server::Data::Utils qw( load_subobjects placeholders );

extends 'MusicBrainz::Server::Data::Entity';

@@ -29,6 +30,34 @@
$sql->do($query, $offset, $start_position, $tracklist_id);
}

+sub insert
+{
+ my ($self, $tracks) = @_;
+ my $sql = Sql->new($self->c->dbh);
+ my $id = $sql->insert_row('tracklist', { trackcount => 0 }, 'id');
+ my @tracks = @$tracks;
+ $_->{tracklist} = $id for @tracks;
+ $self->c->model('Track')->insert(@tracks);
+ my $class = $self->_entity_class;
+ return $class->new( id => $id );
+}
+
+sub delete
+{
+ my ($self, @tracklist_ids) = @_;
+ my $sql = Sql->new($self->c->dbh);
+ my $query = 'DELETE FROM track WHERE tracklist IN (' . placeholders(@tracklist_ids). ')';
+ $sql->do($query, @tracklist_ids);
+ $query = 'DELETE FROM tracklist WHERE id IN ('. placeholders(@tracklist_ids) . ')';
+ $sql->do($query, @tracklist_ids);
+}
+
+sub load
+{
+ my ($self, @objs) = @_;
+ load_subobjects($self, 'tracklist', @objs);
+}
+
__PACKAGE__->meta->make_immutable;
no Moose;
1;

Modified: mb_server/trunk/lib/MusicBrainz/Server/Edit/Tracklist/AddTrack.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Edit/Tracklist/AddTrack.pm 2009-11-08 14:43:39 UTC (rev 12290)
+++ mb_server/trunk/lib/MusicBrainz/Server/Edit/Tracklist/AddTrack.pm 2009-11-08 16:37:14 UTC (rev 12291)
@@ -83,6 +83,8 @@
$self->track_id(delete $hash->{track_id});
};

+sub _xml_arguments { ForceArray => [ 'artist_credit' ] }
+
__PACKAGE__->meta->make_immutable;
no Moose;

Modified: mb_server/trunk/lib/MusicBrainz/Server/EditRegistry.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/EditRegistry.pm 2009-11-08 14:43:39 UTC (rev 12290)
+++ mb_server/trunk/lib/MusicBrainz/Server/EditRegistry.pm 2009-11-08 16:37:14 UTC (rev 12291)
@@ -21,6 +21,7 @@
MusicBrainz::Server::Edit::Label::Edit
MusicBrainz::Server::Edit::Label::Merge
MusicBrainz::Server::Edit::Medium::Create
+ MusicBrainz::Server::Edit::Medium::Delete
MusicBrainz::Server::Edit::Medium::Edit
MusicBrainz::Server::Edit::Recording::AddAnnotation
MusicBrainz::Server::Edit::Relationship::Edit
@@ -35,6 +36,7 @@
MusicBrainz::Server::Edit::ReleaseGroup::Merge
MusicBrainz::Server::Edit::Track::Edit
MusicBrainz::Server::Edit::Tracklist::AddTrack
+ MusicBrainz::Server::Edit::Tracklist::Create
MusicBrainz::Server::Edit::Tracklist::DeleteTrack
MusicBrainz::Server::Edit::WikiDoc::Change
MusicBrainz::Server::Edit::Work::AddAnnotation

Modified: mb_server/trunk/lib/MusicBrainz/Server/Form/Release.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Form/Release.pm 2009-11-08 14:43:39 UTC (rev 12290)
+++ mb_server/trunk/lib/MusicBrainz/Server/Form/Release.pm 2009-11-08 16:37:14 UTC (rev 12291)
@@ -18,7 +18,6 @@

has_field 'artist_credit' => (
type => '+MusicBrainz::Server::Form::Field::ArtistCredit',
- required => 1,
);

has_field 'barcode' => (
@@ -54,14 +53,23 @@
has_field 'labels.deleted' => ( type => 'Checkbox' );
has_field 'labels.label_id' => ( type => 'Text' );

-has_field 'mediums' => ( type => 'Repeatable' );
+has_field 'mediums' => (
+ num_when_empty => 0,
+ type => 'Repeatable'
+);
+has_field 'mediums.id' => ( type => 'Integer' );
has_field 'mediums.name' => ( type => 'Text' );
-has_field 'mediums.remove' => ( type => 'Checkbox' );
+has_field 'mediums.deleted' => ( type => 'Checkbox' );
has_field 'mediums.format_id' => ( type => 'Select' );
has_field 'mediums.position' => ( type => 'Integer' );

has_field 'mediums.tracklist' => ( type => 'Compound' );
-has_field 'mediums.tracklist.tracks' => ( type => 'Repeatable' );
+has_field 'mediums.tracklist.id' => ( type => 'Integer' );
+has_field 'mediums.tracklist.tracks' => (
+ num_when_empty => 0,
+ type => 'Repeatable'
+);
+has_field 'mediums.tracklist.tracks.id' => ( type => 'Integer' );
has_field 'mediums.tracklist.tracks.position' => ( type => 'Integer' );
has_field 'mediums.tracklist.tracks.name' => ( type => 'Text' );
has_field 'mediums.tracklist.tracks.artist_credit' => ( type => '+MusicBrainz::Server::Form::Field::ArtistCredit' );

Modified: mb_server/trunk/t/data_tracklist.t
===================================================================
--- mb_server/trunk/t/data_tracklist.t 2009-11-08 14:43:39 UTC (rev 12290)
+++ mb_server/trunk/t/data_tracklist.t 2009-11-08 16:37:14 UTC (rev 12291)
@@ -45,4 +45,30 @@
is($tracklist1->tracks->[6]->position, 8);
}, $sql);

+my $tracklist = $tracklist_data->insert([{
+ name => 'Track 1',
+ position => 1,
+ artist_credit => 1,
+ recording => 1
+}, {
+ name => 'Track 2',
+ position => 2,
+ artist_credit => 1,
+ recording => 2
+}]);
+isa_ok($tracklist, 'MusicBrainz::Server::Entity::Tracklist');
+
+$tracklist = $tracklist_data->get_by_id($tracklist->id);
+$track_data->load_for_tracklists($tracklist);
+is($tracklist->track_count, 2);
+is($tracklist->all_tracks, 2);
+is($tracklist->tracks->[0]->name, 'Track 1');
+is($tracklist->tracks->[0]->position, 1);
+is($tracklist->tracks->[0]->artist_credit_id, 1);
+is($tracklist->tracks->[0]->recording_id, 1);
+is($tracklist->tracks->[1]->name, 'Track 2');
+is($tracklist->tracks->[1]->position, 2);
+is($tracklist->tracks->[1]->artist_credit_id, 1);
+is($tracklist->tracks->[1]->recording_id, 2);
+
done_testing;

_______________________________________________
MusicBrainz-commits mailing list
MusicBrainz-commits@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-commits

From forum: musicbrainz-commits

r12290 - mb_server/trunk/admin

2009-11-08T06:43:40Z

Author: warp
Date: 2009-11-08 14:43:39 +0000 (Sun, 08 Nov 2009)
New Revision: 12290

Modified:
mb_server/trunk/admin/InitDb.pl
Log:
Merge branch 'initdb'

Modified: mb_server/trunk/admin/InitDb.pl
===================================================================
--- mb_server/trunk/admin/InitDb.pl 2009-11-06 11:52:13 UTC (rev 12289)
+++ mb_server/trunk/admin/InitDb.pl 2009-11-08 14:43:39 UTC (rev 12290)
@@ -19,7 +19,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
-# $Id$
+# $Id: InitDb.pl 12153 2009-09-24 23:08:08Z robert $
#____________________________________________________________________________

use FindBin;
@@ -101,7 +101,7 @@

chomp($sharedir);

- open(SCRIPT, "$sharedir/contrib/$ext") or die;
+ open(SCRIPT, "$sharedir/contrib/$ext") or die "Cannot open $sharedir/contrib/$ext";
local $/;
my $sql = <SCRIPT>;
close(SCRIPT);

_______________________________________________
MusicBrainz-commits mailing list
MusicBrainz-commits@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-commits

From forum: musicbrainz-commits

Re: [mb-bugs] [MusicBrainz Bug Tracker] #5487: Missing dependancies in Makefile.PL

2009-11-08T06:22:22Z

#5487: Missing dependancies in Makefile.PL
---------------------------------+------------------------------------------
Reporter: kuno | Owner: acid2
Type: bug | Status: assigned
Priority: normal | Milestone: Server: NGS (Release)
Component: MusicBrainz Server | Version:
Resolution: | Keywords:
Os: Linux | Browser:
---------------------------------+------------------------------------------
Changes (by acid2):

* owner: => acid2
* status: new => assigned

--
Ticket URL: <http://bugs.musicbrainz.org/ticket/5487#comment:1>
MusicBrainz Bug Tracker <http://musicbrainz.org>
MusicBrainz -- the music metadatabase
_______________________________________________
Musicbrainz-bugs mailing list
Musicbrainz-bugs@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-bugs

From forum: musicbrainz-bugs

Re: Autoeditor Election: Matachin

2009-11-08T03:14:45Z

2009/11/8 Chad Wilson <chad.wilson@...>:
> Has someone talked to Matachin about whether they are actually
> interested in becoming an AutoEditor, and whether they understand what
> comes along with that?

Pablo mainly edits spanish and galician artists, i'm subscribed to his
edits a long time ago and, in fact, last March I've talked with him
around the idea of being an AutoEditor.

But my personal affaires made me to postpone the nomination, also
hoping an increased number of edits.

IMO, as spanish-spoken editor, we need more editors who may work with
the Spanish Releases, and Pablo "Matachin" is a good candidate.

_______________________________________________
MusicBrainz-automods mailing list
MusicBrainz-automods@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-automods

From forum: MusicBrainz - Automods

[mb-bugs] [MusicBrainz Bug Tracker] #5487: Missing dependancies in Makefile.PL

2009-11-07T23:41:18Z

#5487: Missing dependancies in Makefile.PL
--------------------------------+-------------------------------------------
Reporter: kuno | Owner:
Type: bug | Status: new
Priority: normal | Milestone: Server: NGS (Release)
Component: MusicBrainz Server | Version:
Keywords: | Os: Linux
Browser: |
--------------------------------+-------------------------------------------
Catalyst::Restarter
UNIVERSAL::require
Email::Send

Based on the name I expect Catalyst::Restarter is only needed when running
mb as "./script/musicbrainz_server.pl -r", which would be 'recommends'
instead of 'requires'.

--
Ticket URL: <http://bugs.musicbrainz.org/ticket/5487>
MusicBrainz Bug Tracker <http://musicbrainz.org>
MusicBrainz -- the music metadatabase
_______________________________________________
Musicbrainz-bugs mailing list
Musicbrainz-bugs@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-bugs

From forum: musicbrainz-bugs

Re: Autoeditor Election: Matachin

2009-11-07T22:43:56Z

I don't know if drsaunde has talked to Matachin or not, but he did come in to IRC briefly to say the following:

"Hello everyone, I just wanted to say for my autoeditor nomination, my comments will have to come Sunday night or Monday, I guess I should have remembered the long delay between the nomination and being able to post a comment on nabble and I have to leave town now, sorry."

http://chatlogs.musicbrainz.org/musicbrainz/2009/2009-11/2009-11-07.html#T14-28-52-128322

Pavan Chander // navap

On Sat, Nov 7, 2009 at 9:48 PM, Chad Wilson <chad.wilson@...> wrote:

The Returning Officer wrote:
> Voting in this election is now open:
>

> Candidate: Matachin
> http://musicbrainz.org/show/user/?userid=316584
> Proposer: drsaunde
> http://musicbrainz.org/show/user/?userid=224057

> Seconder: gfmorris
> http://musicbrainz.org/show/user/?userid=90618
> Seconder: KRSCuan
> http://musicbrainz.org/show/user/?userid=333050
>
> * Voting will now remain open for the next 1 week

> * Alternatively, drsaunde may withdraw the proposal
>
> Please participate:
> http://musicbrainz.org/user/election/show.html?id=192
>

Has someone talked to Matachin about whether they are actually
interested in becoming an AutoEditor, and whether they understand what
comes along with that?

Chad

_______________________________________________
MusicBrainz-automods mailing list
MusicBrainz-automods@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-automods

_______________________________________________
MusicBrainz-automods mailing list
MusicBrainz-automods@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-automods

From forum: MusicBrainz - Automods

Re: [mb-bugs] [MusicBrainz Bug Tracker] #5485: Error

2009-11-07T18:59:05Z

#5485: Error
---------------------------------+------------------------------------------
Reporter: Toby Whaymand | Owner:
Type: bug | Status: closed
Priority: normal | Milestone:
Component: MusicBrainz Server | Version:
Resolution: invalid | Keywords:
Os: Linux | Browser:
---------------------------------+------------------------------------------
Comment (by voiceinsideyou):

I think you possible misunderstand what MusicBrainz is about. This is
neither an official band website, nor a label propaganda/marketing
machine, nor a free-text Wikipedia. We don't capture every piece of data
about a band, and no single person (e.g. the "creator") has more rights
over the data than another. It is not "your" Donkeyboy page, for instance.

MusicBrainz mainly captures objective (as much as possible) structured
discographical data about bands. There is no "is similar to" relationship,
although you can use tags to tag genre names against a band as a means of
reflecting this.

--
Ticket URL: <http://bugs.musicbrainz.org/ticket/5485#comment:2>
MusicBrainz Bug Tracker <http://musicbrainz.org>
MusicBrainz -- the music metadatabase
_______________________________________________
Musicbrainz-bugs mailing list
Musicbrainz-bugs@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-bugs

From forum: musicbrainz-bugs

Re: [mb-bugs] [MusicBrainz Bug Tracker] #5485: Error

2009-11-07T18:50:25Z

From forum: musicbrainz-bugs

Re: Autoeditor Election: Matachin

2009-11-07T18:48:52Z

The Returning Officer wrote:

> Voting in this election is now open:
>
> Candidate: Matachin
> http://musicbrainz.org/show/user/?userid=316584
> Proposer: drsaunde
> http://musicbrainz.org/show/user/?userid=224057
> Seconder: gfmorris
> http://musicbrainz.org/show/user/?userid=90618
> Seconder: KRSCuan
> http://musicbrainz.org/show/user/?userid=333050
>
> * Voting will now remain open for the next 1 week
> * Alternatively, drsaunde may withdraw the proposal
>
> Please participate:
> http://musicbrainz.org/user/election/show.html?id=192
>

Has someone talked to Matachin about whether they are actually
interested in becoming an AutoEditor, and whether they understand what
comes along with that?

Chad

_______________________________________________
MusicBrainz-automods mailing list
MusicBrainz-automods@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-automods

From forum: MusicBrainz - Automods

Re: [mb-bugs] [MusicBrainz Bug Tracker] #3807: Option to change Data Quality to Default in a batch edit missing

2009-11-07T15:53:55Z

#3807: Option to change Data Quality to Default in a batch edit missing
---------------------------------+------------------------------------------
Reporter: Time Dilation | Owner:
Type: bug | Status: new
Priority: normal | Milestone:
Component: MusicBrainz Server | Version: Server 2009-05-24
Resolution: | Keywords: data quality, batch edit
Os: Windows XP | Browser: Netscape, Firefox, Mozilla (Gecko)
---------------------------------+------------------------------------------
Changes (by nikki):

* summary: Option to change Data Quality from Low to Default in a batch
edit missing => Option to change Data Quality
to Default in a batch edit missing

Comment:

has duplicate #5486

--
Ticket URL: <http://bugs.musicbrainz.org/ticket/3807#comment:2>
MusicBrainz Bug Tracker <http://musicbrainz.org>
MusicBrainz -- the music metadatabase
_______________________________________________
Musicbrainz-bugs mailing list
Musicbrainz-bugs@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-bugs

From forum: musicbrainz-bugs

Re: [mb-bugs] [MusicBrainz Bug Tracker] #5486: Default not available when batch changing release quality

2009-11-07T15:53:11Z

#5486: Default not available when batch changing release quality
---------------------------------+------------------------------------------
Reporter: nikki | Owner:
Type: bug | Status: closed
Priority: normal | Milestone:
Component: MusicBrainz Server | Version: Server 2009-05-24
Resolution: duplicate | Keywords:
Os: | Browser:
---------------------------------+------------------------------------------
Changes (by nikki):

* status: new => closed
* resolution: => duplicate

Comment:

hmm. didn't see that one, thanks.

--
Ticket URL: <http://bugs.musicbrainz.org/ticket/5486#comment:2>
MusicBrainz Bug Tracker <http://musicbrainz.org>
MusicBrainz -- the music metadatabase
_______________________________________________
Musicbrainz-bugs mailing list
Musicbrainz-bugs@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-bugs

From forum: musicbrainz-bugs

Re: [mb-bugs] [MusicBrainz Bug Tracker] #5486: Default not available when batch changing release quality

2009-11-07T15:42:27Z

#5486: Default not available when batch changing release quality
---------------------------------+------------------------------------------
Reporter: nikki | Owner:
Type: bug | Status: new
Priority: normal | Milestone:
Component: MusicBrainz Server | Version: Server 2009-05-24
Resolution: | Keywords:
Os: | Browser:
---------------------------------+------------------------------------------
Comment (by Time Dilation):

Same as [http://bugs.musicbrainz.org/ticket/3807 this] right?

--
Ticket URL: <http://bugs.musicbrainz.org/ticket/5486#comment:1>
MusicBrainz Bug Tracker <http://musicbrainz.org>
MusicBrainz -- the music metadatabase
_______________________________________________
Musicbrainz-bugs mailing list
Musicbrainz-bugs@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-bugs

From forum: musicbrainz-bugs

[mb-bugs] [MusicBrainz Bug Tracker] #5486: Default not available when batch changing release quality

2009-11-07T12:26:46Z

#5486: Default not available when batch changing release quality
--------------------------------+-------------------------------------------
Reporter: nikki | Owner:
Type: bug | Status: new
Priority: normal | Milestone:
Component: MusicBrainz Server | Version: Server 2009-05-24
Keywords: | Os:
Browser: |
--------------------------------+-------------------------------------------
The only available options on the screen for batch changing release
quality are "high" and "low", there's no option for "default".

--
Ticket URL: <http://bugs.musicbrainz.org/ticket/5486>
MusicBrainz Bug Tracker <http://musicbrainz.org>
MusicBrainz -- the music metadatabase
_______________________________________________
Musicbrainz-bugs mailing list
Musicbrainz-bugs@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-bugs

From forum: musicbrainz-bugs

[mb-bugs] [MusicBrainz Bug Tracker] #5485: Error

2009-11-07T11:53:59Z

#5485: Error
---------------------------+------------------------------------------------
Reporter: Toby Whaymand | Type: bug
Status: new | Priority: normal
Milestone: | Component: MusicBrainz Server
Version: | Keywords:
Os: Linux | Browser:
---------------------------+------------------------------------------------
I don't seem to be able to add slimier bands to my Donkeyboy page... The
is a likeness between DB and PHOENIX

Considering I created the Donkeyboy page I feel that I should have full
control over it. I will be a member for two weeks come tomorrow.. it does
seem unreasonable. If the person actually created the page in the first
place. - with sounding rude.

Thanks

Toby :)

--
Ticket URL: <http://bugs.musicbrainz.org/ticket/5485>
MusicBrainz Bug Tracker <http://musicbrainz.org>
MusicBrainz -- the music metadatabase
_______________________________________________
Musicbrainz-bugs mailing list
Musicbrainz-bugs@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-bugs

From forum: musicbrainz-bugs

Autoeditor Election: Matachin

2009-11-07T06:30:01Z

Voting in this election is now open:

Candidate: Matachin
http://musicbrainz.org/show/user/?userid=316584
Proposer: drsaunde
http://musicbrainz.org/show/user/?userid=224057
Seconder: gfmorris
http://musicbrainz.org/show/user/?userid=90618
Seconder: KRSCuan
http://musicbrainz.org/show/user/?userid=333050

* Voting will now remain open for the next 1 week
* Alternatively, drsaunde may withdraw the proposal

Please participate:
http://musicbrainz.org/user/election/show.html?id=192

_______________________________________________
MusicBrainz-automods mailing list
MusicBrainz-automods@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-automods

From forum: MusicBrainz - Automods

Autoeditor Election: Matachin

2009-11-07T06:23:48Z

A new candidate has been put forward for autoeditor status:

Candidate: Matachin
http://musicbrainz.org/show/user/?userid=316584
Proposer: drsaunde
http://musicbrainz.org/show/user/?userid=224057

* If two seconders are found within 1 week, voting will begin
* Otherwise, the proposal will automatically be rejected
* Alternatively, drsaunde may withdraw the proposal

Please participate:
http://musicbrainz.org/user/election/show.html?id=192

_______________________________________________
MusicBrainz-automods mailing list
MusicBrainz-automods@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-automods

From forum: MusicBrainz - Automods

Re: [mb-bugs] [MusicBrainz Bug Tracker] #5484: plugin not working in snowleopard picard 0.11

2009-11-07T00:10:25Z

#5484: plugin not working in snowleopard picard 0.11
-------------------------------------------------+--------------------------
Reporter: ace.neerav | Owner: EmbeddedTim
Type: bug | Status: closed
Priority: normal | Milestone:
Component: Picard Tagger (Mac OS X Packaging) | Version: Picard 0.11
Resolution: invalid | Keywords: plugin, mac os x, snow leopard, 0.11
Os: Mac OS X | Browser: Safari, Konqueror (KHTML/Webkit)
-------------------------------------------------+--------------------------
Changes (by voiceinsideyou):

* status: reopened => closed
* resolution: => invalid

Comment:

Please discuss your issues on the forums or "Users" mailing lists, not on
the bug tracker. This is not the correct place to get get help with using
Picard.

And no, it is not possible to only add album art without also tagging your
files with new metadata.

--
Ticket URL: <http://bugs.musicbrainz.org/ticket/5484#comment:4>
MusicBrainz Bug Tracker <http://musicbrainz.org>
MusicBrainz -- the music metadatabase
_______________________________________________
Musicbrainz-bugs mailing list
Musicbrainz-bugs@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-bugs

From forum: musicbrainz-bugs

Re: [mb-bugs] [MusicBrainz Bug Tracker] #4254: Existing PUID not found on some sound files

2009-11-06T16:18:52Z

#4254: Existing PUID not found on some sound files
----------------------------+-----------------------------------------------
Reporter: jesus2099 | Owner: outsidecontext
Type: bug | Status: reopened
Priority: normal | Milestone: Picard 0.12
Component: Picard Tagger | Version: Picard 0.11
Resolution: | Keywords: picard, puid, bug, genpuid, regression, lookup, analyze
Os: Windows XP | Browser:
----------------------------+-----------------------------------------------
Comment (by BrianFreud):

That last file (01 Khúc nguyện hồn.mp3) also does not generate a PUID in
linux, unlike the others.

(Side issue, I wonder what exact command you're using to invoke lame? I
know 3.97 had some issues with length in the xing vbr field not being
written correctly;
http://www.hydrogenaudio.org/forums/lofiversion/index.php/t58069.html ,
etc.).

genPUID does correctly report 8fe9e9a9-5dbc-e0b4-8997-8f4e02c16ba1 for
this file, and as far as I can tell from various diagnostic utils, the
file's mp3 and id3 frames all look ok. I can't say why this one fails in
Picard, even on linux (unlike those others that at least fingerprinted
correctly in Linux, if not Windows).

--
Ticket URL: <http://bugs.musicbrainz.org/ticket/4254#comment:27>
MusicBrainz Bug Tracker <http://musicbrainz.org>
MusicBrainz -- the music metadatabase
_______________________________________________
Musicbrainz-bugs mailing list
Musicbrainz-bugs@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-bugs

From forum: musicbrainz-bugs

Re: Review board troubles

2009-11-06T13:28:42Z

On Nov 5, 2009, at 11:49 PM, Lukáš Lalinský wrote:

> On Fri, Nov 6, 2009 at 1:21 AM, Robert Kaye <rob@...> wrote:
>> I've tried to post the attached diff as an update to review 451,
>> but it
>> fails silently. When I try to create a new review it fails with:
>>
>> "The file '/mb_server/trunk/lib/MusicBrainz/Server/Data/
>> ReleaseGroup.pm'
>> (r12276) could not be found in the repository"
>>
>> That file is present in that rev, so I'm outta ideas what could be
>> wrong.
>> Anyone have an idea?
>
> Works for me. You have to select:
>
> Repository: MusicBrainz Server SVN
> Base directory: /trunk

Hmm, ok. Thanks for submitting it.

--

--ruaok The answer to whether or not something is a good idea
or not, should not be taken as an indication of whether I want to do it.

Robert Kaye -- rob@... -- http://mayhem-chaos.net

_______________________________________________
MusicBrainz-devel mailing list
MusicBrainz-devel@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-devel

From forum: Musicbrainz - Devel

r12289 - in search_server/branches/ngs/servlet: . src/main/java/org/musicbrainz/search/servlet/mmd2 src/test/java/org/musicbrainz/search/servlet

2009-11-06T03:52:14Z

Author: ijabz
Date: 2009-11-06 11:52:13 +0000 (Fri, 06 Nov 2009)
New Revision: 12289

Modified:
search_server/branches/ngs/servlet/pom.xml
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ResultsWriter.java
search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindArtistTest.java
Log:
JSON now uses natural mapping rather than mapped mapping, this removes @ from output of attributes. Requires jaxb 2.1.12 at runtime (version of jaxb in Java 6 is too old) so modified pom.xml accordingly.

Modified: search_server/branches/ngs/servlet/pom.xml
===================================================================
--- search_server/branches/ngs/servlet/pom.xml 2009-11-04 21:00:01 UTC (rev 12288)
+++ search_server/branches/ngs/servlet/pom.xml 2009-11-06 11:52:13 UTC (rev 12289)
@@ -66,7 +66,6 @@
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.1.12</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>

Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ResultsWriter.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ResultsWriter.java 2009-11-04 21:00:01 UTC (rev 12288)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ResultsWriter.java 2009-11-06 11:52:13 UTC (rev 12289)
@@ -42,6 +42,7 @@

import com.sun.jersey.api.json.JSONJAXBContext;
import com.sun.jersey.api.json.JSONMarshaller;
+import com.sun.jersey.api.json.JSONConfiguration;

public abstract class ResultsWriter extends org.musicbrainz.search.servlet.ResultsWriter {

@@ -74,7 +75,8 @@

private static JSONJAXBContext initJsonContext() {
try {
- return new JSONJAXBContext("org.musicbrainz.mmd2");
+ return new JSONJAXBContext(JSONConfiguration.natural().build(),
+ "org.musicbrainz.mmd2");
}
catch (JAXBException ex) {
//Unable to initilize jaxb context, should never happen

Modified: search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindArtistTest.java
===================================================================
--- search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindArtistTest.java 2009-11-04 21:00:01 UTC (rev 12288)
+++ search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindArtistTest.java 2009-11-06 11:52:13 UTC (rev 12289)
@@ -294,8 +294,7 @@

String output = sw.toString();
System.out.println("Xml is" + output);
- //assertTrue(output.contains("<artist id=\"4302e264-1cf0-4d1f-aca7-2a6f89e34b36\"")); group comes before id in output
- //assertTrue(output.contains("<artist-list count=\"1\" offset=\"0\">")); offset comes before count in output
+ assertTrue(output.contains("id=\"4302e264-1cf0-4d1f-aca7-2a6f89e34b36\""));
assertTrue(output.contains("count=\"1\""));
assertTrue(output.contains("offset=\"0\""));
assertTrue(output.contains("type=\"group\""));
@@ -358,21 +357,32 @@
assertTrue(output.contains("<name>Echo & The Bunnymen</name>"));
}

+ /**

+ *
+ * @throws Exception
+ */
+ public void testOutputJson() throws Exception {

- public void testXmlWritingPerformance() throws Exception {
- Results res = ss.searchLucene("artist:\"Farming Incident\"", 0, 10);
- assertEquals(1, res.totalHits);
-
- Date start = new Date();
- org.musicbrainz.search.servlet.ResultsWriter writer = new ArtistMmd1XmlWriter();
+ Results res = ss.searchLucene("artist:\"Farming Incident\"", 0, 1);
+ ResultsWriter writer = new ArtistWriter();
StringWriter sw = new StringWriter();
PrintWriter pr = new PrintWriter(sw);
- for (int i = 0; i < 1000; i++) {
- writer.write(pr, res);
- }
+ writer.write(pr, res,SearchServerServlet.RESPONSE_JSON);
pr.close();
- Date end = new Date();
- System.out.println("XML - Time Taken: " + (end.getTime() - start.getTime()) + "ms");
+
+ String output = sw.toString();
+ System.out.println("Json is" + output);
+
+ assertTrue(output.contains("id\":\"4302e264-1cf0-4d1f-aca7-2a6f89e34b36\""));
+ assertTrue(output.contains("\"count\":1"));
+ assertTrue(output.contains("\"offset\":0,"));
+ assertTrue(output.contains("\"type\":\"group\""));
+ assertTrue(output.contains("name\":\"Farming Incident\""));
+ assertTrue(output.contains("\"sort-name\":\"Farming Incident\""));
+ assertTrue(output.contains("\"life-span\":{\"begin\":\"1999-04\"}"));
+ assertTrue(output.contains("\"country\":\"af\""));
+ assertTrue(output.contains("\"gender\":\"male\""));
}
+
}
\ No newline at end of file

_______________________________________________
MusicBrainz-commits mailing list
MusicBrainz-commits@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-commits

From forum: musicbrainz-commits

Re: [mb-bugs] [MusicBrainz Bug Tracker] #5484: plugin not working in snowleopard picard 0.11

2009-11-06T01:25:07Z

From forum: musicbrainz-bugs

Re: Review board troubles

2009-11-05T23:49:42Z

On Fri, Nov 6, 2009 at 1:21 AM, Robert Kaye <rob@...> wrote:
> I've tried to post the attached diff as an update to review 451, but it
> fails silently. When I try to create a new review it fails with:
>
> "The file '/mb_server/trunk/lib/MusicBrainz/Server/Data/ReleaseGroup.pm'
> (r12276) could not be found in the repository"
>
> That file is present in that rev, so I'm outta ideas what could be wrong.
> Anyone have an idea?

Works for me. You have to select:

Repository: MusicBrainz Server SVN
Base directory: /trunk

--
Lukas Lalinsky
lalinsky@...

_______________________________________________
MusicBrainz-devel mailing list
MusicBrainz-devel@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-devel

From forum: Musicbrainz - Devel

Re: [mb-bugs] [MusicBrainz Bug Tracker] #5484: plugin not working in snowleopard picard 0.11

2009-11-05T19:20:26Z

From forum: musicbrainz-bugs

Review board troubles

2009-11-05T16:21:23Z

I've tried to post the attached diff as an update to review 451, but
it fails silently. When I try to create a new review it fails with:

"The file '/mb_server/trunk/lib/MusicBrainz/Server/Data/
ReleaseGroup.pm' (r12276) could not be found in the repository"

That file is present in that rev, so I'm outta ideas what could be
wrong. Anyone have an idea?

--

--ruaok The answer to whether or not something is a good idea
or not, should not be taken as an indication of whether I want to do it.

Robert Kaye -- rob@... -- http://mayhem-chaos.net

_______________________________________________
MusicBrainz-devel mailing list
MusicBrainz-devel@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-devel

web_service_2.diff (35K) Download Attachment

From forum: Musicbrainz - Devel

Re: New URL relationship types

2009-11-05T13:09:07Z

On Nov 5, 2009, at 4:57 AM, Nigel Smith-Online wrote:

> Since more artists have official Facebook and Twitter accounts
> shouldn't these be made into defined URL types like MySpace and
> YouTube. At the moment Facebook and Twitter are just filed under
> 'online communities'

I would agree to this -- at the recent Future of Music Summit it
became clear that Facebook and Twitter are the prime promotion tools
that bands use to talk to their fans.

In IRC we discussed having a "X microblogs at Y" relationship to cover
these. Would anyone like to champion this idea and propose it to the
style list?

--

--ruaok The answer to whether or not something is a good idea
or not, should not be taken as an indication of whether I want to do it.

Robert Kaye -- rob@... -- http://mayhem-chaos.net

_______________________________________________
MusicBrainz-users mailing list
MusicBrainz-users@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-users

From forum: Musicbrainz - Users

Re: [mb-bugs] [MusicBrainz Bug Tracker] #4841: patched_MultiSpec_write function prevents iTunes SoundCheck tag from being read from shared music library

2009-11-05T10:22:22Z

From forum: musicbrainz-bugs

Re: [mb-bugs] [MusicBrainz Bug Tracker] #4841: patched_MultiSpec_write function prevents iTunes SoundCheck tag from being read from shared music library

2009-11-05T10:22:08Z

#4841: patched_MultiSpec_write function prevents iTunes SoundCheck tag from being
read from shared music library
---------------------------------+------------------------------------------
Reporter: paraquat@... | Owner: nxisgod
Type: bug | Status: reopened
Priority: normal | Milestone: Picard 0.12
Component: Picard Tagger | Version: Picard 0.11
Resolution: | Keywords:
Os: | Browser:
---------------------------------+------------------------------------------
Comment (by outsidecontext):

Thanks for the feedback. It sounds completely logical that the iTunNorm
tag is not in the metadata, since once you match a file to a track and
save it only the new metadata from the track will be saved. And as long as
you don't set the option to delete all existing tags that should leave the
existing tags untouched if they are not overwritten by the track metadata.

Without looking at the source I suppose this issue must be solved in
mutagen.

--
Ticket URL: <http://bugs.musicbrainz.org/ticket/4841#comment:7>
MusicBrainz Bug Tracker <http://musicbrainz.org>
MusicBrainz -- the music metadatabase
_______________________________________________
Musicbrainz-bugs mailing list
Musicbrainz-bugs@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-bugs

From forum: musicbrainz-bugs

Re: [mb-bugs] [MusicBrainz Bug Tracker] #4254: Existing PUID not found on some sound files

2009-11-05T08:22:48Z

#4254: Existing PUID not found on some sound files
----------------------------+-----------------------------------------------
Reporter: jesus2099 | Owner: outsidecontext
Type: bug | Status: reopened
Priority: normal | Milestone: Picard 0.12
Component: Picard Tagger | Version: Picard 0.11
Resolution: | Keywords: picard, puid, bug, genpuid, regression, lookup, analyze
Os: Windows XP | Browser:
----------------------------+-----------------------------------------------
Comment (by jesus2099):

Here is the file for manual PUID addition
[http://musicbrainz.org/show/edit/?editid=11388549 edit:11388549] :
[http://www.yousendit.com/download/TzY2U2V0Q1IzeUlLSkE9PQ 01 Khúc nguyện
hồn.mp3] (Picard 0.12beta2 + XP didn't find its PUID although no problem
with lossless rip of the same track).

Although, all other tracks from same album same encoding rip session
(foobar2000+lame3.97 vbr v4) worked.

--
Ticket URL: <http://bugs.musicbrainz.org/ticket/4254#comment:26>
MusicBrainz Bug Tracker <http://musicbrainz.org>
MusicBrainz -- the music metadatabase
_______________________________________________
Musicbrainz-bugs mailing list
Musicbrainz-bugs@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-bugs

From forum: musicbrainz-bugs

Re: New URL relationship types

2009-11-05T06:27:46Z

On Thu, Nov 5, 2009 at 4:57 AM, Nigel Smith-Online
<nigel.smith.01@...> wrote:
> Since more artists have official Facebook and Twitter accounts shouldn't
> these be made into defined URL types like MySpace and YouTube. At the
> moment Facebook and Twitter are just filed under 'online communities'

I agree. I think those have become popular enough, particularly
Facebook that creating a named attribute for it would make sense.

I have been categorizing Twitter as "blog" though.

> It would certainly make sense on our BBC artist pages to categorise the
> links better, i.e.
> http://www.bbc.co.uk/music/artists/72c536dc-7137-4477-a521-567eeb840fa8/links
>
> Thanks a lot
>
> Nigel (BBC_Nigel - http://musicbrainz.org/show/user/?username=BBC_Nigel)
>
> http://www.bbc.co.uk
> This e-mail (and any attachments) is confidential and may contain personal
> views which are not the views of the BBC unless specifically stated.
> If you have received it in error, please delete it from your system.
> Do not use, copy or disclose the information in any way nor act in reliance
> on it and notify the sender immediately.
> Please note that the BBC monitors e-mails sent or received.
> Further communication will signify your consent to this.
> _______________________________________________
> MusicBrainz-users mailing list
> MusicBrainz-users@...
> http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-users
>

_______________________________________________
MusicBrainz-users mailing list
MusicBrainz-users@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-users

From forum: Musicbrainz - Users

Re: [mb-bugs] [MusicBrainz Bug Tracker] #5484: plugin not working in snowleopard picard 0.11

2009-11-05T04:59:58Z

#5484: plugin not working in snowleopard picard 0.11
-------------------------------------------------+--------------------------
Reporter: ace.neerav | Owner: EmbeddedTim
Type: bug | Status: closed
Priority: normal | Milestone:
Component: Picard Tagger (Mac OS X Packaging) | Version: Picard 0.11
Resolution: invalid | Keywords: plugin, mac os x, snow leopard, 0.11
Os: Mac OS X | Browser: Safari, Konqueror (KHTML/Webkit)
-------------------------------------------------+--------------------------
Changes (by voiceinsideyou):

* priority: important => normal
* status: new => closed
* resolution: => invalid

Comment:

Hi there

The cover art plugin does not add an option to the right click menu, it
should just automatically work for any release which has cover art on
musicbrainz.org, automatically downloading that cover art.

As long as you have View > Cover Art ticked, it should also be visible in
the bottom right hand corner for any albums that have art on the website.

The particular release highlighted in your screenshot has cover art at
MB.org so once you enable the above option you should be able to see the
art before you save it to your files.

--
Ticket URL: <http://bugs.musicbrainz.org/ticket/5484#comment:1>
MusicBrainz Bug Tracker <http://musicbrainz.org>
MusicBrainz -- the music metadatabase
_______________________________________________
Musicbrainz-bugs mailing list
Musicbrainz-bugs@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-bugs

From forum: musicbrainz-bugs

New URL relationship types

2009-11-05T04:57:33Z

New URL relationship types

Since more artists have official Facebook and Twitter accounts shouldn't these be made into defined URL types like MySpace and YouTube. At the moment Facebook and Twitter are just filed under 'online communities'

It would certainly make sense on our BBC artist pages to categorise the links better, i.e.
http://www.bbc.co.uk/music/artists/72c536dc-7137-4477-a521-567eeb840fa8/links

Thanks a lot

Nigel (BBC_Nigel - http://musicbrainz.org/show/user/?username=BBC_Nigel)

http://www.bbc.co.uk
This e-mail (and any attachments) is confidential and may contain personal views which are not the views of the BBC unless specifically stated.
If you have received it in error, please delete it from your system.
Do not use, copy or disclose the information in any way nor act in reliance on it and notify the sender immediately.
Please note that the BBC monitors e-mails sent or received.
Further communication will signify your consent to this.
_______________________________________________
MusicBrainz-users mailing list
MusicBrainz-users@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-users

From forum: Musicbrainz - Users

[mb-bugs] [MusicBrainz Bug Tracker] #5484: plugin not working in snowleopard picard 0.11

2009-11-05T03:12:29Z

#5484: plugin not working in snowleopard picard 0.11
--------------------------------------------------+-------------------------
Reporter: ace.neerav | Owner: EmbeddedTim
Type: bug | Status: new
Priority: important | Milestone:
Component: Picard Tagger (Mac OS X Packaging) | Version: Picard 0.11
Keywords: plugin, mac os x, snow leopard, 0.11 | Os: Mac OS X
Browser: Safari, Konqueror (KHTML/Webkit) |
--------------------------------------------------+-------------------------
i have installed and enabled the cover art plugin. now when i right click
on the song and select plugin, nothing comes up!

--
Ticket URL: <http://bugs.musicbrainz.org/ticket/5484>
MusicBrainz Bug Tracker <http://musicbrainz.org>
MusicBrainz -- the music metadatabase
_______________________________________________
Musicbrainz-bugs mailing list
Musicbrainz-bugs@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-bugs

From forum: musicbrainz-bugs

Re: [mb-bugs] [MusicBrainz Bug Tracker] #3528: Picard cover art functionality setup/config confusing

2009-11-04T22:24:22Z

#3528: Picard cover art functionality setup/config confusing
-----------------------------+----------------------------------------------
Reporter: voiceinsideyou | Owner: outsidecontext
Type: enhancement | Status: assigned
Priority: normal | Milestone:
Component: Picard Tagger | Version: Picard 0.9.0
Resolution: | Keywords: cover art plugin picard
Os: | Browser:
-----------------------------+----------------------------------------------
Comment (by ace.neerav):

can someone tell me how to use this plugin. i have enabled it from options
but when i right click on a track and click plugin, it doesn't pop up
anything. i am on a mac os x snow leopard running picard 0.11. thanks.

Neerav

--
Ticket URL: <http://bugs.musicbrainz.org/ticket/3528#comment:29>
MusicBrainz Bug Tracker <http://musicbrainz.org>
MusicBrainz -- the music metadatabase
_______________________________________________
Musicbrainz-bugs mailing list
Musicbrainz-bugs@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-bugs

From forum: musicbrainz-bugs

Re: last.fm download links

2009-11-04T14:26:04Z

Pavan Chander skrev:
> I believe the "What Not To Link To" guideline refers to creating Artist or
> Release relationships like "discography at", "biography at", "fan site
> at", and in last.fm's case, not using the site as proof in an edit note.

I did that too until I was told a download link to last.fm was
unacceptable. That's why I suggest the wording should be changed.

I also noticed that http://musicbrainz.org/doc/WhatNotToLinkTo says "The
data submitted by the label companies are simply some numbers and the
permission to play their tracks.". That is clearly inaccurate or do anyone
really think last.fm have every single piece of music available so that if
some obscure band from Ukraine gives them permission they just say "Ok,
we'll just have to get the CD from our storage and rip it and then it will
be playable at our site.".

> You may be correct that some of the data is submitted by the artist/record
> company, but I certainly don't know what kind of data they may have added,
> and from what I can tell there is no precise way to determine the source
> of the data, so whether or not some of the data comes from an "official"
> source is irrelevant if I can't determine if *this* data did or not.

If the album is at least playable then the tune must have been uploaded
either by the artist or the label so that info you can trust. Non-playable
albums can come from some site last.fm cooperates with (MusicBrainz,
Amazon and iTunes I think).

> The only issue that I can see arising is if free downloads are provided on
> last.fm when the copyright holder has not given permission that they be
> released, I'm not too knowledgeable on how songs can be added for
> download, so someone else may have to chime in on that point.

Strictly speaking it is their problem. I don't think they have a pattern
matching system to automaticly determine if a track is a copyright
violation.

--
http://www.interface1.net

_______________________________________________
MusicBrainz-users mailing list
MusicBrainz-users@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-users

From forum: Musicbrainz - Users

r12288 - in search_server/branches/ngs/servlet: . src/main/java/org/musicbrainz/search/servlet src/main/java/org/musicbrainz/search/servlet/mmd1 src/main/java/org/musicbrainz/search/servlet/mmd2 src/main/java/org/musicbrainz/search/servlet/v1support src/main/resources src/test/java/org/musicbrainz/search/servlet

2009-11-04T13:00:01Z

Author: ijabz
Date: 2009-11-04 21:00:01 +0000 (Wed, 04 Nov 2009)
New Revision: 12288

Added:
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/V1TrackIndexField.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ArtistWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/LabelWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/RecordingWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ReleaseGroupWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ReleaseWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ResultsWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/WorkWriter.java
Removed:
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/AnnotationHtmlWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ArtistHtmlWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/CDStubHtmlWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/FreeDBHtmlWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/HtmlWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/LabelHtmlWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ReleaseGroupHtmlWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ReleaseHtmlWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/TrackHtmlWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/VelocityLogChute.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ArtistXmlWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/LabelXmlWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/RecordingXmlWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ReleaseGroupXmlWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ReleaseXmlWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/WorkXmlWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/XmlWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/v1support/V1TrackIndexField.java
search_server/branches/ngs/servlet/src/main/resources/annotation.html.vtl
search_server/branches/ngs/servlet/src/main/resources/artist.html.vtl
search_server/branches/ngs/servlet/src/main/resources/cdstub.html.vtl
search_server/branches/ngs/servlet/src/main/resources/freedb.html.vtl
search_server/branches/ngs/servlet/src/main/resources/label.html.vtl
search_server/branches/ngs/servlet/src/main/resources/release.html.vtl
search_server/branches/ngs/servlet/src/main/resources/releasegroup.html.vtl
search_server/branches/ngs/servlet/src/main/resources/track.html.vtl
Modified:
search_server/branches/ngs/servlet/pom.xml
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/AnnotationSearch.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ArtistSearch.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/CDStubSearch.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/FreeDBSearch.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/LabelSearch.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/RecordingQueryParser.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/RecordingSearch.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ReleaseGroupSearch.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ReleaseSearch.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ResultsWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServer.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServerServlet.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/WorkSearch.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/Mmd1XmlWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/ReleaseGroupMmd1XmlWriter.java
search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindAnnotationTest.java
search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindArtistTest.java
search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindFreeDBTest.java
search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindLabelTest.java
search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindRecordingTest.java
search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseGroupTest.java
search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseTest.java
search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindWorkTest.java
Log:
Added support for outputting as JSON (use fmt=json)
Remove support for outputtiong as html (and velocity)

Modified: search_server/branches/ngs/servlet/pom.xml
===================================================================
--- search_server/branches/ngs/servlet/pom.xml 2009-11-04 19:15:17 UTC (rev 12287)
+++ search_server/branches/ngs/servlet/pom.xml 2009-11-04 21:00:01 UTC (rev 12288)
@@ -20,6 +20,11 @@
<id>brainz-mmd-jaxb</id>
<url>http://brainz-mmd-jaxb.googlecode.com/svn/trunk/repo</url>
</repository>
+ <repository>
+ <id>maven2-repository.dev.java.net</id>
+ <name>Java.net Repository for Maven</name>
+ <url>http://download.java.net/maven/2/</url>
+ </repository>
</repositories>
<dependencies>
<dependency>
@@ -64,17 +69,17 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-json</artifactId>
+ <version>1.1.2-ea</version>
+ </dependency>
+ <dependency>
<groupId>org.musicbrainz.search</groupId>
<artifactId>index</artifactId>
<version>2.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.6.2</version>
- </dependency>
- <dependency>
<groupId>org.tuckey</groupId>
<artifactId>urlrewritefilter</artifactId>
<version>3.1.0</version>

Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/AnnotationSearch.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/AnnotationSearch.java 2009-11-04 19:15:17 UTC (rev 12287)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/AnnotationSearch.java 2009-11-04 21:00:01 UTC (rev 12288)
@@ -12,7 +12,6 @@

private AnnotationSearch() throws Exception {
mmd1XmlWriter = null;
- htmlWriter = new AnnotationHtmlWriter();
defaultFields = new ArrayList<String>();
defaultFields.add(AnnotationIndexField.TEXT.getName());
analyzer = new PerFieldEntityAnalyzer(AnnotationIndexField.class);

Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ArtistSearch.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ArtistSearch.java 2009-11-04 19:15:17 UTC (rev 12287)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ArtistSearch.java 2009-11-04 21:00:01 UTC (rev 12288)
@@ -4,7 +4,7 @@
import org.apache.lucene.queryParser.QueryParser;
import org.musicbrainz.search.index.ArtistIndexField;
import org.musicbrainz.search.servlet.mmd1.ArtistMmd1XmlWriter;
-import org.musicbrainz.search.servlet.mmd2.ArtistXmlWriter;
+import org.musicbrainz.search.servlet.mmd2.ArtistWriter;
import org.musicbrainz.search.analysis.PerFieldEntityAnalyzer;

import java.util.ArrayList;
@@ -13,9 +13,8 @@
public class ArtistSearch extends SearchServer {

private ArtistSearch() throws Exception {
- xmlWriter = new ArtistXmlWriter();
+ resultsWriter = new ArtistWriter();
mmd1XmlWriter = new ArtistMmd1XmlWriter();
- htmlWriter = new ArtistHtmlWriter();
defaultFields = new ArrayList<String>();
defaultFields.add(ArtistIndexField.ARTIST.getName());
defaultFields.add(ArtistIndexField.ALIAS.getName());

Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/CDStubSearch.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/CDStubSearch.java 2009-11-04 19:15:17 UTC (rev 12287)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/CDStubSearch.java 2009-11-04 21:00:01 UTC (rev 12288)
@@ -13,7 +13,6 @@

private CDStubSearch() throws Exception {
mmd1XmlWriter = null;
- htmlWriter = new CDStubHtmlWriter();
defaultFields = new ArrayList<String>();
defaultFields.add(CDStubIndexField.ARTIST.getName());
defaultFields.add(CDStubIndexField.TITLE.getName());

Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/FreeDBSearch.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/FreeDBSearch.java 2009-11-04 19:15:17 UTC (rev 12287)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/FreeDBSearch.java 2009-11-04 21:00:01 UTC (rev 12288)
@@ -13,7 +13,6 @@

private FreeDBSearch() throws Exception {
mmd1XmlWriter = null;
- htmlWriter = new FreeDBHtmlWriter();
defaultFields = new ArrayList<String>();
defaultFields.add(FreeDBIndexField.ARTIST.getName());
defaultFields.add(FreeDBIndexField.TITLE.getName());

Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/LabelSearch.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/LabelSearch.java 2009-11-04 19:15:17 UTC (rev 12287)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/LabelSearch.java 2009-11-04 21:00:01 UTC (rev 12288)
@@ -4,7 +4,7 @@
import org.apache.lucene.queryParser.QueryParser;
import org.musicbrainz.search.index.LabelIndexField;
import org.musicbrainz.search.servlet.mmd1.LabelMmd1XmlWriter;
-import org.musicbrainz.search.servlet.mmd2.LabelXmlWriter;
+import org.musicbrainz.search.servlet.mmd2.LabelWriter;
import org.musicbrainz.search.analysis.PerFieldEntityAnalyzer;

import java.util.ArrayList;
@@ -14,9 +14,8 @@

public LabelSearch() throws Exception {

- xmlWriter = new LabelXmlWriter();
+ resultsWriter = new LabelWriter();
mmd1XmlWriter = new LabelMmd1XmlWriter();
- htmlWriter = new LabelHtmlWriter();
defaultFields = new ArrayList<String>();
defaultFields.add(LabelIndexField.LABEL.getName());
defaultFields.add(LabelIndexField.ALIAS.getName());

Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/RecordingQueryParser.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/RecordingQueryParser.java 2009-11-04 19:15:17 UTC (rev 12287)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/RecordingQueryParser.java 2009-11-04 21:00:01 UTC (rev 12288)
@@ -10,7 +10,7 @@
import org.apache.lucene.util.NumericUtils;
import org.musicbrainz.search.index.RecordingIndexField;
import org.musicbrainz.search.index.ReleaseGroupType;
-import org.musicbrainz.search.servlet.v1support.V1TrackIndexField;
+import org.musicbrainz.search.servlet.mmd1.V1TrackIndexField;

/**

Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/RecordingSearch.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/RecordingSearch.java 2009-11-04 19:15:17 UTC (rev 12287)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/RecordingSearch.java 2009-11-04 21:00:01 UTC (rev 12288)
@@ -4,7 +4,7 @@
import org.apache.lucene.queryParser.QueryParser;
import org.musicbrainz.search.index.RecordingIndexField;
import org.musicbrainz.search.servlet.mmd1.TrackMmd1XmlWriter;
-import org.musicbrainz.search.servlet.mmd2.RecordingXmlWriter;
+import org.musicbrainz.search.servlet.mmd2.RecordingWriter;
import org.musicbrainz.search.analysis.PerFieldEntityAnalyzer;

import java.util.ArrayList;
@@ -14,9 +14,8 @@

public RecordingSearch() throws Exception {

- xmlWriter = new RecordingXmlWriter();
+ resultsWriter = new RecordingWriter();
mmd1XmlWriter = new TrackMmd1XmlWriter();
- htmlWriter = new TrackHtmlWriter();
defaultFields = new ArrayList<String>();
defaultFields.add(RecordingIndexField.RECORDING.getName());
analyzer = new PerFieldEntityAnalyzer(RecordingIndexField.class);

Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ReleaseGroupSearch.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ReleaseGroupSearch.java 2009-11-04 19:15:17 UTC (rev 12287)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ReleaseGroupSearch.java 2009-11-04 21:00:01 UTC (rev 12288)
@@ -4,7 +4,7 @@
import org.apache.lucene.queryParser.QueryParser;
import org.musicbrainz.search.index.ReleaseGroupIndexField;
import org.musicbrainz.search.servlet.mmd1.ReleaseGroupMmd1XmlWriter;
-import org.musicbrainz.search.servlet.mmd2.ReleaseGroupXmlWriter;
+import org.musicbrainz.search.servlet.mmd2.ReleaseGroupWriter;
import org.musicbrainz.search.analysis.PerFieldEntityAnalyzer;

import java.util.ArrayList;
@@ -14,9 +14,8 @@

public ReleaseGroupSearch() throws Exception
{
- xmlWriter = new ReleaseGroupXmlWriter();
+ resultsWriter = new ReleaseGroupWriter();
mmd1XmlWriter = new ReleaseGroupMmd1XmlWriter();
- htmlWriter = new ReleaseGroupHtmlWriter();
defaultFields = new ArrayList<String>();
defaultFields.add(ReleaseGroupIndexField.RELEASEGROUP.getName());
analyzer = new PerFieldEntityAnalyzer(ReleaseGroupIndexField.class);

Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ReleaseSearch.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ReleaseSearch.java 2009-11-04 19:15:17 UTC (rev 12287)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ReleaseSearch.java 2009-11-04 21:00:01 UTC (rev 12288)
@@ -4,8 +4,7 @@
import org.apache.lucene.queryParser.QueryParser;
import org.musicbrainz.search.index.ReleaseIndexField;
import org.musicbrainz.search.servlet.mmd1.ReleaseMmd1XmlWriter;
-import org.musicbrainz.search.servlet.mmd2.ReleaseGroupXmlWriter;
-import org.musicbrainz.search.servlet.mmd2.ReleaseXmlWriter;
+import org.musicbrainz.search.servlet.mmd2.ReleaseWriter;
import org.musicbrainz.search.analysis.PerFieldEntityAnalyzer;

import java.util.ArrayList;
@@ -15,9 +14,8 @@

public ReleaseSearch() throws Exception {

- xmlWriter = new ReleaseXmlWriter();
+ resultsWriter = new ReleaseWriter();
mmd1XmlWriter = new ReleaseMmd1XmlWriter();
- htmlWriter = new ReleaseHtmlWriter();
defaultFields = new ArrayList<String>();
defaultFields.add(ReleaseIndexField.RELEASE.getName());
analyzer = new PerFieldEntityAnalyzer(ReleaseIndexField.class);

Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ResultsWriter.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ResultsWriter.java 2009-11-04 19:15:17 UTC (rev 12287)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ResultsWriter.java 2009-11-04 21:00:01 UTC (rev 12288)
@@ -39,10 +39,9 @@
public abstract String getMimeType();

public void write(PrintWriter out, Results results) throws IOException {
- write(out,results,new EnumMap<RequestParameter,String>(RequestParameter.class) );
+ write(out, results, SearchServerServlet.RESPONSE_XML ) ;
}

+ public abstract void write(PrintWriter out, Results results,String outputFormat) throws IOException ;

- public abstract void write(PrintWriter out, Results results,EnumMap<RequestParameter,String> extraInfoMap) throws IOException;
-
}

Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServer.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServer.java 2009-11-04 19:15:17 UTC (rev 12287)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServer.java 2009-11-04 21:00:01 UTC (rev 12288)
@@ -41,7 +41,7 @@
import org.musicbrainz.search.MbDocument;
import org.musicbrainz.search.index.MetaIndexField;
import org.musicbrainz.search.servlet.mmd1.Mmd1XmlWriter;
-import org.musicbrainz.search.servlet.mmd2.XmlWriter;
+import org.musicbrainz.search.servlet.mmd2.ResultsWriter;

import java.io.File;
import java.io.IOException;
@@ -56,13 +56,11 @@
public abstract class SearchServer {

protected PerFieldAnalyzerWrapper analyzer;
- protected XmlWriter xmlWriter;
+ protected ResultsWriter resultsWriter;
protected Mmd1XmlWriter mmd1XmlWriter;
- protected HtmlWriter htmlWriter;
protected List<String> defaultFields;
protected IndexSearcher indexSearcher;
protected Date serverLastUpdatedDate;
- protected String htmlLastUpdated;
protected SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm zz",Locale.US);
protected AtomicInteger searchCount = new AtomicInteger();

@@ -95,7 +93,6 @@
serverLastUpdatedDate = new Date(NumericUtils.prefixCodedToLong(indexSearcher.getIndexReader().document(indexSearcher.getIndexReader().maxDoc()-1)
.getField(MetaIndexField.META.getName()).stringValue()));
dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
- htmlWriter.setLastUpdated(dateFormat.format(serverLastUpdatedDate));
}
catch(Exception e) {
System.out.println(e);
@@ -108,18 +105,14 @@
}

- public XmlWriter getXmlWriter() {
- return xmlWriter;
+ public org.musicbrainz.search.servlet.mmd2.ResultsWriter getXmlWriter() {
+ return resultsWriter;
}

public Mmd1XmlWriter getXmlV1Writer() {
return mmd1XmlWriter;
}

- public HtmlWriter getHtmlWriter() {
- return htmlWriter;
- }
-
public List<String> getSearchFields() {
return defaultFields;
}
@@ -129,25 +122,13 @@
}

- public ResultsWriter getWriter(String fmt, String version) {
- if (SearchServerServlet.RESPONSE_XML.equals(fmt)) {
- if(SearchServerServlet.WS_VERSION_1.equals(version)) {
- return getXmlV1Writer();
- }
- else {
- //TODO whilst in dev fall back to v1 if don't have a v2 one yet
- ResultsWriter writer = getXmlWriter();
- if(writer==null) {
- return getXmlV1Writer();
- } else {
- return writer;
- }
-
- }
-
- } else {
- return getHtmlWriter();
+ public org.musicbrainz.search.servlet.ResultsWriter getWriter(String fmt, String version) {
+ if(SearchServerServlet.WS_VERSION_1.equals(version)) {
+ return getXmlV1Writer();
}
+ else {
+ return getXmlWriter();
+ }
}

/**

Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServerServlet.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServerServlet.java 2009-11-04 19:15:17 UTC (rev 12287)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/SearchServerServlet.java 2009-11-04 21:00:01 UTC (rev 12288)
@@ -29,7 +29,7 @@
package org.musicbrainz.search.servlet;

import org.apache.lucene.queryParser.ParseException;
-import org.apache.velocity.app.Velocity;
+import org.musicbrainz.search.servlet.mmd2.ResultsWriter;

import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@@ -39,9 +39,8 @@
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
-import java.util.logging.Logger;
-import java.util.EnumMap;
import java.lang.management.ManagementFactory;
+import java.util.logging.Logger;

public class SearchServerServlet extends HttpServlet {

@@ -52,8 +51,8 @@
final static int MAX_MATCHES_LIMIT = 100;

- final static String RESPONSE_XML = "xml";
- final static String RESPONSE_HTML = "html";
+ public final static String RESPONSE_XML = "xml";
+ public final static String RESPONSE_JSON = "json";

final static String WS_VERSION_1 = "1";
final static String WS_VERSION_2 = "2";
@@ -70,11 +69,8 @@
String indexDir = getServletConfig().getInitParameter("index_dir");
log.info("Index dir = " + indexDir);
log.info("Max Heap = "+ ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getMax());
- // Setup Velocity and Search server
- setUpVelocity();

try {
- Velocity.init();
SearchServerFactory.init(indexDir);
isServletInitialized = true;
} catch (Exception e1) {
@@ -85,13 +81,8 @@

}

- public static void setUpVelocity() {
- Velocity.setProperty("resource.loader", "class");
- Velocity.setProperty("class.resource.loader.class", org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader.class.getName());
- Velocity.setProperty("eventhandler.referenceinsertion.class", "org.apache.velocity.app.event.implement.EscapeHtmlReference");
- Velocity.setProperty(Velocity.RUNTIME_LOG_LOGSYSTEM, new VelocityLogChute());
- }

+
@Override
public void destroy() {
SearchServerFactory.close();
@@ -195,68 +186,30 @@
}
}

- EnumMap<RequestParameter, String> extraInfoMap = new EnumMap<RequestParameter, String>(RequestParameter.class);
- switch (resourceType) {
- case RELEASE: {
- String tport = request.getParameter(RequestParameter.TAGGER_PORT.getName());
- String rel = request.getParameter(RequestParameter.RELATIONSHIPS.getName());
- if (tport != null) {
- extraInfoMap.put(RequestParameter.TAGGER_PORT, tport);
- String duration = request.getParameter(RequestParameter.DURATION.getName());
- if (duration != null) {
- extraInfoMap.put(RequestParameter.DURATION, duration);
- }
- } else if (rel != null) {
- extraInfoMap.put(RequestParameter.RELATIONSHIPS, rel);
- }
- }
- break;

- case RECORDING: {
- String tport = request.getParameter(RequestParameter.TAGGER_PORT.getName());
- String rel = request.getParameter(RequestParameter.RELATIONSHIPS.getName());
- String oldLink = request.getParameter(RequestParameter.OLD_STYLE_LINK.getName());
-
- if (tport != null) {
- extraInfoMap.put(RequestParameter.TAGGER_PORT, tport);
- String duration = request.getParameter(RequestParameter.DURATION.getName());
- if (duration != null) {
- extraInfoMap.put(RequestParameter.DURATION, duration);
- }
- } else if (oldLink != null) {
- extraInfoMap.put(RequestParameter.OLD_STYLE_LINK, oldLink);
- } else if (rel != null) {
- extraInfoMap.put(RequestParameter.RELATIONSHIPS, rel);
- }
- }
- break;
-
- case ARTIST: {
- String rel = request.getParameter(RequestParameter.RELATIONSHIPS.getName());
- if (rel != null) {
- extraInfoMap.put(RequestParameter.RELATIONSHIPS, rel);
- }
- }
- break;
- }
-
// Make the search
try {

SearchServer searchServer = SearchServerFactory.getSearchServer(resourceType);
Results results = searchServer.search(query, offset, limit);
+ org.musicbrainz.search.servlet.ResultsWriter writer = searchServer.getWriter(responseFormat, responseVersion);

- ResultsWriter writer = searchServer.getWriter(responseFormat, responseVersion);
-
if (writer == null) {
response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, ErrorMessage.NO_HANDLER_FOR_TYPE_AND_FORMAT.getMsg(resourceType, responseFormat));
return;
}
response.setCharacterEncoding(CHARSET);
- response.setContentType(writer.getMimeType());
+ if(responseFormat.equals(RESPONSE_XML)) {
+ response.setContentType(writer.getMimeType());
+ }
+ else {
+ response.setContentType(((ResultsWriter)writer).getJsonMimeType());
+ }
+
PrintWriter out = new PrintWriter(new BufferedWriter(new OutputStreamWriter(response.getOutputStream(), CHARSET)));
- writer.write(out, results, extraInfoMap);
+ writer.write(out, results,responseFormat);
out.close();
+
}
catch (ParseException pe) {
response.sendError(HttpServletResponse.SC_BAD_REQUEST, ErrorMessage.UNABLE_TO_PARSE_SEARCH.getMsg(query));

Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/WorkSearch.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/WorkSearch.java 2009-11-04 19:15:17 UTC (rev 12287)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/WorkSearch.java 2009-11-04 21:00:01 UTC (rev 12288)
@@ -2,12 +2,8 @@

import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.queryParser.QueryParser;
-import org.musicbrainz.search.index.ReleaseIndexField;
import org.musicbrainz.search.index.WorkIndexField;
-import org.musicbrainz.search.servlet.mmd1.ReleaseMmd1XmlWriter;
-import org.musicbrainz.search.servlet.mmd2.ReleaseGroupXmlWriter;
-import org.musicbrainz.search.servlet.mmd2.ReleaseXmlWriter;
-import org.musicbrainz.search.servlet.mmd2.WorkXmlWriter;
+import org.musicbrainz.search.servlet.mmd2.WorkWriter;
import org.musicbrainz.search.analysis.PerFieldEntityAnalyzer;

import java.util.ArrayList;
@@ -17,7 +13,7 @@

public WorkSearch() throws Exception {

- xmlWriter = new WorkXmlWriter();
+ resultsWriter = new WorkWriter();
defaultFields = new ArrayList<String>();
defaultFields.add(WorkIndexField.WORK.getName());
analyzer = new PerFieldEntityAnalyzer(WorkIndexField.class);

Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/Mmd1XmlWriter.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/Mmd1XmlWriter.java 2009-11-04 19:15:17 UTC (rev 12287)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/Mmd1XmlWriter.java 2009-11-04 21:00:01 UTC (rev 12288)
@@ -87,7 +87,7 @@
* @param results
* @throws IOException
*/
- public void write(PrintWriter out, Results results, EnumMap<RequestParameter,String> extraInfoMap) throws IOException {
+ public void write(PrintWriter out, Results results, String outputFormat) throws IOException {
try {
Metadata metadata = write(results);
Marshaller m = context.createMarshaller();

Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/ReleaseGroupMmd1XmlWriter.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/ReleaseGroupMmd1XmlWriter.java 2009-11-04 19:15:17 UTC (rev 12287)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/ReleaseGroupMmd1XmlWriter.java 2009-11-04 21:00:01 UTC (rev 12288)
@@ -72,15 +72,12 @@
//i.e http://localhost:8080/?type=release-group&query=artist:%22Cincinnati%20Pops%20Orchestra%22&fmt=xml&version=1
String artistName = doc.get(ReleaseGroupIndexField.ARTIST_NAME);
if (artistName != null) {
-
Artist artist = of.createArtist();
artist.setName(artistName);
artist.setId(doc.get(ReleaseGroupIndexField.ARTIST_ID));
artist.setSortName(doc.get(ReleaseGroupIndexField.ARTIST_SORTNAME));
releaseGroup.setArtist(artist);
}
-
-
releaseGroupList.getReleaseGroup().add(releaseGroup);
}
releaseGroupList.setCount(BigInteger.valueOf(results.totalHits));

Property changes on: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/V1TrackIndexField.java
___________________________________________________________________
Added: svn:mergeinfo
+ /search_server/branches/lucene-java/index/src/main/java/org/musicbrainz/search/index/RecordingIndexField.java:12117-12127
/search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndexField.java:12128-12159

Property changes on: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/RecordingWriter.java
___________________________________________________________________
Added: svn:mergeinfo
+ /search_server/branches/lucene-java/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/TrackMmd1XmlWriter.java:12117-12127
/search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/TrackMmd1XmlWriter.java:12128-12159

Property changes on: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ReleaseWriter.java
___________________________________________________________________
Added: svn:mergeinfo
+ /search_server/branches/lucene-java/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/ReleaseMmd1XmlWriter.java:12117-12127
/search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/ReleaseMmd1XmlWriter.java:12128-12159

Property changes on: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/WorkWriter.java
___________________________________________________________________
Added: svn:mergeinfo
+ /search_server/branches/lucene-java/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ReleaseGroupXmlWriter.java:12117-12127
/search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ReleaseGroupXmlWriter.java:12128-12159

Modified: search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindAnnotationTest.java
===================================================================
--- search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindAnnotationTest.java 2009-11-04 19:15:17 UTC (rev 12287)
+++ search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindAnnotationTest.java 2009-11-04 21:00:01 UTC (rev 12288)
@@ -5,16 +5,11 @@
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.store.RAMDirectory;
-import org.apache.velocity.app.Velocity;
import org.musicbrainz.search.MbDocument;
import org.musicbrainz.search.analysis.PerFieldEntityAnalyzer;
import org.musicbrainz.search.index.AnnotationIndexField;
import org.musicbrainz.search.index.AnnotationType;

-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Date;
-
/**
* Test retrieving Annotations entries from index and Outputting as Html
*/
@@ -28,8 +23,6 @@

@Override
protected void setUp() throws Exception {
- SearchServerServlet.setUpVelocity();
- Velocity.init();
RAMDirectory ramDir = new RAMDirectory();
PerFieldAnalyzerWrapper analyzer = new PerFieldEntityAnalyzer(AnnotationIndexField.class);
IndexWriter writer = new IndexWriter(ramDir, analyzer, true, IndexWriter.MaxFieldLength.LIMITED);
@@ -93,39 +86,4 @@
Results res = ss.searchLucene("DiscID", 0, 10);
assertEquals(1, res.totalHits);
}
-
-
- public void testOutputAsHtml() throws Exception {
-
- Results res = ss.searchLucene("DiscID", 0, 1);
- ResultsWriter writer = new AnnotationHtmlWriter();
- StringWriter sw = new StringWriter();
- PrintWriter pr = new PrintWriter(sw);
- writer.write(pr, res);
- pr.close();
-
- String output = sw.toString();
- //System.out.println(output);
- assertTrue(output.contains("<a href=\"/release/bdb24cb5-404b-4f60-bba4-7b730325ae47.html\">Pieds nus sur la braise</a>"));
- assertTrue(output.contains("<td>%WIKIBEGIN%EAN: 0828768226629 - DiscID: TWj6cLku360MfFYAq_MEaT_stgc-%WIKIEND%</td>"));
- }
-
-
-
- public void testHtmlWritingPerformance() throws Exception {
- Results res = ss.searchLucene("DiscID", 0, 10);
- assertEquals(1, res.totalHits);
-
- Date start = new Date();
- ResultsWriter writer = new AnnotationHtmlWriter();
- StringWriter sw = new StringWriter();
- PrintWriter pr = new PrintWriter(sw);
- for (int i = 0; i < 1000; i++) {
- writer.write(pr, res);
- }
- pr.close();
- Date end = new Date();
- System.out.println("HTML - Time Taken: " + (end.getTime() - start.getTime()) + "ms");
- }
-
}
\ No newline at end of file

Modified: search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindArtistTest.java
===================================================================
--- search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindArtistTest.java 2009-11-04 19:15:17 UTC (rev 12287)
+++ search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindArtistTest.java 2009-11-04 21:00:01 UTC (rev 12288)
@@ -1,25 +1,18 @@
package org.musicbrainz.search.servlet;
+
import junit.framework.TestCase;
+import org.apache.lucene.analysis.PerFieldAnalyzerWrapper;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.store.RAMDirectory;
-import org.apache.lucene.analysis.PerFieldAnalyzerWrapper;
-import org.apache.velocity.app.Velocity;
+import org.musicbrainz.search.MbDocument;
+import org.musicbrainz.search.analysis.PerFieldEntityAnalyzer;
import org.musicbrainz.search.index.ArtistIndexField;
import org.musicbrainz.search.index.ArtistType;
-import org.musicbrainz.search.servlet.ArtistHtmlWriter;
-import org.musicbrainz.search.servlet.ArtistSearch;
import org.musicbrainz.search.servlet.mmd1.ArtistMmd1XmlWriter;
-import org.musicbrainz.search.MbDocument;
-import org.musicbrainz.search.servlet.Result;
-import org.musicbrainz.search.servlet.Results;
-import org.musicbrainz.search.servlet.ResultsWriter;
-import org.musicbrainz.search.servlet.SearchServer;
-import org.musicbrainz.search.servlet.SearchServerServlet;
import org.musicbrainz.search.servlet.mmd1.Mmd1XmlWriter;
-import org.musicbrainz.search.servlet.mmd2.ArtistXmlWriter;
-import org.musicbrainz.search.servlet.mmd2.XmlWriter;
-import org.musicbrainz.search.analysis.PerFieldEntityAnalyzer;
+import org.musicbrainz.search.servlet.mmd2.ArtistWriter;
+import org.musicbrainz.search.servlet.mmd2.ResultsWriter;

import java.io.PrintWriter;
import java.io.StringWriter;
@@ -38,8 +31,6 @@

@Override
protected void setUp() throws Exception {
- SearchServerServlet.setUpVelocity();
- Velocity.init();
RAMDirectory ramDir = new RAMDirectory();
PerFieldAnalyzerWrapper analyzer = new PerFieldEntityAnalyzer(ArtistIndexField.class);
IndexWriter writer = new IndexWriter(ramDir, analyzer, true, IndexWriter.MaxFieldLength.LIMITED);
@@ -76,6 +67,8 @@
ss = new ArtistSearch(new IndexSearcher(ramDir,true));
}

+
+
public void testFindArtistById() throws Exception {
Results res = ss.searchLucene("arid:\"4302e264-1cf0-4d1f-aca7-2a6f89e34b36\"", 0, 10);
assertEquals(1, res.totalHits);
@@ -293,7 +286,7 @@
public void testOutputXml() throws Exception {

Results res = ss.searchLucene("artist:\"Farming Incident\"", 0, 1);
- XmlWriter v1Writer = new ArtistXmlWriter();
+ ResultsWriter v1Writer = new ArtistWriter();
StringWriter sw = new StringWriter();
PrintWriter pr = new PrintWriter(sw);
v1Writer.write(pr, res);
@@ -323,7 +316,7 @@
public void testOutputXml2() throws Exception {

Results res = ss.searchLucene("artist:\"Echo & the Bunnymen\"", 0, 1);
- XmlWriter v1Writer = new ArtistXmlWriter();
+ ResultsWriter v1Writer = new ArtistWriter();
StringWriter sw = new StringWriter();
PrintWriter pr = new PrintWriter(sw);
v1Writer.write(pr, res);
@@ -372,7 +365,7 @@
assertEquals(1, res.totalHits);

Date start = new Date();
- ResultsWriter writer = new ArtistMmd1XmlWriter();
+ org.musicbrainz.search.servlet.ResultsWriter writer = new ArtistMmd1XmlWriter();
StringWriter sw = new StringWriter();
PrintWriter pr = new PrintWriter(sw);
for (int i = 0; i < 1000; i++) {
@@ -382,39 +375,4 @@
Date end = new Date();
System.out.println("XML - Time Taken: " + (end.getTime() - start.getTime()) + "ms");
}
-
-
-
-
- /**
- * Tests strips off header and footer
- * http://musicbrainz.org/ws/1/artist/?type=xml&query=%22Farming%20Incident%22
- *
- * @throws Exception
- */
- /*
- public void testOutputAsXmlFragment() throws Exception {
-
- Results res = ss.searchLucene("artist:\"Farming Incident\"", 0, 1);
- Mmd1XmlWriter writer = new ArtistMmd1XmlWriter();
- StringWriter sw = new StringWriter();
- PrintWriter pr = new PrintWriter(sw);
- writer.write(pr, res);
- pr.close();
-
- String output = sw.toString();
- assertFalse(output.contains("metadata"));
- assertFalse(output.contains("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"));
- assertTrue(output.contains("count=\"1\""));
- assertTrue(output.contains("offset=\"0\""));
- assertTrue(output.contains("type=\"Group\""));
- assertTrue(output.contains("<name>Farming Incident</name>"));
- assertTrue(output.contains("<sort-name>Farming Incident</sort-name>"));
- assertTrue(output.contains("<life-span begin=\"1999-04\""));
- assertFalse(output.contains("end"));
- assertFalse(output.contains("alias"));
- assertFalse(output.contains("disambugation"));
- System.out.println("Xml Fragment is" + output);
- }
- */
}
\ No newline at end of file

Modified: search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindFreeDBTest.java
===================================================================
--- search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindFreeDBTest.java 2009-11-04 19:15:17 UTC (rev 12287)
+++ search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindFreeDBTest.java 2009-11-04 21:00:01 UTC (rev 12288)
@@ -1,25 +1,14 @@
package org.musicbrainz.search.servlet;
+
import junit.framework.TestCase;
+import org.apache.lucene.analysis.PerFieldAnalyzerWrapper;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.store.RAMDirectory;
-import org.apache.lucene.analysis.PerFieldAnalyzerWrapper;
-import org.apache.velocity.app.Velocity;
+import org.musicbrainz.search.MbDocument;
import org.musicbrainz.search.analysis.PerFieldEntityAnalyzer;
import org.musicbrainz.search.index.FreeDBIndexField;
-import org.musicbrainz.search.servlet.FreeDBHtmlWriter;
-import org.musicbrainz.search.servlet.FreeDBSearch;
-import org.musicbrainz.search.MbDocument;
-import org.musicbrainz.search.servlet.Result;
-import org.musicbrainz.search.servlet.Results;
-import org.musicbrainz.search.servlet.ResultsWriter;
-import org.musicbrainz.search.servlet.SearchServer;
-import org.musicbrainz.search.servlet.SearchServerServlet;

-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Date;
-
/**
* Test retrieving FreeDB entries from index and Outputting as Html
*/
@@ -33,8 +22,6 @@

@Override
protected void setUp() throws Exception {
- SearchServerServlet.setUpVelocity();
- Velocity.init();
RAMDirectory ramDir = new RAMDirectory();
PerFieldAnalyzerWrapper analyzer = new PerFieldEntityAnalyzer(FreeDBIndexField.class);
IndexWriter writer = new IndexWriter(ramDir, analyzer, true, IndexWriter.MaxFieldLength.LIMITED);
@@ -137,57 +124,7 @@
assertEquals("2008", doc.get(FreeDBIndexField.YEAR));
}

-
}

- public void testOutputAsHtml() throws Exception {

- Results res = ss.searchLucene("artist:\"Ska-P\"", 0, 1);
- ResultsWriter writer = new FreeDBHtmlWriter();
- StringWriter sw = new StringWriter();
- PrintWriter pr = new PrintWriter(sw);
- writer.write(pr, res);
- pr.close();
-
- String output = sw.toString();
- assertTrue(output.contains("Lágrimas & Gozos"));
- assertTrue(output.contains("Ska-P"));
- assertTrue(output.contains("c20c4b0d"));
-
- }
-
- /**
- * Tests that & is converted to valid html
- *
- * @throws Exception
- */
- public void testOutputAsHtmlSpecialCharacters() throws Exception {
-
- Results res = ss.searchLucene("artist:\"Ska-P\"", 0, 1);
- ResultsWriter writer = new FreeDBHtmlWriter();
- StringWriter sw = new StringWriter();
- PrintWriter pr = new PrintWriter(sw);
- writer.write(pr, res);
- pr.close();
-
- String output = sw.toString();
- assertTrue(output.contains("Lágrimas & Gozos"));
- }
-
- public void testHtmlWritingPerformance() throws Exception {
- Results res = ss.searchLucene("artist:\"Ska-P\"", 0, 10);
- assertEquals(1, res.totalHits);
-
- Date start = new Date();
- ResultsWriter writer = new FreeDBHtmlWriter();
- StringWriter sw = new StringWriter();
- PrintWriter pr = new PrintWriter(sw);
- for (int i = 0; i < 1000; i++) {
- writer.write(pr, res);
- }
- pr.close();
- Date end = new Date();
- System.out.println("HTML - Time Taken: " + (end.getTime() - start.getTime()) + "ms");
- }
-
}
\ No newline at end of file

Modified: search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindLabelTest.java
===================================================================
--- search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindLabelTest.java 2009-11-04 19:15:17 UTC (rev 12287)
+++ search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindLabelTest.java 2009-11-04 21:00:01 UTC (rev 12288)
@@ -1,21 +1,16 @@
package org.musicbrainz.search.servlet;
+
import junit.framework.TestCase;
+import org.apache.lucene.analysis.PerFieldAnalyzerWrapper;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.store.RAMDirectory;
-import org.apache.lucene.analysis.PerFieldAnalyzerWrapper;
-import org.apache.velocity.app.Velocity;
-import org.musicbrainz.search.index.*;
-import org.musicbrainz.search.servlet.LabelSearch;
-import org.musicbrainz.search.servlet.mmd1.LabelMmd1XmlWriter;
import org.musicbrainz.search.MbDocument;
-import org.musicbrainz.search.servlet.Result;
-import org.musicbrainz.search.servlet.Results;
-import org.musicbrainz.search.servlet.ResultsWriter;
-import org.musicbrainz.search.servlet.SearchServer;
-import org.musicbrainz.search.servlet.SearchServerServlet;
-import org.musicbrainz.search.servlet.mmd2.LabelXmlWriter;
import org.musicbrainz.search.analysis.PerFieldEntityAnalyzer;
+import org.musicbrainz.search.index.LabelIndexField;
+import org.musicbrainz.search.index.LabelType;
+import org.musicbrainz.search.servlet.mmd1.LabelMmd1XmlWriter;
+import org.musicbrainz.search.servlet.mmd2.LabelWriter;

import java.io.PrintWriter;
import java.io.StringWriter;
@@ -35,8 +30,6 @@

@Override
protected void setUp() throws Exception {
- SearchServerServlet.setUpVelocity();
- Velocity.init();
RAMDirectory ramDir = new RAMDirectory();
PerFieldAnalyzerWrapper analyzer = new PerFieldEntityAnalyzer(LabelIndexField.class);
IndexWriter writer = new IndexWriter(ramDir, analyzer, true, IndexWriter.MaxFieldLength.LIMITED);
@@ -216,7 +209,7 @@
public void testOutputAsXml() throws Exception {

Results res = ss.searchLucene("label:\"Jockey Slut\"", 0, 1);
- ResultsWriter writer = new LabelXmlWriter();
+ ResultsWriter writer = new LabelWriter();
StringWriter sw = new StringWriter();
PrintWriter pr = new PrintWriter(sw);
writer.write(pr, res);

Modified: search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindRecordingTest.java
===================================================================
--- search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindRecordingTest.java 2009-11-04 19:15:17 UTC (rev 12287)
+++ search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindRecordingTest.java 2009-11-04 21:00:01 UTC (rev 12288)
@@ -1,16 +1,17 @@
package org.musicbrainz.search.servlet;
+
import junit.framework.TestCase;
+import org.apache.lucene.analysis.PerFieldAnalyzerWrapper;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.store.RAMDirectory;
-import org.apache.lucene.analysis.PerFieldAnalyzerWrapper;
import org.apache.lucene.util.NumericUtils;
-import org.apache.velocity.app.Velocity;
import org.musicbrainz.search.MbDocument;
-import org.musicbrainz.search.index.*;
-import org.musicbrainz.search.servlet.mmd2.RecordingXmlWriter;
+import org.musicbrainz.search.analysis.PerFieldEntityAnalyzer;
+import org.musicbrainz.search.index.RecordingIndexField;
+import org.musicbrainz.search.index.ReleaseGroupType;
import org.musicbrainz.search.servlet.mmd1.TrackMmd1XmlWriter;
-import org.musicbrainz.search.analysis.PerFieldEntityAnalyzer;
+import org.musicbrainz.search.servlet.mmd2.RecordingWriter;

import java.io.PrintWriter;
import java.io.StringWriter;
@@ -32,8 +33,6 @@

@Override
protected void setUp() throws Exception {
- SearchServerServlet.setUpVelocity();
- Velocity.init();
RAMDirectory ramDir = new RAMDirectory();
PerFieldAnalyzerWrapper analyzer = new PerFieldEntityAnalyzer(RecordingIndexField.class);
IndexWriter writer = new IndexWriter(ramDir, analyzer, true, IndexWriter.MaxFieldLength.LIMITED);
@@ -57,6 +56,7 @@
doc.addNumericField(RecordingIndexField.TRACKNUM, 5);
doc.addField(RecordingIndexField.TRACK_OUTPUT, "Gravitational Lens");
doc.addField(RecordingIndexField.RECORDING, "Gravitational Lens");
+ doc.addField(RecordingIndexField.MEDIUM_POS_OUTPUT, "1");
doc.addField(RecordingIndexField.RELEASE_TYPE, ReleaseGroupType.ALBUM.getName());
writer.addDocument(doc.getLuceneDocument());
writer.close();
@@ -282,7 +282,7 @@
public void testOutputAsXml() throws Exception {

Results res = ss.searchLucene("track:\"Gravitational Lenz\"", 0, 10);
- ResultsWriter writer = new RecordingXmlWriter();
+ ResultsWriter writer = new RecordingWriter();
StringWriter sw = new StringWriter();
PrintWriter pr = new PrintWriter(sw);
writer.write(pr, res);

Modified: search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseGroupTest.java
===================================================================
--- search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseGroupTest.java 2009-11-04 19:15:17 UTC (rev 12287)
+++ search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseGroupTest.java 2009-11-04 21:00:01 UTC (rev 12288)
@@ -1,21 +1,16 @@
package org.musicbrainz.search.servlet;
+
import junit.framework.TestCase;
+import org.apache.lucene.analysis.PerFieldAnalyzerWrapper;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.store.RAMDirectory;
-import org.apache.lucene.analysis.PerFieldAnalyzerWrapper;
-import org.apache.velocity.app.Velocity;
-import org.musicbrainz.search.index.*;
import org.musicbrainz.search.MbDocument;
-import org.musicbrainz.search.servlet.ReleaseGroupSearch;
-import org.musicbrainz.search.servlet.mmd1.ReleaseGroupMmd1XmlWriter;
-import org.musicbrainz.search.servlet.Result;
-import org.musicbrainz.search.servlet.Results;
-import org.musicbrainz.search.servlet.ResultsWriter;
-import org.musicbrainz.search.servlet.SearchServer;
-import org.musicbrainz.search.servlet.SearchServerServlet;
-import org.musicbrainz.search.servlet.mmd2.ReleaseGroupXmlWriter;
import org.musicbrainz.search.analysis.PerFieldEntityAnalyzer;
+import org.musicbrainz.search.index.ReleaseGroupIndexField;
+import org.musicbrainz.search.index.ReleaseGroupType;
+import org.musicbrainz.search.servlet.mmd1.ReleaseGroupMmd1XmlWriter;
+import org.musicbrainz.search.servlet.mmd2.ReleaseGroupWriter;

import java.io.PrintWriter;
import java.io.StringWriter;
@@ -35,8 +30,6 @@

@Override
protected void setUp() throws Exception {
- SearchServerServlet.setUpVelocity();
- Velocity.init();
RAMDirectory ramDir = new RAMDirectory();
PerFieldAnalyzerWrapper analyzer = new PerFieldEntityAnalyzer(ReleaseGroupIndexField.class);
IndexWriter writer = new IndexWriter(ramDir, analyzer, true, IndexWriter.MaxFieldLength.LIMITED);
@@ -295,7 +288,7 @@
public void testOutputAsAsXml() throws Exception {

Results res = ss.searchLucene("releasegroup:\"Nobody's Twisting Your Arm\"", 0, 1);
- ResultsWriter writer = new ReleaseGroupXmlWriter();
+ ResultsWriter writer = new ReleaseGroupWriter();
StringWriter sw = new StringWriter();
PrintWriter pr = new PrintWriter(sw);
writer.write(pr, res);
@@ -354,7 +347,7 @@
public void testOutputAsAsXml2() throws Exception {

Results res = ss.searchLucene("releasegroup:Epics", 0, 1);
- ResultsWriter writer = new ReleaseGroupXmlWriter();
+ ResultsWriter writer = new ReleaseGroupWriter();
StringWriter sw = new StringWriter();
PrintWriter pr = new PrintWriter(sw);
writer.write(pr, res);

Modified: search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseTest.java
===================================================================
--- search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseTest.java 2009-11-04 19:15:17 UTC (rev 12287)
+++ search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseTest.java 2009-11-04 21:00:01 UTC (rev 12288)
@@ -1,23 +1,18 @@
package org.musicbrainz.search.servlet;
+
import junit.framework.TestCase;
+import org.apache.lucene.analysis.PerFieldAnalyzerWrapper;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.store.RAMDirectory;
-import org.apache.lucene.analysis.PerFieldAnalyzerWrapper;
import org.apache.lucene.util.NumericUtils;
-import org.apache.velocity.app.Velocity;
-import org.musicbrainz.search.index.*;
import org.musicbrainz.search.MbDocument;
-import org.musicbrainz.search.servlet.ReleaseSearch;
-import org.musicbrainz.search.servlet.mmd1.ReleaseMmd1XmlWriter;
-import org.musicbrainz.search.servlet.ResourceType;
-import org.musicbrainz.search.servlet.Result;
-import org.musicbrainz.search.servlet.Results;
-import org.musicbrainz.search.servlet.ResultsWriter;
-import org.musicbrainz.search.servlet.SearchServer;
-import org.musicbrainz.search.servlet.SearchServerServlet;
-import org.musicbrainz.search.servlet.mmd2.ReleaseXmlWriter;
import org.musicbrainz.search.analysis.PerFieldEntityAnalyzer;
+import org.musicbrainz.search.index.ReleaseGroupIndexField;
+import org.musicbrainz.search.index.ReleaseGroupType;
+import org.musicbrainz.search.index.ReleaseIndexField;
+import org.musicbrainz.search.servlet.mmd1.ReleaseMmd1XmlWriter;
+import org.musicbrainz.search.servlet.mmd2.ReleaseWriter;

import java.io.PrintWriter;
import java.io.StringWriter;
@@ -39,8 +34,6 @@

@Override
protected void setUp() throws Exception {
- SearchServerServlet.setUpVelocity();
- Velocity.init();
RAMDirectory ramDir = new RAMDirectory();
PerFieldAnalyzerWrapper analyzer = new PerFieldEntityAnalyzer(ReleaseIndexField.class);
IndexWriter writer = new IndexWriter(ramDir, analyzer, true, IndexWriter.MaxFieldLength.LIMITED);
@@ -543,7 +536,7 @@
public void testOutputAsXml() throws Exception {

Results res = ss.searchLucene("release:\"Our Glorious 5 Year Plan\"", 0, 1);
- ResultsWriter writer = new ReleaseXmlWriter();
+ ResultsWriter writer = new ReleaseWriter();
StringWriter sw = new StringWriter();
PrintWriter pr = new PrintWriter(sw);
writer.write(pr, res);

Modified: search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindWorkTest.java
===================================================================
--- search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindWorkTest.java 2009-11-04 19:15:17 UTC (rev 12287)
+++ search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindWorkTest.java 2009-11-04 21:00:01 UTC (rev 12288)
@@ -1,21 +1,14 @@
package org.musicbrainz.search.servlet;

import junit.framework.TestCase;
+import org.apache.lucene.analysis.PerFieldAnalyzerWrapper;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.store.RAMDirectory;
-import org.apache.lucene.analysis.PerFieldAnalyzerWrapper;
-import org.apache.velocity.app.Velocity;
-import org.musicbrainz.search.index.*;
-import org.musicbrainz.search.servlet.LabelSearch;
import org.musicbrainz.search.MbDocument;
-import org.musicbrainz.search.servlet.Result;
-import org.musicbrainz.search.servlet.Results;
-import org.musicbrainz.search.servlet.ResultsWriter;
-import org.musicbrainz.search.servlet.SearchServer;
-import org.musicbrainz.search.servlet.SearchServerServlet;
-import org.musicbrainz.search.servlet.mmd2.WorkXmlWriter;
import org.musicbrainz.search.analysis.PerFieldEntityAnalyzer;
+import org.musicbrainz.search.index.WorkIndexField;
+import org.musicbrainz.search.servlet.mmd2.WorkWriter;

import java.io.PrintWriter;
import java.io.StringWriter;
@@ -35,8 +28,6 @@

@Override
protected void setUp() throws Exception {
- SearchServerServlet.setUpVelocity();
- Velocity.init();
RAMDirectory ramDir = new RAMDirectory();
PerFieldAnalyzerWrapper analyzer = new PerFieldEntityAnalyzer(WorkIndexField.class);
IndexWriter writer = new IndexWriter(ramDir, analyzer, true, IndexWriter.MaxFieldLength.LIMITED);
@@ -85,7 +76,7 @@
public void testOutputAsXml() throws Exception {

Results res = ss.searchLucene("work:\"Symphony No. 5\"", 0, 1);
- ResultsWriter writer = new WorkXmlWriter();
+ ResultsWriter writer = new WorkWriter();
StringWriter sw = new StringWriter();
PrintWriter pr = new PrintWriter(sw);
writer.write(pr, res);

_______________________________________________
MusicBrainz-commits mailing list
MusicBrainz-commits@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-commits

From forum: musicbrainz-commits