Nabble - musicbrainz-commits

r12329 - in mb_server/trunk: lib/MusicBrainz/Server/Edit/Medium t

2009-12-04T08:10:56Z

Author: acid2
Date: 2009-12-04 16:10:56 +0000 (Fri, 04 Dec 2009)
New Revision: 12329

Modified:
mb_server/trunk/lib/MusicBrainz/Server/Edit/Medium/Edit.pm
mb_server/trunk/t/edit_medium_delete.t
mb_server/trunk/t/edit_medium_edit.t
Log:
Fix a few minor bugs in tests

Modified: mb_server/trunk/lib/MusicBrainz/Server/Edit/Medium/Edit.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Edit/Medium/Edit.pm 2009-12-04 13:27:56 UTC (rev 12328)
+++ mb_server/trunk/lib/MusicBrainz/Server/Edit/Medium/Edit.pm 2009-12-04 16:10:56 UTC (rev 12329)
@@ -12,7 +12,7 @@
sub edit_type { $EDIT_MEDIUM_EDIT }
sub edit_name { 'Edit Medium' }

-sub alter_edit_pending { { Medium => [ shift->data->{medium_id} ] } }
+sub alter_edit_pending { { Medium => [ shift->data->{medium} ] } }
sub related_entities { { release => [ shift->release_id ] } }
sub models { [qw( Medium )] }

@@ -21,6 +21,7 @@
position => Optional[Int],
name => Nullable[Str],
format_id => Nullable[Int],
+ tracklist_id => Optional[Int],
];

has '+data' => (
@@ -92,7 +93,7 @@
{
my ($self) = @_;
my $medium_data = $self->c->model('Medium');
- $medium_data->update($self->medium_id, $self->data->{new});
+ $medium_data->update($self->data->{medium}, $self->data->{new});
};

__PACKAGE__->meta->make_immutable;

Modified: mb_server/trunk/t/edit_medium_delete.t
===================================================================
--- mb_server/trunk/t/edit_medium_delete.t 2009-12-04 13:27:56 UTC (rev 12328)
+++ mb_server/trunk/t/edit_medium_delete.t 2009-12-04 16:10:56 UTC (rev 12329)
@@ -17,14 +17,12 @@
isa_ok($edit, 'MusicBrainz::Server::Edit::Medium::Delete');

# Make sure we can load the artist
-$c->model('Edit')->load_all($edit);
-is($edit->medium_id, 1);
-is($edit->medium->id, $edit->medium_id);
-is($edit->medium->edits_pending, 1);
+my $medium = $c->model('Medium')->get_by_id(1);
+is($medium->edits_pending, 1);

# Test rejecting the edit
reject_edit($c, $edit);
-my $medium = $c->model('Medium')->get_by_id(1);
+$medium = $c->model('Medium')->get_by_id(1);
ok(defined $medium);
is($medium->edits_pending, 0);

Modified: mb_server/trunk/t/edit_medium_edit.t
===================================================================
--- mb_server/trunk/t/edit_medium_edit.t 2009-12-04 13:27:56 UTC (rev 12328)
+++ mb_server/trunk/t/edit_medium_edit.t 2009-12-04 16:10:56 UTC (rev 12329)
@@ -19,10 +19,9 @@
isa_ok($edit, 'MusicBrainz::Server::Edit::Medium::Edit');

$edit = $c->model('Edit')->get_by_id($edit->id);
-$c->model('Edit')->load_all($edit);
-is($edit->medium->id, $edit->medium_id);
-is_unchanged($edit->medium);
-is($edit->medium->edits_pending, 1);
+$medium = $c->model('Medium')->get_by_id(1);
+is_unchanged($medium);
+is($medium->edits_pending, 1);

reject_edit($c, $edit);
$medium = $medium = $c->model('Medium')->get_by_id(1);

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

r12328 - mb_server/trunk

2009-12-04T05:27:56Z

Author: acid2
Date: 2009-12-04 13:27:56 +0000 (Fri, 04 Dec 2009)
New Revision: 12328

Modified:
mb_server/trunk/Makefile.PL
Log:
Date::Calc 5.8 introduces N_Delta_YMD

Modified: mb_server/trunk/Makefile.PL
===================================================================
--- mb_server/trunk/Makefile.PL 2009-12-04 13:27:50 UTC (rev 12327)
+++ mb_server/trunk/Makefile.PL 2009-12-04 13:27:56 UTC (rev 12328)
@@ -24,7 +24,7 @@
requires 'Catalyst::View::TT' => '0.29';
requires 'Data::OptList';
requires 'Data::Page' => '2.01';
-requires 'Date::Calc' => '5.4';
+requires 'Date::Calc' => '5.8';
requires 'DateTime::TimeZone';
requires 'DateTime::Format::Pg' => '0.16004';
requires 'DBD::Pg' => '2.11.8';

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

r12327 - in mb_server/trunk: . root/artist

2009-12-04T05:27:50Z

Author: acid2
Date: 2009-12-04 13:27:50 +0000 (Fri, 04 Dec 2009)
New Revision: 12327

Modified:
mb_server/trunk/Makefile.PL
mb_server/trunk/root/artist/edit.tt
Log:
Fix #5407

Merge branch 'mbs-13'

Modified: mb_server/trunk/Makefile.PL
===================================================================
--- mb_server/trunk/Makefile.PL 2009-12-04 11:09:16 UTC (rev 12326)
+++ mb_server/trunk/Makefile.PL 2009-12-04 13:27:50 UTC (rev 12327)
@@ -39,7 +39,7 @@
requires 'Email::MIME::Creator';
requires 'Email::Valid' => '0.179';
requires 'Exception::Class' => '1.29';
-requires 'HTML::FormHandler' => '0.27';
+requires 'HTML::FormHandler' => '0.28';
requires 'HTML::Tiny' => '1.05';
requires 'JSON' => '2.14';
requires 'Locale::Maketext' => '1.12';

Modified: mb_server/trunk/root/artist/edit.tt
===================================================================
--- mb_server/trunk/root/artist/edit.tt 2009-12-04 11:09:16 UTC (rev 12326)
+++ mb_server/trunk/root/artist/edit.tt 2009-12-04 13:27:50 UTC (rev 12327)
@@ -1,8 +1,3 @@
-[%- extra_js = 'artistform.js' -%]
-[%- SET guessCase=1 styleGuidelines=1 -%]
-[%- PROCESS 'scripts/suitereqs.tt' -%]
[% WRAPPER 'artist/layout.tt' title=l('Edit Artist') %]
- [% WRAPPER 'components/box.tt' header=l('Edit {artist}', {artist => ${artist.name}}) %]
- [% INCLUDE 'artist/edit_form.tt' %]
- [% END %]
-[% END %]
+ [% INCLUDE 'artist/edit_form.tt' %]
+[% END %]

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

r12326 - in mb_server/trunk: lib/MusicBrainz/Server/Edit/Label root/edit/details t t/actions/label

2009-12-04T03:09:17Z

Author: acid2
Date: 2009-12-04 11:09:16 +0000 (Fri, 04 Dec 2009)
New Revision: 12326

Modified:
mb_server/trunk/lib/MusicBrainz/Server/Edit/Label/Edit.pm
mb_server/trunk/root/edit/details/edit_label.tt
mb_server/trunk/t/actions/label/edit.t
mb_server/trunk/t/edit_label_edit.t
Log:
Edit label template. See review 466

Merge branch 'edit-label-template'

Modified: mb_server/trunk/lib/MusicBrainz/Server/Edit/Label/Edit.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Edit/Label/Edit.pm 2009-12-04 11:09:01 UTC (rev 12325)
+++ mb_server/trunk/lib/MusicBrainz/Server/Edit/Label/Edit.pm 2009-12-04 11:09:16 UTC (rev 12326)
@@ -6,8 +6,9 @@
use MooseX::Types::Structured qw( Dict Optional );
use MusicBrainz::Server::Constants qw( $EDIT_LABEL_EDIT );
use MusicBrainz::Server::Data::Label;
-use MusicBrainz::Server::Edit::Utils qw( date_closure );
+use MusicBrainz::Server::Edit::Utils qw( date_closure changed_relations changed_display_data );
use MusicBrainz::Server::Edit::Types qw( PartialDateHash Nullable );
+use MusicBrainz::Server::Data::Utils qw( partial_date_from_row );

extends 'MusicBrainz::Server::Edit::WithDifferences';

@@ -16,7 +17,6 @@

sub alter_edit_pending { { Label => [ shift->label_id ] } }
sub related_entities { { label => [ shift->label_id ] } }
-sub models { [qw( Label )] }

has 'label_id' => (
isa => 'Int',
@@ -50,6 +50,46 @@
]
);

+sub foreign_keys
+{
+ my $self = shift;
+ my $relations = {};
+ changed_relations($self->data, $relations,
+ LabelType => 'type_id',
+ Country => 'country_id',
+ );
+
+ return $relations;
+}
+
+sub build_display_data
+{
+ my ($self, $loaded) = @_;
+
+ my %map = (
+ name => 'name',
+ sort_name => 'sort_name',
+ type => [ qw( type_id LabelType ) ],
+ label_code => 'label_code',
+ comment => 'comment',
+ country => [ qw( country_id Country ) ],
+ );
+
+ my $data = changed_display_data($self->data, $loaded, %map);
+
+ for my $period (qw( begin end )) {
+ my $field = $period . '_date';
+ if (exists $self->data->{new}{$field}) {
+ $data->{$field} = {
+ new => partial_date_from_row($self->data->{new}{$field}),
+ old => partial_date_from_row($self->data->{old}{$field}),
+ };
+ }
+ }
+
+ return $data;
+}
+
sub _mapping
{
return (

Modified: mb_server/trunk/root/edit/details/edit_label.tt
===================================================================
--- mb_server/trunk/root/edit/details/edit_label.tt 2009-12-04 11:09:01 UTC (rev 12325)
+++ mb_server/trunk/root/edit/details/edit_label.tt 2009-12-04 11:09:16 UTC (rev 12326)
@@ -1,9 +1,65 @@
-[%- INCLUDE 'moderation/mods/diff_table.tt' changes=[
- { label=l('Name'), new=new.LabelName, prev=prev.LabelName },
- { label=l('Type'), new=new.Type, prev=prev.Type },
- { label=l('Sort name'), new=new.SortName, prev=prev.SortName },
- { label=l('Label code'), new=new.LabelCode, prev=prev.LabelCode },
- { label=l('Country'), new=new.Country, prev=prev.Country },
- { label=l('Founded'), new=new.BeginDate, prev=prev.BeginDate },
- { label=l('Dissolved'), new=new.EndDate, prev=prev.EndDate }
-] -%]
\ No newline at end of file
+<table class="details">
+ [% IF edit.display_data.name %]
+ <tr>
+ <th>[% l('Name:') %]</th>
+ <td class="old">[% edit.display_data.name.old %]</td>
+ <td class="new">[% edit.display_data.name.new %]</td>
+ </tr>
+ [% END %]
+
+ [% IF edit.display_data.sort_name %]
+ <tr>
+ <th>[% l('Sort name:') %]</th>
+ <td class="old">[% edit.display_data.sort_name.old %]</td>
+ <td class="new">[% edit.display_data.sort_name.new %]</td>
+ </tr>
+ [% END %]
+
+ [% IF edit.display_data.comment %]
+ <tr>
+ <th>[% l('Comment:') %]</th>
+ <td class="old">[% edit.display_data.comment.old %]</td>
+ <td class="new">[% edit.display_data.comment.new %]</td>
+ </tr>
+ [% END %]
+
+ [% IF edit.display_data.type %]
+ <tr>
+ <th>[% l('Type:') %]</th>
+ <td class="old">[% edit.display_data.type.old.name %]</td>
+ <td class="new">[% edit.display_data.type.new.name %]</td>
+ </tr>
+ [% END %]
+
+ [% IF edit.display_data.label_code %]
+ <tr>
+ <th>[% l('Label code:') %]</th>
+ <td class="old">[% edit.display_data.label_code.old %]</td>
+ <td class="new">[% edit.display_data.label_code.new %]</td>
+ </tr>
+ [% END %]
+
+ [% IF edit.display_data.begin_date %]
+ <tr>
+ <th>[% l('Begin date:') %]</th>
+ <td class="old">[% edit.display_data.begin_date.old.format %]</td>
+ <td class="new">[% edit.display_data.begin_date.new.format %]</td>
+ </tr>
+ [% END %]
+
+ [% IF edit.display_data.end_date %]
+ <tr>
+ <th>[% l('End date:') %]</th>
+ <td class="old">[% edit.display_data.end_date.old.format %]</td>
+ <td class="new">[% edit.display_data.end_date.new.format %]</td>
+ </tr>
+ [% END %]
+
+ [% IF edit.display_data.country %]
+ <tr>
+ <th>[% l('Country:') %]</th>
+ <td class="old">[% edit.display_data.country.old.name %]</td>
+ <td class="new">[% edit.display_data.country.new.name %]</td>
+ </tr>
+ [% END %]
+</table>

Modified: mb_server/trunk/t/actions/label/edit.t
===================================================================
--- mb_server/trunk/t/actions/label/edit.t 2009-12-04 11:09:01 UTC (rev 12325)
+++ mb_server/trunk/t/actions/label/edit.t 2009-12-04 11:09:16 UTC (rev 12326)
@@ -72,4 +72,19 @@
}
});

+$mech->get_ok('/edit/' . $edit->id, 'Fetch the edit page');
+xml_ok($mech->content, '..valid xml');
+$mech->content_contains('controller label', '..has new name');
+$mech->content_contains('Warp Records', '..has old name');
+$mech->content_contains('label, controller', '..has new sortname');
+$mech->content_contains('Warp Records', '..has old sortname');
+$mech->content_contains('Special MusicBrainz Label', '..has new type');
+$mech->content_contains('Production', '..has old type');
+$mech->content_contains('United States', '..has new country');
+$mech->content_contains('United Kingdom', '..has old country');
+$mech->content_contains('12345', '..has new label code');
+$mech->content_contains('2070', '..has old label code');
+$mech->content_like(qr/2008\D+05\D+19/, '..has new date');
+$mech->content_like(qr/1989\D+02\D+03/, '..has old date');
+
done_testing;

Modified: mb_server/trunk/t/edit_label_edit.t
===================================================================
--- mb_server/trunk/t/edit_label_edit.t 2009-12-04 11:09:01 UTC (rev 12325)
+++ mb_server/trunk/t/edit_label_edit.t 2009-12-04 11:09:16 UTC (rev 12326)
@@ -19,11 +19,9 @@
isa_ok($edit, 'MusicBrainz::Server::Edit::Label::Edit');

$edit = $c->model('Edit')->get_by_id($edit->id);
-$c->model('Edit')->load_all($edit);
-is($edit->label_id, $label->id);
-is($edit->label->id, $label->id);
-is_unchanged($edit->label);
-is($edit->label->edits_pending, 1);
+$label = $c->model('Label')->get_by_id(1);
+is_unchanged($label);
+is($label->edits_pending, 1);

my ($edits, $hits) = $c->model('Edit')->find({ label => $edit->label_id }, 10, 0);
is($edits->[0]->id, $edit->id);

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

r12325 - in mb_server/trunk: lib/MusicBrainz/Server/Edit/Label root/edit/details t t/actions/label

2009-12-04T03:09:02Z

Author: acid2
Date: 2009-12-04 11:09:01 +0000 (Fri, 04 Dec 2009)
New Revision: 12325

Added:
mb_server/trunk/root/edit/details/create_label.tt
Modified:
mb_server/trunk/lib/MusicBrainz/Server/Edit/Label/Create.pm
mb_server/trunk/t/actions/label/edit-create.t
mb_server/trunk/t/edit_label_create.t
Log:
Create label edit template.

See review 465

Modified: mb_server/trunk/lib/MusicBrainz/Server/Edit/Label/Create.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Edit/Label/Create.pm 2009-12-03 22:43:48 UTC (rev 12324)
+++ mb_server/trunk/lib/MusicBrainz/Server/Edit/Label/Create.pm 2009-12-04 11:09:01 UTC (rev 12325)
@@ -6,6 +6,7 @@
use Moose::Util::TypeConstraints qw( subtype find_type_constraint );
use MusicBrainz::Server::Constants qw( $EDIT_LABEL_CREATE );
use MusicBrainz::Server::Entity::Types;
+use MusicBrainz::Server::Data::Utils qw( partial_date_from_row );

extends 'MusicBrainz::Server::Edit';

@@ -14,7 +15,6 @@

sub related_entities { { label => [ shift->label_id ] } }
sub alter_edit_pending { { Label => [ shift->label_id ] } }
-sub models { [qw( Label ) ] }

has '+data' => (
isa => Dict[
@@ -37,6 +37,32 @@
]
);

+sub foreign_keys
+{
+ my $self = shift;
+
+ return {
+ LabelType => [ $self->data->{type_id} ],
+ Country => [ $self->data->{country_id} ],
+ };
+}
+
+sub build_display_data
+{
+ my ($self, $loaded) = @_;
+
+ my $data = {
+ name => $self->data->{name},
+ sort_name => $self->data->{sort_name},
+ type => $loaded->{LabelType}->{ $self->data->{type_id} },
+ label_code => $self->data->{label_code},
+ country => $loaded->{Country}->{ $self->data->{country_id} },
+ comment => $self->data->{comment},
+ begin_date => partial_date_from_row($self->data->{begin_date}),
+ end_date => partial_date_from_row($self->data->{end_date}),
+ };
+}
+
has 'label_id' => (
isa => 'Int',
is => 'rw'

Modified: mb_server/trunk/t/actions/label/edit-create.t
===================================================================
--- mb_server/trunk/t/actions/label/edit-create.t 2009-12-03 22:43:48 UTC (rev 12324)
+++ mb_server/trunk/t/actions/label/edit-create.t 2009-12-04 11:09:01 UTC (rev 12325)
@@ -53,4 +53,15 @@
},
});

+$mech->get_ok('/edit/' . $edit->id, 'Fetch the edit page');
+xml_ok($mech->content, '..valid xml');
+$mech->content_contains('controller label', '..has name');
+$mech->content_contains('label, controller', '..has sort name');
+$mech->content_contains('label created in controller_label.t', '..has comment');
+$mech->content_like(qr/1990\D+01\D+02/, '..has begin date');
+$mech->content_like(qr/2003\D+04\D+15/, '..has end date');
+$mech->content_contains('Special MusicBrainz Label', '..has type name');
+$mech->content_contains('United Kingdom', '..has country');
+$mech->content_contains('12345', '..has label code');
+
done_testing;

Modified: mb_server/trunk/t/edit_label_create.t
===================================================================
--- mb_server/trunk/t/edit_label_create.t 2009-12-03 22:43:48 UTC (rev 12324)
+++ mb_server/trunk/t/edit_label_create.t 2009-12-04 11:09:01 UTC (rev 12325)
@@ -27,23 +27,23 @@
is($edits->[0]->id, $edit->id);

$edit = $c->model('Edit')->get_by_id($edit->id);
-$c->model('Edit')->load_all($edit);
-ok(defined $edit->label);
-is($edit->label->name, '!K7');
-is($edit->label->sort_name, '!K7 Recordings');
-is($edit->label->type_id, 1);
-is($edit->label->comment, "Funky record label");
-is($edit->label->label_code, 7306);
-is($edit->label->edits_pending, 1);
-is($edit->label->begin_date->year, 1995);
-is($edit->label->begin_date->month, 1);
-is($edit->label->begin_date->day, 12);
-is($edit->label->end_date->year, 2005);
-is($edit->label->end_date->month, 5);
-is($edit->label->end_date->day, 30);
+my $label = $c->model('Label')->get_by_id($edit->label_id);
+is($label->edits_pending, 1);
+is($label->name, '!K7');
+is($label->sort_name, '!K7 Recordings');
+is($label->type_id, 1);
+is($label->comment, "Funky record label");
+is($label->label_code, 7306);
+is($label->edits_pending, 1);
+is($label->begin_date->year, 1995);
+is($label->begin_date->month, 1);
+is($label->begin_date->day, 12);
+is($label->end_date->year, 2005);
+is($label->end_date->month, 5);
+is($label->end_date->day, 30);

accept_edit($c, $edit);
-my $label = $c->model('Label')->get_by_id($edit->label_id);
+$label = $c->model('Label')->get_by_id($edit->label_id);
is($label->edits_pending, 0);

# Test rejecting the edit
@@ -51,8 +51,8 @@
reject_edit($c, $edit);

$edit = $c->model('Edit')->get_by_id($edit->id);
-$c->model('Edit')->load_all($edit);
-ok(!defined $edit->label);
+$label = $c->model('Label')->get_by_id($edit->label_id);
+ok(!defined $label);

done_testing;

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

r12324 - in search_server/branches/ngs: index/src/test/java/org/musicbrainz/search/index servlet/src/test/java/org/musicbrainz/search/servlet

2009-12-03T14:43:48Z

Author: ijabz
Date: 2009-12-03 22:43:48 +0000 (Thu, 03 Dec 2009)
New Revision: 12324

Modified:
search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/WorkIndexTest.java
search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindWorkTest.java
Log:
Added tests to show work types code work even though the work type code is currently empty in the real db

Modified: search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/WorkIndexTest.java
===================================================================
--- search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/WorkIndexTest.java 2009-12-03 21:58:57 UTC (rev 12323)
+++ search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/WorkIndexTest.java 2009-12-03 22:43:48 UTC (rev 12324)
@@ -56,10 +56,50 @@

stmt.addBatch("INSERT INTO work(" +
" id, gid, name,artist_credit,type, iswc, comment, editpending)" +
+ " VALUES (1, 'a539bb1e-f2e1-4b45-9db8-8053841e7503', 1, 1, null, 'T-101779304-1', null, 1);");
+ stmt.addBatch("INSERT INTO work_name(id, name, refcount) " +
+ "VALUES (1, 'Work', 1);");
+
+ stmt.addBatch("");
+
+ stmt.executeBatch();
+ stmt.close();
+ conn.close();
+ }
+
+ private void addWorkTwo() throws Exception {
+ Connection conn = createConnection();
+ conn.setAutoCommit(true);
+
+ Statement stmt = conn.createStatement();
+
+ stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (1,'Echo & The Bunnymen',1)");
+ stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (2,'Echo and The Bunnymen',1)");
+ stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (3,'Echo & The Bunnyman',1)");
+ stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (4,'Echo And The Bunnymen',1)");
+
+ stmt.addBatch("INSERT INTO artist_alias(id, artist, name, editpending) VALUES(1,16153,2,0);");
+ stmt.addBatch("INSERT INTO artist_alias(id, artist, name, editpending) VALUES(2,16153,3,0);");
+ stmt.addBatch("INSERT INTO artist_alias(id, artist, name, editpending) VALUES(3,16153,4,0);");
+
+ stmt.addBatch("INSERT INTO artist(id,name, gid, sortname,comment, begindate_year,begindate_month,enddate_year,type,editpending)" +
+ " VALUES (16153,1, 'ccd4879c-5e88-4385-b131-bf65296bf245',2,'a comment', 1978,null, 1995, 2, 0)");
+
+ stmt.addBatch("INSERT INTO artist_credit( " +
+ " id, artistcount, refcount) " +
+ " VALUES (1, 1, 1)");
+
+ stmt.addBatch("INSERT INTO artist_credit_name(" +
+ " artist_credit, position, artist,name, joinphrase)" +
+ " VALUES (1, 0, 16153, 1, null)");
+
+ stmt.addBatch("INSERT INTO work(" +
+ " id, gid, name,artist_credit,type, iswc, comment, editpending)" +
" VALUES (1, 'a539bb1e-f2e1-4b45-9db8-8053841e7503', 1, 1, 1, 'T-101779304-1', null, 1);");
stmt.addBatch("INSERT INTO work_name(id, name, refcount) " +
- "VALUES (1, 'Work', 1);");
+ "VALUES (1, 'Work', 1);");

+ stmt.addBatch("INSERT INTO work_type( id, name) VALUES (1, 'Opera')");
stmt.addBatch("");

stmt.executeBatch();
@@ -82,9 +122,37 @@
assertEquals("Echo & The Bunnymen", doc.getField(WorkIndexField.ARTIST.getName()).stringValue());
assertEquals(1, doc.getFields(WorkIndexField.ISWC.getName()).length);
assertEquals("T-101779304-1", doc.getField(WorkIndexField.ISWC.getName()).stringValue());
+ assertEquals(0, doc.getFields(WorkIndexField.TYPE.getName()).length);
+ ir.close();
+ }
+ }

+ public void testIndexWorkWithoutType() throws Exception {
+
+ addWorkOne();
+ RAMDirectory ramDir = new RAMDirectory();
+ createIndex(ramDir);
+ IndexReader ir = IndexReader.open(ramDir, true);
+ assertEquals(1, ir.numDocs());
+ {
+ Document doc = ir.document(0);
+ assertEquals(0, doc.getFields(WorkIndexField.TYPE.getName()).length);
+ ir.close();
+ }
}
- ir.close();
+
+ public void testIndexWorkWithType() throws Exception {
+
+ addWorkTwo();
+ RAMDirectory ramDir = new RAMDirectory();
+ createIndex(ramDir);
+ IndexReader ir = IndexReader.open(ramDir, true);
+ assertEquals(1, ir.numDocs());
+ {
+ Document doc = ir.document(0);
+ assertEquals(1, doc.getFields(WorkIndexField.TYPE.getName()).length);
+ assertEquals("opera", doc.getField(WorkIndexField.TYPE.getName()).stringValue());
+ ir.close();
+ }
}
-
}
\ No newline at end of file

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-12-03 21:58:57 UTC (rev 12323)
+++ search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindWorkTest.java 2009-12-03 22:43:48 UTC (rev 12324)
@@ -35,14 +35,16 @@
MbDocument doc = new MbDocument();
doc.addField(WorkIndexField.WORK_ID, "4ff89cf0-86af-11de-90ed-001fc6f176ff");
doc.addField(WorkIndexField.WORK, "Symphony No. 5");
- doc.addField(WorkIndexField.ISWC,"T-101779304-1");
+ doc.addField(WorkIndexField.ISWC, "T-101779304-1");
doc.addField(WorkIndexField.ARTIST_ID, "1f9df192-a621-4f54-8850-2c5373b7eac9");
doc.addField(WorkIndexField.ARTIST, "Ludwig van Beethoven");
doc.addField(WorkIndexField.ARTIST_NAME, "Ludwig van Beethoven");
doc.addField(WorkIndexField.ARTIST_NAMECREDIT, "Ludwig van Beethoven");
doc.addField(WorkIndexField.ARTIST_SORTNAME, "Beethoven, Ludwig van");
doc.addField(WorkIndexField.ARTIST_JOINPHRASE, "-");
+ doc.addField(WorkIndexField.TYPE, "opera");

+
writer.addDocument(doc.getLuceneDocument());
}
writer.close();
@@ -67,6 +69,33 @@
assertEquals("Symphony No. 5", doc.get(WorkIndexField.WORK));
}

+ public void testFindWorkByArtist() throws Exception {
+ Results res = ss.searchLucene("artist:\"Ludwig van Beethoven\"", 0, 10);
+ assertEquals(1, res.totalHits);
+ Result result = res.results.get(0);
+ MbDocument doc = result.doc;
+ assertEquals("4ff89cf0-86af-11de-90ed-001fc6f176ff", doc.get(WorkIndexField.WORK_ID));
+ assertEquals("Symphony No. 5", doc.get(WorkIndexField.WORK));
+ }
+
+ public void testFindWorkByISWC() throws Exception {
+ Results res = ss.searchLucene("iswc:\"T-101779304-1\"", 0, 10);
+ assertEquals(1, res.totalHits);
+ Result result = res.results.get(0);
+ MbDocument doc = result.doc;
+ assertEquals("4ff89cf0-86af-11de-90ed-001fc6f176ff", doc.get(WorkIndexField.WORK_ID));
+ assertEquals("Symphony No. 5", doc.get(WorkIndexField.WORK));
+ }
+
+ public void testFindWorkByType() throws Exception {
+ Results res = ss.searchLucene("type:\"opera\"", 0, 10);
+ assertEquals(1, res.totalHits);
+ Result result = res.results.get(0);
+ MbDocument doc = result.doc;
+ assertEquals("4ff89cf0-86af-11de-90ed-001fc6f176ff", doc.get(WorkIndexField.WORK_ID));
+ assertEquals("Symphony No. 5", doc.get(WorkIndexField.WORK));
+ }
+
/**
* Tests get same results as
* http://musicbrainz.org/ws/1/label/?type=xml&query=%22Jockey%20Slut%22
@@ -90,6 +119,7 @@
assertTrue(output.contains("<name>Ludwig van Beethoven</name>"));
assertTrue(output.contains("<sort-name>Beethoven, Ludwig van</sort-name>"));
assertTrue(output.contains("<iswc>T-101779304-1</iswc>"));
+ assertTrue(output.contains("type=\"opera\""));

}

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

r12323 - search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index

2009-12-03T13:58:58Z

Author: ijabz
Date: 2009-12-03 21:58:57 +0000 (Thu, 03 Dec 2009)
New Revision: 12323

Modified:
search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/RecordingIndexField.java
search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/ReleaseGroupIndexField.java
search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/ReleaseIndexField.java
search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/WorkIndexField.java
Log:
ARTIST_COMMENT needn't be searchable field except for artist index

Modified: search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/RecordingIndexField.java
===================================================================
--- search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/RecordingIndexField.java 2009-12-03 21:43:47 UTC (rev 12322)
+++ search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/RecordingIndexField.java 2009-12-03 21:58:57 UTC (rev 12323)
@@ -26,7 +26,7 @@
QUANTIZED_DURATION ("qdur", Field.Store.NO, Field.Index.NOT_ANALYZED, new KeywordAnalyzer()),
TRACKNUM ("tnum", Field.Store.YES, Field.Index.NOT_ANALYZED, new KeywordAnalyzer()),
RELEASE_TYPE ("type", Field.Store.YES, Field.Index.NOT_ANALYZED, new KeywordAnalyzer()),
- ARTIST_COMMENT ("comment", Field.Store.YES, Field.Index.ANALYZED),
+ ARTIST_COMMENT ("comment", Field.Store.YES, Field.Index.NO),
TRACK_OUTPUT ("trackoutoutput", Field.Store.YES, Field.Index.NO),
RECORDING_OUTPUT ("recordingoutput", Field.Store.YES, Field.Index.NO),
MEDIUM_POS_OUTPUT ("mediumposoutput", Field.Store.YES, Field.Index.NO),

Modified: search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/ReleaseGroupIndexField.java
===================================================================
--- search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/ReleaseGroupIndexField.java 2009-12-03 21:43:47 UTC (rev 12322)
+++ search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/ReleaseGroupIndexField.java 2009-12-03 21:58:57 UTC (rev 12323)
@@ -35,7 +35,7 @@
ARTIST_SORTNAME ("sortname", Field.Store.YES, Field.Index.ANALYZED),
ARTIST_NAMECREDIT ("creditname", Field.Store.YES, Field.Index.ANALYZED),
ARTIST_JOINPHRASE ("joinphrase", Field.Store.YES, Field.Index.NO), //Never Searched
- ARTIST_COMMENT ("artistcomment", Field.Store.YES, Field.Index.NO), //ONLY used by Html, maybe can be dropped
+ ARTIST_COMMENT ("artistcomment", Field.Store.YES, Field.Index.NO),
RELEASEGROUP_ID ("rgid", Field.Store.YES, Field.Index.NOT_ANALYZED, new KeywordAnalyzer()),
RELEASEGROUP ("releasegroup", Field.Store.YES, Field.Index.ANALYZED),
TYPE ("type", Field.Store.YES, Field.Index.NOT_ANALYZED, new KeywordAnalyzer()),

Modified: search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/ReleaseIndexField.java
===================================================================
--- search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/ReleaseIndexField.java 2009-12-03 21:43:47 UTC (rev 12322)
+++ search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/ReleaseIndexField.java 2009-12-03 21:58:57 UTC (rev 12323)
@@ -14,7 +14,7 @@
ARTIST_ID ("arid", Field.Store.YES, Field.Index.NOT_ANALYZED, new KeywordAnalyzer()),
ARTIST_NAME ("artist_name", Field.Store.YES, Field.Index.ANALYZED),
ARTIST_SORTNAME ("sortname", Field.Store.YES, Field.Index.ANALYZED),
- ARTIST_COMMENT ("comment", Field.Store.YES, Field.Index.ANALYZED),
+ ARTIST_COMMENT ("comment", Field.Store.YES, Field.Index.NO),
ARTIST_NAMECREDIT ("creditname", Field.Store.YES, Field.Index.ANALYZED),
ARTIST_JOINPHRASE ("joinphrase", Field.Store.YES, Field.Index.NO), //Never Searched
RELEASE_ID ("reid", Field.Store.YES, Field.Index.NOT_ANALYZED, new KeywordAnalyzer()),

Modified: search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/WorkIndexField.java
===================================================================
--- search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/WorkIndexField.java 2009-12-03 21:43:47 UTC (rev 12322)
+++ search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/WorkIndexField.java 2009-12-03 21:58:57 UTC (rev 12323)
@@ -14,7 +14,7 @@
ARTIST_ID ("arid", Field.Store.YES, Field.Index.NOT_ANALYZED, new KeywordAnalyzer()),
ARTIST_NAME ("artist_name", Field.Store.YES, Field.Index.ANALYZED),
ARTIST_SORTNAME ("sortname", Field.Store.YES, Field.Index.ANALYZED),
- ARTIST_COMMENT ("comment", Field.Store.YES, Field.Index.ANALYZED),
+ ARTIST_COMMENT ("comment", Field.Store.YES, Field.Index.NO),
ARTIST_NAMECREDIT ("creditname", Field.Store.YES, Field.Index.ANALYZED),
ARTIST_JOINPHRASE ("joinphrase", Field.Store.YES, Field.Index.NO), //Never Searched
WORK_ID ("wid", Field.Store.YES, Field.Index.NOT_ANALYZED, new KeywordAnalyzer()),

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

r12322 - in search_server/branches/ngs: index/src/main/java/org/musicbrainz/search/index index/src/test/java/org/musicbrainz/search/index servlet/src/main/java/org/musicbrainz/search/servlet servlet/src/main/java/org/musicbrainz/search/servlet/mmd1 servlet/src/main/java/org/musicbrainz/search/servlet/mmd2 servlet/src/test/java/org/musicbrainz/search/servlet

2009-12-03T13:43:47Z

Author: ijabz
Date: 2009-12-03 21:43:47 +0000 (Thu, 03 Dec 2009)
New Revision: 12322

Modified:
search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java
search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/RecordingIndexField.java
search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.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/mmd1/TrackMmd1XmlWriter.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/RecordingWriter.java
search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindRecordingTest.java
Log:
Changed tracks to tracksmedium to better reflect what the field is and to allow a separate tracks field

Modified: search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java
===================================================================
--- search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java 2009-12-03 15:48:50 UTC (rev 12321)
+++ search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java 2009-12-03 21:43:47 UTC (rev 12322)
@@ -289,7 +289,7 @@
if (tracks.containsKey(id)) {
//For each track for this recording
for (TrackWrapper track : tracks.get(id)) {
- doc.addNumericField(RecordingIndexField.NUM_TRACKS, track.getTrackCount());
+ doc.addNumericField(RecordingIndexField.NUM_TRACKS_MEDIUM, track.getTrackCount());
doc.addNumericField(RecordingIndexField.TRACKNUM, track.getTrackPosition());
doc.addFieldOrHyphen(RecordingIndexField.RELEASE_TYPE, track.getReleaseGroupType());
doc.addField(RecordingIndexField.RELEASE_ID, track.getReleaseId());

Modified: search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/RecordingIndexField.java
===================================================================
--- search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/RecordingIndexField.java 2009-12-03 15:48:50 UTC (rev 12321)
+++ search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/RecordingIndexField.java 2009-12-03 21:43:47 UTC (rev 12322)
@@ -20,7 +20,8 @@
ARTIST_SORTNAME ("sortname", Field.Store.YES, Field.Index.ANALYZED, new KeywordAnalyzer()),
RELEASE_ID ("reid", Field.Store.YES, Field.Index.NOT_ANALYZED),
RELEASE ("release", Field.Store.YES, Field.Index.ANALYZED),
- NUM_TRACKS ("tracks", Field.Store.YES, Field.Index.NOT_ANALYZED, new KeywordAnalyzer()),
+ NUM_TRACKS_MEDIUM ("tracksmedium", Field.Store.YES, Field.Index.NOT_ANALYZED, new KeywordAnalyzer()),
+ NUM_TRACKS ("tracks", Field.Store.YES, Field.Index.NOT_ANALYZED, new KeywordAnalyzer()),
DURATION ("dur", Field.Store.YES, Field.Index.NOT_ANALYZED, new KeywordAnalyzer()),
QUANTIZED_DURATION ("qdur", Field.Store.NO, Field.Index.NOT_ANALYZED, new KeywordAnalyzer()),
TRACKNUM ("tnum", Field.Store.YES, Field.Index.NOT_ANALYZED, new KeywordAnalyzer()),
@@ -29,10 +30,8 @@
TRACK_OUTPUT ("trackoutoutput", Field.Store.YES, Field.Index.NO),
RECORDING_OUTPUT ("recordingoutput", Field.Store.YES, Field.Index.NO),
MEDIUM_POS_OUTPUT ("mediumposoutput", Field.Store.YES, Field.Index.NO),
- ISRC ("isrc", Field.Store.YES, Field.Index.ANALYZED, new CaseInsensitiveKeywordAnalyzer()),
+ ISRC ("isrc", Field.Store.YES, Field.Index.ANALYZED, new CaseInsensitiveKeywordAnalyzer());

- ;
-
private String name;
private Field.Store store;
private Field.Index index;

Modified: search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java
===================================================================
--- search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java 2009-12-03 15:48:50 UTC (rev 12321)
+++ search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java 2009-12-03 21:43:47 UTC (rev 12322)
@@ -178,7 +178,7 @@
assertEquals("Echo & The Bunnymen", doc.getField(RecordingIndexField.ARTIST.getName()).stringValue());
assertEquals("Echo and The Bunnymen", doc.getField(RecordingIndexField.ARTIST_SORTNAME.getName()).stringValue());
assertEquals("ccd4879c-5e88-4385-b131-bf65296bf245", doc.getField(RecordingIndexField.ARTIST_ID.getName()).stringValue());
- assertEquals(2, NumericUtils.prefixCodedToInt(doc.getField(RecordingIndexField.NUM_TRACKS.getName()).stringValue()));
+ assertEquals(2, NumericUtils.prefixCodedToInt(doc.getField(RecordingIndexField.NUM_TRACKS_MEDIUM.getName()).stringValue()));
assertEquals(4, NumericUtils.prefixCodedToInt(doc.getField(RecordingIndexField.TRACKNUM.getName()).stringValue()));
assertEquals(33000, NumericUtils.prefixCodedToInt(doc.getField(RecordingIndexField.DURATION.getName()).stringValue()));
assertEquals("1234568", doc.getField(RecordingIndexField.ISRC.getName()).stringValue());

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-12-03 15:48:50 UTC (rev 12321)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/RecordingQueryParser.java 2009-12-03 21:43:47 UTC (rev 12322)
@@ -36,7 +36,7 @@
(term.field() == RecordingIndexField.DURATION.getName()) ||
(term.field() == RecordingIndexField.QUANTIZED_DURATION.getName()) ||
(term.field() == RecordingIndexField.TRACKNUM.getName()) ||
- (term.field() == RecordingIndexField.NUM_TRACKS.getName())
+ (term.field() == RecordingIndexField.NUM_TRACKS_MEDIUM.getName())
) {
try
{
@@ -110,7 +110,7 @@
(field.equals(RecordingIndexField.DURATION.getName())) ||
(field.equals(RecordingIndexField.QUANTIZED_DURATION.getName())) ||
(field.equals(RecordingIndexField.TRACKNUM.getName())) ||
- (field.equals(RecordingIndexField.NUM_TRACKS.getName()))
+ (field.equals(RecordingIndexField.NUM_TRACKS_MEDIUM.getName()))
)
{
part1 = NumericUtils.intToPrefixCoded(Integer.parseInt(part1));

Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/TrackMmd1XmlWriter.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/TrackMmd1XmlWriter.java 2009-12-03 15:48:50 UTC (rev 12321)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/TrackMmd1XmlWriter.java 2009-12-03 21:43:47 UTC (rev 12322)
@@ -88,7 +88,7 @@

String[] releaseIds = doc.getValues(RecordingIndexField.RELEASE_ID);
String[] releaseTypes = doc.getValues(RecordingIndexField.RELEASE_TYPE);
- String[] numTracks = doc.getValues(RecordingIndexField.NUM_TRACKS);
+ String[] numTracks = doc.getValues(RecordingIndexField.NUM_TRACKS_MEDIUM);
String[] trackNos = doc.getValues(RecordingIndexField.TRACKNUM);
String[] releases = doc.getValues(RecordingIndexField.RELEASE);

Modified: 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/RecordingWriter.java 2009-12-03 15:48:50 UTC (rev 12321)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/RecordingWriter.java 2009-12-03 21:43:47 UTC (rev 12322)
@@ -105,7 +105,7 @@
String[] releaseIds = doc.getValues(RecordingIndexField.RELEASE_ID);
String[] releaseTypes = doc.getValues(RecordingIndexField.RELEASE_TYPE);
String[] trackNos = doc.getValues(RecordingIndexField.TRACKNUM);
- String[] numTracks = doc.getValues(RecordingIndexField.NUM_TRACKS);
+ String[] numTracks = doc.getValues(RecordingIndexField.NUM_TRACKS_MEDIUM);
String[] trackName = doc.getValues(RecordingIndexField.TRACK_OUTPUT);
String[] mediumPos = doc.getValues(RecordingIndexField.MEDIUM_POS_OUTPUT);

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-12-03 15:48:50 UTC (rev 12321)
+++ search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindRecordingTest.java 2009-12-03 21:43:47 UTC (rev 12322)
@@ -52,7 +52,7 @@

doc.addNumericField(RecordingIndexField.DURATION, 234000);
doc.addNumericField(RecordingIndexField.QUANTIZED_DURATION, (234000 / 2000));
- doc.addNumericField(RecordingIndexField.NUM_TRACKS,10);
+ doc.addNumericField(RecordingIndexField.NUM_TRACKS_MEDIUM,10);
doc.addNumericField(RecordingIndexField.TRACKNUM, 5);
doc.addField(RecordingIndexField.TRACK_OUTPUT, "Gravitational Lens");
doc.addField(RecordingIndexField.RECORDING, "Gravitational Lens");
@@ -173,8 +173,8 @@
MbDocument doc = result.doc;
assertEquals("7ca7782b-a602-448b-b108-bb881a7be2d6", doc.get(RecordingIndexField.RECORDING_ID));
}
- public void testFindRecordingByNumberOfTracksOnRelease() throws Exception {
- Results res = ss.searchLucene("tracks:10", 0, 10);
+ public void testFindRecordingByNumberOfTracksOnMediumOnRelease() throws Exception {
+ Results res = ss.searchLucene("tracksmedium:10", 0, 10);
assertEquals(1, res.totalHits);
Result result = res.results.get(0);
MbDocument doc = result.doc;

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

r12321 - in mb_server/trunk/t/actions: artist label recording release_editor release_group work

2009-12-03T07:48:50Z

Author: acid2
Date: 2009-12-03 15:48:50 +0000 (Thu, 03 Dec 2009)
New Revision: 12321

Modified:
mb_server/trunk/t/actions/artist/artist-edit-add-annotation.t
mb_server/trunk/t/actions/label/edit-add-annotation.t
mb_server/trunk/t/actions/label/edit.t
mb_server/trunk/t/actions/recording/edit-add-annotation.t
mb_server/trunk/t/actions/release_editor/edit-medium.t
mb_server/trunk/t/actions/release_group/edit-add-annotation.t
mb_server/trunk/t/actions/work/add-annotation.t
Log:
Fix a few failing tests

Modified: mb_server/trunk/t/actions/artist/artist-edit-add-annotation.t
===================================================================
--- mb_server/trunk/t/actions/artist/artist-edit-add-annotation.t 2009-12-03 15:48:37 UTC (rev 12320)
+++ mb_server/trunk/t/actions/artist/artist-edit-add-annotation.t 2009-12-03 15:48:50 UTC (rev 12321)
@@ -16,7 +16,7 @@
$mech->get_ok('/artist/745c079d-374e-4436-9448-da92dedef3ce/edit_annotation');
$mech->submit_form(
with_fields => {
- 'edit-annotation.text' => 'This is my annotation',
+ 'edit-annotation.text' => 'Test annotation 1. This is my annotation',
'edit-annotation.changelog' => 'Changelog here',
});

@@ -24,7 +24,7 @@
isa_ok($edit, 'MusicBrainz::Server::Edit::Artist::AddAnnotation');
is_deeply($edit->data, {
entity_id => 3,
- text => 'This is my annotation',
+ text => 'Test annotation 1. This is my annotation',
changelog => 'Changelog here',
editor_id => 1
});

Modified: mb_server/trunk/t/actions/label/edit-add-annotation.t
===================================================================
--- mb_server/trunk/t/actions/label/edit-add-annotation.t 2009-12-03 15:48:37 UTC (rev 12320)
+++ mb_server/trunk/t/actions/label/edit-add-annotation.t 2009-12-03 15:48:50 UTC (rev 12321)
@@ -14,7 +14,7 @@
$mech->get_ok('/label/4b4ccf60-658e-11de-8a39-0800200c9a66/edit_annotation');
$mech->submit_form(
with_fields => {
- 'edit-annotation.text' => 'This is my annotation',
+ 'edit-annotation.text' => 'Test annotation 2. This is my annotation',
'edit-annotation.changelog' => 'Changelog here',
});

@@ -22,7 +22,7 @@
isa_ok($edit, 'MusicBrainz::Server::Edit::Label::AddAnnotation');
is_deeply($edit->data, {
entity_id => 3,
- text => 'This is my annotation',
+ text => 'Test annotation 2. This is my annotation',
changelog => 'Changelog here',
editor_id => 1
});

Modified: mb_server/trunk/t/actions/label/edit.t
===================================================================
--- mb_server/trunk/t/actions/label/edit.t 2009-12-03 15:48:37 UTC (rev 12320)
+++ mb_server/trunk/t/actions/label/edit.t 2009-12-03 15:48:50 UTC (rev 12321)
@@ -19,7 +19,7 @@
'edit-label.sort_name' => 'label, controller',
'edit-label.type_id' => 2,
'edit-label.label_code' => 12345,
- 'edit-label.country_id' => 1,
+ 'edit-label.country_id' => 2,
'edit-label.begin_date.year' => 1990,
'edit-label.begin_date.month' => 01,
'edit-label.begin_date.day' => 02,
@@ -38,7 +38,7 @@
name => 'controller label',
sort_name => 'label, controller',
type_id => 2,
- country_id => 1,
+ country_id => 2,
label_code => 12345,
comment => 'label created in controller_label.t',
begin_date => {

Modified: mb_server/trunk/t/actions/recording/edit-add-annotation.t
===================================================================
--- mb_server/trunk/t/actions/recording/edit-add-annotation.t 2009-12-03 15:48:37 UTC (rev 12320)
+++ mb_server/trunk/t/actions/recording/edit-add-annotation.t 2009-12-03 15:48:50 UTC (rev 12321)
@@ -14,7 +14,7 @@
$mech->get_ok('/recording/123c079d-374e-4436-9448-da92dedef3ce/edit_annotation');
$mech->submit_form(
with_fields => {
- 'edit-annotation.text' => 'This is my annotation',
+ 'edit-annotation.text' => 'Test annotation 3. This is my annotation',
'edit-annotation.changelog' => 'Changelog here',
});

@@ -22,7 +22,7 @@
isa_ok($edit, 'MusicBrainz::Server::Edit::Recording::AddAnnotation');
is_deeply($edit->data, {
entity_id => 1,
- text => 'This is my annotation',
+ text => 'Test annotation 3. This is my annotation',
changelog => 'Changelog here',
editor_id => 1
});

Modified: mb_server/trunk/t/actions/release_editor/edit-medium.t
===================================================================
--- mb_server/trunk/t/actions/release_editor/edit-medium.t 2009-12-03 15:48:37 UTC (rev 12320)
+++ mb_server/trunk/t/actions/release_editor/edit-medium.t 2009-12-03 15:48:50 UTC (rev 12321)
@@ -39,11 +39,6 @@
}
}, '...edit has the right data');

-$c->model('Edit')->load_all($edit);
-use Data::Dumper;
-warn Dumper $edit->display_data;
-
-
$mech->get_ok('/edit/' . $edit->id);
xml_ok($mech->content, '..valid xml');
$mech->content_contains('Renamed Medium', '..has new medium name');

Modified: mb_server/trunk/t/actions/release_group/edit-add-annotation.t
===================================================================
--- mb_server/trunk/t/actions/release_group/edit-add-annotation.t 2009-12-03 15:48:37 UTC (rev 12320)
+++ mb_server/trunk/t/actions/release_group/edit-add-annotation.t 2009-12-03 15:48:50 UTC (rev 12321)
@@ -14,7 +14,7 @@
$mech->get_ok('/release-group/234c079d-374e-4436-9448-da92dedef3ce/edit_annotation');
$mech->submit_form(
with_fields => {
- 'edit-annotation.text' => 'This is my annotation',
+ 'edit-annotation.text' => 'Test annotation 5. This is my annotation',
'edit-annotation.changelog' => 'Changelog here',
});

@@ -22,7 +22,7 @@
isa_ok($edit, 'MusicBrainz::Server::Edit::ReleaseGroup::AddAnnotation');
is_deeply($edit->data, {
entity_id => 1,
- text => 'This is my annotation',
+ text => 'Test annotation 5. This is my annotation',
changelog => 'Changelog here',
editor_id => 1
});

Modified: mb_server/trunk/t/actions/work/add-annotation.t
===================================================================
--- mb_server/trunk/t/actions/work/add-annotation.t 2009-12-03 15:48:37 UTC (rev 12320)
+++ mb_server/trunk/t/actions/work/add-annotation.t 2009-12-03 15:48:50 UTC (rev 12321)
@@ -15,7 +15,7 @@
$mech->get_ok("/work/745c079d-374e-4436-9448-da92dedef3ce/edit_annotation");
$mech->submit_form(
with_fields => {
- 'edit-annotation.text' => 'This is my annotation',
+ 'edit-annotation.text' => 'Test annotation 6. This is my annotation',
'edit-annotation.changelog' => 'Changelog here',
}
);
@@ -26,7 +26,7 @@
$edit->data,
{
entity_id => 1,
- text => 'This is my annotation',
+ text => 'Test annotation 6. This is my annotation',
changelog => 'Changelog here',
editor_id => 1
}

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

r12320 - mb_server/trunk/t/actions/edit_relationship

2009-12-03T07:48:38Z

Author: acid2
Date: 2009-12-03 15:48:37 +0000 (Thu, 03 Dec 2009)
New Revision: 12320

Modified:
mb_server/trunk/t/actions/edit_relationship/edit.t
Log:
Fix edit_relationship/edit tests

Modified: mb_server/trunk/t/actions/edit_relationship/edit.t
===================================================================
--- mb_server/trunk/t/actions/edit_relationship/edit.t 2009-12-03 15:48:27 UTC (rev 12319)
+++ mb_server/trunk/t/actions/edit_relationship/edit.t 2009-12-03 15:48:37 UTC (rev 12320)
@@ -33,7 +33,6 @@
type1 => 'recording',
relationship_id => 1,
old => {
- link_type_id => 1,
begin_date => {
year => undef,
month => undef,
@@ -47,7 +46,6 @@
attributes => [4],
},
new => {
- link_type_id => 1,
begin_date => {
year => 1994,
month => undef,
@@ -62,4 +60,4 @@
},
});

-done_testing;
\ No newline at end of file
+done_testing;

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

r12319 - in mb_server/trunk/t: . actions actions/admin actions/ajax actions/artist actions/browse actions/cdtoc actions/edit_relationship actions/isrc actions/label actions/puid actions/recording actions/release actions/release_group actions/search actions/tag actions/tracklist actions/url actions/user actions/work controllers sql

2009-12-03T07:48:27Z

Author: acid2
Date: 2009-12-03 15:48:27 +0000 (Thu, 03 Dec 2009)
New Revision: 12319

Added:
mb_server/trunk/t/actions/admin/
mb_server/trunk/t/actions/admin/linkattributetype.t
mb_server/trunk/t/actions/admin/wikidoc.t
mb_server/trunk/t/actions/ajax/
mb_server/trunk/t/actions/ajax/search.t
mb_server/trunk/t/actions/artist/
mb_server/trunk/t/actions/artist/artist-aliases.t
mb_server/trunk/t/actions/artist/artist-edit-add-alias.t
mb_server/trunk/t/actions/artist/artist-edit-add-annotation.t
mb_server/trunk/t/actions/artist/artist-edit-create.t
mb_server/trunk/t/actions/artist/artist-edit-delete-alias.t
mb_server/trunk/t/actions/artist/artist-edit-delete.t
mb_server/trunk/t/actions/artist/artist-edit-edit.t
mb_server/trunk/t/actions/artist/artist-edit-merge.t
mb_server/trunk/t/actions/artist/artist-edit-tagging.t
mb_server/trunk/t/actions/artist/artist-index.t
mb_server/trunk/t/actions/artist/artist-ratings.t
mb_server/trunk/t/actions/artist/artist-recordings.t
mb_server/trunk/t/actions/artist/artist-relationships.t
mb_server/trunk/t/actions/artist/artist-releases.t
mb_server/trunk/t/actions/artist/artist-tags.t
mb_server/trunk/t/actions/artist/artist-works.t
mb_server/trunk/t/actions/browse/
mb_server/trunk/t/actions/browse/browse.t
mb_server/trunk/t/actions/cdtoc/
mb_server/trunk/t/actions/cdtoc/cdtoc.t
mb_server/trunk/t/actions/edit_relationship/
mb_server/trunk/t/actions/edit_relationship/delete.t
mb_server/trunk/t/actions/edit_relationship/edit.t
mb_server/trunk/t/actions/isrc/
mb_server/trunk/t/actions/isrc/isrc.t
mb_server/trunk/t/actions/label/
mb_server/trunk/t/actions/label/aliases.t
mb_server/trunk/t/actions/label/edit-add-alias.t
mb_server/trunk/t/actions/label/edit-add-annotation.t
mb_server/trunk/t/actions/label/edit-create.t
mb_server/trunk/t/actions/label/edit-delete-alias.t
mb_server/trunk/t/actions/label/edit-delete.t
mb_server/trunk/t/actions/label/edit-merge.t
mb_server/trunk/t/actions/label/edit.t
mb_server/trunk/t/actions/label/index.t
mb_server/trunk/t/actions/label/ratings.t
mb_server/trunk/t/actions/label/tags.t
mb_server/trunk/t/actions/puid/
mb_server/trunk/t/actions/puid/index.t
mb_server/trunk/t/actions/recording/
mb_server/trunk/t/actions/recording/edit-add-annotation.t
mb_server/trunk/t/actions/recording/index.t
mb_server/trunk/t/actions/recording/puids.t
mb_server/trunk/t/actions/recording/ratings.t
mb_server/trunk/t/actions/recording/tags.t
mb_server/trunk/t/actions/release/
mb_server/trunk/t/actions/release/discids.t
mb_server/trunk/t/actions/release/edit-add-annotation.t
mb_server/trunk/t/actions/release/index.t
mb_server/trunk/t/actions/release_group/
mb_server/trunk/t/actions/release_group/edit-add-annotation.t
mb_server/trunk/t/actions/release_group/edit-remove.t
mb_server/trunk/t/actions/release_group/index.t
mb_server/trunk/t/actions/release_group/ratings.t
mb_server/trunk/t/actions/release_group/tags.t
mb_server/trunk/t/actions/search/
mb_server/trunk/t/actions/search/direct.t
mb_server/trunk/t/actions/tag/
mb_server/trunk/t/actions/tag/tags.t
mb_server/trunk/t/actions/tracklist/
mb_server/trunk/t/actions/tracklist/index.t
mb_server/trunk/t/actions/url/
mb_server/trunk/t/actions/url/index.t
mb_server/trunk/t/actions/user/
mb_server/trunk/t/actions/user/change-password.t
mb_server/trunk/t/actions/user/edit.t
mb_server/trunk/t/actions/user/login.t
mb_server/trunk/t/actions/user/logout.t
mb_server/trunk/t/actions/user/lost-password.t
mb_server/trunk/t/actions/user/lost-username.t
mb_server/trunk/t/actions/work/
mb_server/trunk/t/actions/work/add-annotation.t
mb_server/trunk/t/actions/work/edit.t
mb_server/trunk/t/actions/work/index.t
mb_server/trunk/t/actions/work/ratings.t
mb_server/trunk/t/actions/work/tags.t
mb_server/trunk/t/controllers.t
mb_server/trunk/t/controllers/admin.t
mb_server/trunk/t/controllers/ajax.t
mb_server/trunk/t/controllers/artist.t
mb_server/trunk/t/controllers/browse.t
mb_server/trunk/t/controllers/cdtoc.t
mb_server/trunk/t/controllers/edit_relationship.t
mb_server/trunk/t/controllers/isrc.t
mb_server/trunk/t/controllers/label.t
mb_server/trunk/t/controllers/puid.t
mb_server/trunk/t/controllers/recording.t
mb_server/trunk/t/controllers/release.t
mb_server/trunk/t/controllers/release_group.t
mb_server/trunk/t/controllers/search.t
mb_server/trunk/t/controllers/tag.t
mb_server/trunk/t/controllers/tracklist.t
mb_server/trunk/t/controllers/url.t
mb_server/trunk/t/controllers/user.t
mb_server/trunk/t/controllers/work.t
mb_server/trunk/t/sql/controller_artist.sql
mb_server/trunk/t/sql/controller_browse.sql
mb_server/trunk/t/sql/controller_cdtoc.sql
mb_server/trunk/t/sql/controller_isrc.sql
Removed:
mb_server/trunk/t/controller_admin.t
mb_server/trunk/t/controller_admin_linkattributetype.t
mb_server/trunk/t/controller_admin_wikidoc.t
mb_server/trunk/t/controller_ajax.t
mb_server/trunk/t/controller_artist.t
mb_server/trunk/t/controller_browse.t
mb_server/trunk/t/controller_cdtoc.t
mb_server/trunk/t/controller_edit_relationship.t
mb_server/trunk/t/controller_isrc.t
mb_server/trunk/t/controller_label.t
mb_server/trunk/t/controller_puid.t
mb_server/trunk/t/controller_recording.t
mb_server/trunk/t/controller_release.t
mb_server/trunk/t/controller_release_edit.t
mb_server/trunk/t/controller_release_group.t
mb_server/trunk/t/controller_search.t
mb_server/trunk/t/controller_tag.t
mb_server/trunk/t/controller_tracklist.t
mb_server/trunk/t/controller_url.t
mb_server/trunk/t/controller_user.t
mb_server/trunk/t/controller_work.t
Log:
Merge support for aggregating controller tests.

This now means each area of the site is tested in a single file. Furthermore,
each test now supports aggregation, allowing you to test the entire website with
only a single server instance.

See review 455

Merge branch 'controller-tests'

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

r12318 - mb_server/trunk

2009-12-03T07:47:22Z

Author: acid2
Date: 2009-12-03 15:47:22 +0000 (Thu, 03 Dec 2009)
New Revision: 12318

Added:
mb_server/trunk/META.yml
Log:
Add META.yml

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

r12317 - in mb_server/trunk: lib/MusicBrainz/Server/Controller lib/MusicBrainz/Server/Edit/Work lib/MusicBrainz/Server/Form root/edit/details root/static/scripts root/work t

2009-12-03T07:47:14Z

Author: acid2
Date: 2009-12-03 15:47:13 +0000 (Thu, 03 Dec 2009)
New Revision: 12317

Added:
mb_server/trunk/root/edit/details/edit_work.tt
mb_server/trunk/root/static/scripts/edit_work.js
Modified:
mb_server/trunk/lib/MusicBrainz/Server/Controller/Work.pm
mb_server/trunk/lib/MusicBrainz/Server/Edit/Work/Edit.pm
mb_server/trunk/lib/MusicBrainz/Server/Form/Work.pm
mb_server/trunk/root/work/edit.tt
mb_server/trunk/root/work/edit_form.tt
mb_server/trunk/t/controller_work.t
mb_server/trunk/t/edit_work_edit.t
Log:
Improved edit work action. See review 462

Merge branch 'edit-work-revamp'

Modified: mb_server/trunk/lib/MusicBrainz/Server/Controller/Work.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Controller/Work.pm 2009-11-30 17:38:27 UTC (rev 12316)
+++ mb_server/trunk/lib/MusicBrainz/Server/Controller/Work.pm 2009-12-03 15:47:13 UTC (rev 12317)
@@ -48,7 +48,7 @@
$c->model('WorkType')->load($work);
$c->model('ArtistCredit')->load($work);

- my $form = $c->form(form => 'Work', item => $work);
+ my $form = $c->form(form => 'Work', init_object => $work);
if ($c->form_posted && $form->submitted_and_valid($c->req->params)) {
my $edit = $c->model('Edit')->create(
editor_id => $c->user->id,
@@ -56,7 +56,8 @@
work => $work,

(map { $_ => $form->field($_)->value }
- qw( type_id name comment iswc ))
+ grep { $form->field($_)->has_value }
+ qw( type_id name comment iswc artist_credit ))
);

$c->response->redirect($c->uri_for_action('/work/show', [ $work->gid ]));

Modified: mb_server/trunk/lib/MusicBrainz/Server/Edit/Work/Edit.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Edit/Work/Edit.pm 2009-11-30 17:38:27 UTC (rev 12316)
+++ mb_server/trunk/lib/MusicBrainz/Server/Edit/Work/Edit.pm 2009-12-03 15:47:13 UTC (rev 12317)
@@ -6,6 +6,12 @@
use MooseX::Types::Structured qw( Dict Optional );
use Moose::Util::TypeConstraints qw( find_type_constraint subtype as );
use MusicBrainz::Server::Edit::Types qw( ArtistCreditDefinition Nullable );
+use MusicBrainz::Server::Edit::Utils qw(
+ changed_relations
+ changed_display_data
+ load_artist_credit_definitions
+ artist_credit_from_loaded_definition
+);
use MusicBrainz::Server::Entity::Types;
use MusicBrainz::Server::Data::Utils qw( artist_credit_to_ref );

@@ -16,7 +22,6 @@

sub related_entities { { work => [ shift->work_id ] } }
sub alter_edit_pending { { Work => [ shift->work_id ] } }
-sub models { [qw( Work )] }

has 'work_id' => (
isa => 'Int',
@@ -47,6 +52,48 @@
],
);

+sub foreign_keys
+{
+ my $self = shift;
+ my $relations = {};
+ changed_relations($self->data, $relations,
+ WorkType => 'type_id',
+ );
+
+ if (exists $self->data->{new}{artist_credit}) {
+ $relations->{Artist} = {
+ map {
+ load_artist_credit_definitions($self->data->{$_}{artist_credit})
+ } qw( new old )
+ }
+ }
+
+ return $relations;
+}
+
+sub build_display_data
+{
+ my ($self, $loaded) = @_;
+
+ my %map = (
+ name => 'name',
+ comment => 'comment',
+ type => [ qw( type_id WorkType ) ],
+ iswc => 'iswc',
+ );
+
+ my $data = changed_display_data($self->data, $loaded, %map);
+
+ if (exists $self->data->{new}{artist_credit}) {
+ $data->{artist_credit} = {
+ new => artist_credit_from_loaded_definition($loaded, $self->data->{new}{artist_credit}),
+ old => artist_credit_from_loaded_definition($loaded, $self->data->{old}{artist_credit})
+ }
+ }
+
+ return $data;
+}
+
sub initialize
{
my ($self, %opts) = @_;

Modified: mb_server/trunk/lib/MusicBrainz/Server/Form/Work.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Form/Work.pm 2009-11-30 17:38:27 UTC (rev 12316)
+++ mb_server/trunk/lib/MusicBrainz/Server/Form/Work.pm 2009-12-03 15:47:13 UTC (rev 12317)
@@ -2,6 +2,8 @@
use HTML::FormHandler::Moose;
extends 'MusicBrainz::Server::Form';

+with 'MusicBrainz::Server::Form::Edit';
+
has '+name' => ( default => 'edit-work' );

has_field 'type_id' => (
@@ -21,6 +23,10 @@
type => 'Text',
);

+has_field 'artist_credit' => (
+ type => '+MusicBrainz::Server::Form::Field::ArtistCredit',
+);
+
sub options_type_id { shift->_select_all('WorkType') }

1;

Modified: mb_server/trunk/root/work/edit.tt
===================================================================
--- mb_server/trunk/root/work/edit.tt 2009-11-30 17:38:27 UTC (rev 12316)
+++ mb_server/trunk/root/work/edit.tt 2009-12-03 15:47:13 UTC (rev 12317)
@@ -1,3 +1,19 @@
+[%- BLOCK layout_head -%]
+ <script src="[% c.uri_for('/static/scripts/MB.js') %]" type="text/javascript"></script>
+ <script src="[% c.uri_for('/static/scripts/MB/html.js') %]" type="text/javascript"></script>
+ <script src="[% c.uri_for('/static/scripts/MB/utility.js') %]" type="text/javascript"></script>
+ <script src="[% c.uri_for('/static/scripts/MB/predicate.js') %]" type="text/javascript"></script>
+ <script src="[% c.uri_for('/static/scripts/MB/Control/ArtistCreditEditor.js') %]" type="text/javascript"></script>
+ <script src="[% c.uri_for('/static/scripts/MB/Control/InlineDialog.js') %]" type="text/javascript"></script>
+ <script src="[% c.uri_for('/static/scripts/MB/Control/Lookup.js') %]" type="text/javascript"></script>
+ <script src="[% c.uri_for('/static/scripts/MB/Control/Overlay.js') %]" type="text/javascript"></script>
+ <script src="[% c.uri_for('/static/scripts/MB/Control/ToggleButton.js') %]" type="text/javascript"></script>
+ <script src="[% c.uri_for('/static/scripts/MB/Control/TableSorting.js') %]" type="text/javascript"></script>
+ <script src="[% c.uri_for('/static/scripts/edit_work.js') %]" type="text/javascript"></script>
+ <script src="[% c.uri_for('/text.js') %]" type="text/javascript"></script>
+ <link type="text/css" rel="stylesheet" href="[% c.uri_for('/static/styles/release-editor.css') %]" />
+[%- END -%]
+
[% WRAPPER 'layout.tt' full_width=1 %]
[% INCLUDE 'work/header.tt' %]
[% INCLUDE 'work/edit_form.tt' %]

Modified: mb_server/trunk/root/work/edit_form.tt
===================================================================
--- mb_server/trunk/root/work/edit_form.tt 2009-11-30 17:38:27 UTC (rev 12316)
+++ mb_server/trunk/root/work/edit_form.tt 2009-12-03 15:47:13 UTC (rev 12317)
@@ -1,6 +1,11 @@
<form action="[% c.req.uri %]" method="post">
[% USE r = FormRenderer(form) %]
[% form.errors.join(" ") %]
+ <div class="row" id="artist">
+ [% r.label('artist_credit', l('Artist:'), fake => 1) %]
+ [% r.artist_credit_editor('artist_credit') %]
+ </div>
+
<p>
[% r.label('name', l('Name:')) %]
[% r.text('name') %]
@@ -18,4 +23,4 @@
[% r.select('type_id') %]
</p>
[% form_submit(l('Enter Edit')) %]
-</form>
\ No newline at end of file
+</form>

Modified: mb_server/trunk/t/controller_work.t
===================================================================
--- mb_server/trunk/t/controller_work.t 2009-11-30 17:38:27 UTC (rev 12316)
+++ mb_server/trunk/t/controller_work.t 2009-12-03 15:47:13 UTC (rev 12317)
@@ -53,8 +53,8 @@
'edit-work.comment' => 'A comment!',
'edit-work.type_id' => 2,
'edit-work.name' => 'Another name',
- 'edit-work.artist_credit.0.name' => 'Foo',
- 'edit-work.artist_credit.0.artist_id' => '2',
+ 'edit-work.artist_credit.names.0.name' => 'Foo',
+ 'edit-work.artist_credit.names.0.artist_id' => '3',
];

my $response = $mech->request($request);
@@ -71,24 +71,34 @@
type_id => 2,
comment => 'A comment!',
iswc => 'T-123.456.789-0',
+ artist_credit => [
+ { artist => 3, name => 'Foo' }
+ ]
},
old => {
type_id => 1,
comment => undef,
iswc => 'T-000.000.001-0',
name => 'Dancing Queen',
+ artist_credit => [
+ { artist => 6, name => 'ABBA' }
+ ]
}
});

-TODO: {
- local $TODO = 'Support editing the artist credit';
- is_deeply($edit->data->{new}{artist_credit}, [
- { artist => 2, name => 'Foo' }
- ]);
- is_deeply($edit->data->{old}{artist_credit}, [
- { artist => 1, name => 'Abba' }
- ]);
-}
+$mech->get_ok('/edit/' . $edit->id, 'Fetch the edit page');
+xml_ok($mech->content, '..valid xml');
+$mech->content_contains('Another name', '..has new name');
+$mech->content_contains('Dancing Queen', '..has old name');
+$mech->content_contains('T-123.456.789-0', '..has new iswc');
+$mech->content_contains('T-000.000.001-0', '..has old iswc');
+$mech->content_contains('Symphony', '..has new work type');
+$mech->content_contains('Composition', '..has old work type');
+$mech->content_contains('A comment!', '..has new comment');
+$mech->content_contains('Foo', '..has new artist');
+$mech->content_contains('/artist/745c079d-374e-4436-9448-da92dedef3ce', '...and links to artist');
+$mech->content_contains('ABBA', '..has old artist');
+$mech->content_contains('/artist/a45c079d-374e-4436-9448-da92dedef3cf', '...and links to artist');

# Test adding annotations
$mech->get_ok("/work/745c079d-374e-4436-9448-da92dedef3ce/edit_annotation");
@@ -99,7 +109,7 @@
}
);

-my $edit = MusicBrainz::Server::Test->get_latest_edit($c);
+$edit = MusicBrainz::Server::Test->get_latest_edit($c);
isa_ok($edit, 'MusicBrainz::Server::Edit::Work::AddAnnotation');
is_deeply(
$edit->data,

Modified: mb_server/trunk/t/edit_work_edit.t
===================================================================
--- mb_server/trunk/t/edit_work_edit.t 2009-11-30 17:38:27 UTC (rev 12316)
+++ mb_server/trunk/t/edit_work_edit.t 2009-12-03 15:47:13 UTC (rev 12317)
@@ -22,12 +22,9 @@
my ($edits) = $c->model('Edit')->find({ work => 1 }, 10, 0);
is($edits->[0]->id, $edit->id);

-$edit = $c->model('Edit')->get_by_id($edit->id);
-$c->model('Edit')->load_all($edit);
-is($edit->work_id, 1);
-is($edit->work->id, 1);
-is_unchanged($edit->work);
-is($edit->work->edits_pending, 1);
+$work = $c->model('Work')->get_by_id(1);
+is_unchanged($work);
+is($work->edits_pending, 1);

reject_edit($c, $edit);

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

r12316 - in search_server/branches/ngs: index index/src/main/java/org/musicbrainz/search/analysis servlet

2009-11-30T09:38:27Z

Author: ijabz
Date: 2009-11-30 17:38:27 +0000 (Mon, 30 Nov 2009)
New Revision: 12316

Modified:
search_server/branches/ngs/index/pom.xml
search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/analysis/StandardTokenizer.java
search_server/branches/ngs/servlet/pom.xml
Log:
Updated to use Lucene 3.0

Modified: search_server/branches/ngs/index/pom.xml
===================================================================
--- search_server/branches/ngs/index/pom.xml 2009-11-22 13:53:01 UTC (rev 12315)
+++ search_server/branches/ngs/index/pom.xml 2009-11-30 17:38:27 UTC (rev 12316)
@@ -31,7 +31,7 @@
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
- <version>2.9.1</version>
+ <version>3.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>

Modified: search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/analysis/StandardTokenizer.java
===================================================================
--- search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/analysis/StandardTokenizer.java 2009-11-22 13:53:01 UTC (rev 12315)
+++ search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/analysis/StandardTokenizer.java 2009-11-30 17:38:27 UTC (rev 12316)
@@ -1,32 +1,20 @@
package org.musicbrainz.search.analysis;

-import java.io.IOException;
-import java.io.Reader;
-
-import org.apache.lucene.analysis.Token;
-import org.apache.lucene.analysis.Tokenizer;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
-import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
-import org.apache.lucene.analysis.tokenattributes.TermAttribute;
-import org.apache.lucene.analysis.tokenattributes.TypeAttribute;
-import org.apache.lucene.util.AttributeSource;
-
-/** A grammar-based tokenizer constructed with JFlex
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
- * <p> This should be a good tokenizer for most European-language documents:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * <ul>
- * <li>Splits words at punctuation characters, removing punctuation. However, a
- * dot that's not followed by whitespace is considered part of a token.
- * <li>Splits words at hyphens, unless there's a number in the token, in which case
- * the whole token is interpreted as a product number and is not split.
- * <li>Recognizes email addresses and internet hostnames as one token.
- * </ul>
- *
- * <p>Many applications have specific tokenizer needs. If this tokenizer does
- * not suit your application, please consider copying this source code
- * directory to your project and maintaining your own grammar-based tokenizer.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/

@@ -35,6 +23,7 @@

import org.apache.lucene.analysis.Token;
import org.apache.lucene.analysis.Tokenizer;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
import org.apache.lucene.analysis.tokenattributes.TermAttribute;
@@ -67,7 +56,7 @@
* </ul>
*/

-public class StandardTokenizer extends Tokenizer {
+public final class StandardTokenizer extends Tokenizer {
/** A private instance of the JFlex-constructed scanner */
private final StandardTokenizerImpl scanner;

@@ -82,8 +71,7 @@

/**
* @deprecated this solves a bug where HOSTs that end with '.' are identified
- * as ACRONYMs. It is deprecated and will be removed in the next
- * release.
+ * as ACRONYMs.
*/
public static final int ACRONYM_DEP = 8;

@@ -100,17 +88,6 @@
"<ACRONYM_DEP>"
};

- /** @deprecated Please use {@link #TOKEN_TYPES} instead */
- public static final String [] tokenImage = TOKEN_TYPES;
-
- /**
- * Specifies whether deprecated acronyms should be replaced with HOST type.
- * This is false by default to support backward compatibility.
- *<p/>
- * See http://issues.apache.org/jira/browse/LUCENE-1068
- *
- * @deprecated this should be removed in the next release (3.0).
- */
private boolean replaceInvalidAcronym;

private int maxTokenLength = StandardAnalyzer.DEFAULT_MAX_TOKEN_LENGTH;
@@ -127,41 +104,13 @@
}

/**
- * Creates a new instance of the {@link StandardTokenizer}. Attaches the
- * <code>input</code> to a newly created JFlex scanner.
- *
- * @deprecated Use {@link #StandardTokenizer(Version,
- * Reader)} instead
- */
- public StandardTokenizer(Reader input) {
- this(Version.LUCENE_24, input);
- }
-
- /**
* Creates a new instance of the {@link org.apache.lucene.analysis.standard.StandardTokenizer}. Attaches
* the <code>input</code> to the newly created JFlex scanner.
*
* @param input The input reader
- * @param replaceInvalidAcronym Set to true to replace mischaracterized acronyms with HOST.
*
* See http://issues.apache.org/jira/browse/LUCENE-1068
- *
- * @deprecated Use {@link #StandardTokenizer(Version, Reader)} instead
*/
- public StandardTokenizer(Reader input, boolean replaceInvalidAcronym) {
- super();
- this.scanner = new StandardTokenizerImpl(input);
- init(input, replaceInvalidAcronym);
- }
-
- /**
- * Creates a new instance of the {@link org.apache.lucene.analysis.standard.StandardTokenizer}. Attaches
- * the <code>input</code> to the newly created JFlex scanner.
- *
- * @param input The input reader
- *
- * See http://issues.apache.org/jira/browse/LUCENE-1068
- */
public StandardTokenizer(Version matchVersion, Reader input) {
super();
this.scanner = new StandardTokenizerImpl(input);
@@ -170,18 +119,7 @@

/**
* Creates a new StandardTokenizer with a given {@link AttributeSource}.
- *
- * @deprecated Use {@link #StandardTokenizer(Version, AttributeSource, Reader)} instead
*/
- public StandardTokenizer(AttributeSource source, Reader input, boolean replaceInvalidAcronym) {
- super(source);
- this.scanner = new StandardTokenizerImpl(input);
- init(input, replaceInvalidAcronym);
- }
-
- /**
- * Creates a new StandardTokenizer with a given {@link AttributeSource}.
- */
public StandardTokenizer(Version matchVersion, AttributeSource source, Reader input) {
super(source);
this.scanner = new StandardTokenizerImpl(input);
@@ -190,39 +128,24 @@

/**
* Creates a new StandardTokenizer with a given {@link org.apache.lucene.util.AttributeSource.AttributeFactory}
- *
- * @deprecated Use {@link #StandardTokenizer(Version, org.apache.lucene.util.AttributeSource.AttributeFactory, Reader)} instead
*/
- public StandardTokenizer(AttributeFactory factory, Reader input, boolean replaceInvalidAcronym) {
- super(factory);
- this.scanner = new StandardTokenizerImpl(input);
- init(input, replaceInvalidAcronym);
- }
-
- /**
- * Creates a new StandardTokenizer with a given {@link org.apache.lucene.util.AttributeSource.AttributeFactory}
- */
public StandardTokenizer(Version matchVersion, AttributeFactory factory, Reader input) {
super(factory);
this.scanner = new StandardTokenizerImpl(input);
init(input, matchVersion);
}

- private void init(Reader input, boolean replaceInvalidAcronym) {
- this.replaceInvalidAcronym = replaceInvalidAcronym;
- this.input = input;
- termAtt = (TermAttribute) addAttribute(TermAttribute.class);
- offsetAtt = (OffsetAttribute) addAttribute(OffsetAttribute.class);
- posIncrAtt = (PositionIncrementAttribute) addAttribute(PositionIncrementAttribute.class);
- typeAtt = (TypeAttribute) addAttribute(TypeAttribute.class);
- }
-
private void init(Reader input, Version matchVersion) {
if (matchVersion.onOrAfter(Version.LUCENE_24)) {
- init(input, true);
+ replaceInvalidAcronym = true;
} else {
- init(input, false);
+ replaceInvalidAcronym = false;
}
+ this.input = input;
+ termAtt = addAttribute(TermAttribute.class);
+ offsetAtt = addAttribute(OffsetAttribute.class);
+ posIncrAtt = addAttribute(PositionIncrementAttribute.class);
+ typeAtt = addAttribute(TypeAttribute.class);
}

// this tokenizer generates three attributes:
@@ -237,6 +160,7 @@
*
* @see org.apache.lucene.analysis.TokenStream#next()
*/
+ @Override
public final boolean incrementToken() throws IOException {
clearAttributes();
int posIncr = 1;
@@ -274,34 +198,25 @@
}
}

+ @Override
public final void end() {
// set final offset
int finalOffset = correctOffset(scanner.yychar() + scanner.yylength());
offsetAtt.setOffset(finalOffset, finalOffset);
}

- /** @deprecated Will be removed in Lucene 3.0. This method is final, as it should
- * not be overridden. Delegates to the backwards compatibility layer. */
- public final Token next(final Token reusableToken) throws IOException {
- return super.next(reusableToken);
- }
-
- /** @deprecated Will be removed in Lucene 3.0. This method is final, as it should
- * not be overridden. Delegates to the backwards compatibility layer. */
- public final Token next() throws IOException {
- return super.next();
- }
-
/*
* (non-Javadoc)
*
* @see org.apache.lucene.analysis.TokenStream#reset()
*/
+ @Override
public void reset() throws IOException {
super.reset();
scanner.yyreset(input);
}

+ @Override
public void reset(Reader reader) throws IOException {
super.reset(reader);
reset();
@@ -329,4 +244,3 @@
this.replaceInvalidAcronym = replaceInvalidAcronym;
}
}
-

Modified: search_server/branches/ngs/servlet/pom.xml
===================================================================
--- search_server/branches/ngs/servlet/pom.xml 2009-11-22 13:53:01 UTC (rev 12315)
+++ search_server/branches/ngs/servlet/pom.xml 2009-11-30 17:38:27 UTC (rev 12316)
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
- <version>2.9.1</version>
+ <version>3.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>

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

[Branch ~musicbrainz-developers/picard/trunk] Rev 1013: Improved the cover art plugin to use the same logic for fetching cover art from Amazon as the MB ...

2009-11-24T13:31:20Z

------------------------------------------------------------
revno: 1013
committer: Philipp Wolfer <ph.wolfer@...>
branch nick: trunk
timestamp: Tue 2009-11-24 22:23:43 +0100
message:
Improved the cover art plugin to use the same logic for fetching cover art from Amazon as the MB server.
modified:
contrib/plugins/coverart.py

--
lp:picard
https://code.launchpad.net/~musicbrainz-developers/picard/trunk

You are subscribed to branch lp:picard.
To unsubscribe from this branch go to https://code.launchpad.net/~musicbrainz-developers/picard/trunk/+edit-subscription.

=== modified file 'contrib/plugins/coverart.py'
--- contrib/plugins/coverart.py 2009-03-23 23:51:41 +0000
+++ contrib/plugins/coverart.py 2009-11-24 21:23:43 +0000
@@ -1,6 +1,6 @@
"""
A small plugin to download cover art for any releseas that have a
-CoverArtLink relation.
+CoverArtLink or ASIN relation.

Changelog:
@@ -27,8 +27,8 @@
PLUGIN_NAME = 'Cover Art Downloader'
PLUGIN_AUTHOR = 'Oliver Charles, Philipp Wolfer'
PLUGIN_DESCRIPTION = '''Downloads cover artwork for releases that have a
-CoverArtLink.'''
-PLUGIN_VERSION = "0.5"
+CoverArtLink or ASIN.'''
+PLUGIN_VERSION = "0.6"
PLUGIN_API_VERSIONS = ["0.12"]

from picard.metadata import register_album_metadata_processor
@@ -36,17 +36,16 @@
from PyQt4.QtCore import QUrl
import re

-#
# data transliterated from the perl stuff used to find cover art for the
# musicbrainz server.
# See mb_server/cgi-bin/MusicBrainz/Server/CoverArt.pm
# hartzell --- Tue Apr 15 15:25:58 PDT 2008
-coverArtSites = [
+COVERART_SITES = (
# CD-Baby
# tested with http://musicbrainz.org/release/1243cc17-b9f7-48bd-a536-b10d2013c938.html
{
- 'regexp': 'http://cdbaby.com/cd/(\w)(\w)(\w*)',
- 'imguri': 'http://cdbaby.name/$1/$2/$1$2$3.jpg',
+ 'regexp': 'http://(www\.)?cdbaby.com/cd/(\w)(\w)(\w*)',
+ 'imguri': 'http://cdbaby.name/$2/$3/$2$3$4.jpg',
},
# Jamendo
# tested with http://musicbrainz.org/release/2fe63977-bda9-45da-8184-25a4e7af8da7.html
@@ -54,13 +53,46 @@
'regexp': 'http:\/\/(?:www.)?jamendo.com\/(?:[a-z]+\/)?album\/([0-9]+)',
'imguri': 'http://www.jamendo.com/get/album/id/album/artworkurl/redirect/$1/?artwork_size=0',
},
- ]
-
-_AMAZON_IMAGE_HOST = 'images.amazon.com'
-_AMAZON_IMAGE_PATH = '/images/P/%s.01.LZZZZZZZ.jpg'
-_AMAZON_IMAGE_PATH_SMALL = '/images/P/%s.01.MZZZZZZZ.jpg'
-_AMAZON_IMAGE_PATH2 = '/images/P/%s.02.LZZZZZZZ.jpg'
-_AMAZON_IMAGE_PATH2_SMALL = '/images/P/%s.02.MZZZZZZZ.jpg'
+ )
+
+# amazon image file names are unique on all servers and constructed like
+# <ASIN>.<ServerNumber>.[SML]ZZZZZZZ.jpg
+# A release sold on amazon.de has always <ServerNumber> = 03, for example.
+# Releases not sold on amazon.com, don't have a "01"-version of the image,
+# so we need to make sure we grab an existing image.
+AMAZON_SERVER = {
+ "amazon.jp": {
+ "server": "ec1.images-amazon.com",
+ "id" : "09",
+ },
+ "amazon.co.jp": {
+ "server": "ec1.images-amazon.com",
+ "id" : "09",
+ },
+ "amazon.co.uk": {
+ "server": "ec1.images-amazon.com",
+ "id" : "02",
+ },
+ "amazon.de": {
+ "server": "ec2.images-amazon.com",
+ "id" : "03",
+ },
+ "amazon.com": {
+ "server": "ec1.images-amazon.com",
+ "id" : "01",
+ },
+ "amazon.ca": {
+ "server": "ec1.images-amazon.com",
+ "id" : "01", # .com and .ca are identical
+ },
+ "amazon.fr": {
+ "server": "ec1.images-amazon.com",
+ "id" : "08"
+ },
+}
+
+AMAZON_IMAGE_PATH = '/images/P/%s.%s.%sZZZZZZZ.jpg'
+AMAZON_ASIN_URL_REGEX = re.compile(r'^http://(?:www.)?(.*?)(?:\:[0-9]+)?/.*/([0-9B][0-9A-Z]{9})(?:[^0-9A-Z]|$)')

def _coverart_downloaded(album, metadata, release, try_list, data, http, error):
try:
@@ -79,7 +111,7 @@

def coverart(album, metadata, release, try_list=None):
- """ Gets the CDBaby URL from the metadata, and the attempts to
+ """ Gets all cover art URLs from the metadata and then attempts to
download the album art. """

# try_list will be None for the first call
@@ -90,40 +122,15 @@
for relation_list in release.relation_list:
if relation_list.target_type == 'Url':
for relation in relation_list.relation:
- # Search for cover art on special sites
- for site in coverArtSites:
- #
- # this loop transliterated from the perl stuff used to find cover art for the
- # musicbrainz server.
- # See mb_server/cgi-bin/MusicBrainz/Server/CoverArt.pm
- # hartzell --- Tue Apr 15 15:25:58 PDT 2008
- match = re.match(site['regexp'], relation.target)
- if match != None:
- imgURI = site['imguri']
- for i in range(1, len(match.groups())+1 ):
- if match.group(i) != None:
- imgURI = imgURI.replace('$' + str(i), match.group(i))
- _try_list_append_image_url(try_list, QUrl(imgURI))
+ _process_url_relation(try_list, relation)

# Use the URL of a cover art link directly
if relation.type == 'CoverArtLink':
_try_list_append_image_url(try_list, QUrl(relation.target))
- except AttributeError:
- pass
-
- if metadata['asin']:
- try_list.append({'host': _AMAZON_IMAGE_HOST, 'port': 80,
- 'path': _AMAZON_IMAGE_PATH % metadata['asin']
- })
- try_list.append({'host': _AMAZON_IMAGE_HOST, 'port': 80,
- 'path': _AMAZON_IMAGE_PATH_SMALL % metadata['asin']
- })
- try_list.append({'host': _AMAZON_IMAGE_HOST, 'port': 80,
- 'path': _AMAZON_IMAGE_PATH2 % metadata['asin']
- })
- try_list.append({'host': _AMAZON_IMAGE_HOST, 'port': 80,
- 'path': _AMAZON_IMAGE_PATH2_SMALL % metadata['asin']
- })
+ elif relation.type == 'AmazonAsin':
+ _process_asin_relation(try_list, relation)
+ except AttributeError as e:
+ album.log.error(e)

if len(try_list) > 0:
# We still have some items to try!
@@ -133,6 +140,40 @@
partial(_coverart_downloaded, album, metadata, release, try_list[1:]),
position=1)

+
+def _process_url_relation(try_list, relation):
+ # Search for cover art on special sites
+ for site in COVERART_SITES:
+ # this loop transliterated from the perl stuff used to find cover art for the
+ # musicbrainz server.
+ # See mb_server/cgi-bin/MusicBrainz/Server/CoverArt.pm
+ # hartzell --- Tue Apr 15 15:25:58 PDT 2008
+ match = re.match(site['regexp'], relation.target)
+ if match != None:
+ imgURI = site['imguri']
+ for i in range(1, len(match.groups())+1 ):
+ if match.group(i) != None:
+ imgURI = imgURI.replace('$' + str(i), match.group(i))
+ _try_list_append_image_url(try_list, QUrl(imgURI))
+
+
+def _process_asin_relation(try_list, relation):
+ match = AMAZON_ASIN_URL_REGEX.match(relation.target)
+ if match != None:
+ asinHost = match.group(1)
+ asin = match.group(2);
+ if AMAZON_SERVER.has_key(asinHost):
+ serverInfo = AMAZON_SERVER[asinHost]
+ else:
+ serverInfo = AMAZON_SERVER['amazon.com']
+ try_list.append({'host': serverInfo['server'], 'port': 80,
+ 'path': AMAZON_IMAGE_PATH % (asin, serverInfo['id'], 'L')
+ })
+ try_list.append({'host': serverInfo['server'], 'port': 80,
+ 'path': AMAZON_IMAGE_PATH % (asin, serverInfo['id'], 'M')
+ })
+
+
def _try_list_append_image_url(try_list, parsedUrl):
path = parsedUrl.path()
if parsedUrl.hasQuery():

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

[Branch ~musicbrainz-developers/picard/trunk] Rev 1012: Set font size in log the same as in the scripting window and make log window larger by default.

2009-11-23T14:33:09Z

------------------------------------------------------------
revno: 1012
committer: Philipp Wolfer <ph.wolfer@...>
branch nick: trunk
timestamp: Mon 2009-11-23 23:30:56 +0100
message:
Set font size in log the same as in the scripting window and make log window larger by default.
modified:
picard/ui/logview.py

--
lp:picard
https://code.launchpad.net/~musicbrainz-developers/picard/trunk

You are subscribed to branch lp:picard.
To unsubscribe from this branch go to https://code.launchpad.net/~musicbrainz-developers/picard/trunk/+edit-subscription.

=== modified file 'picard/ui/logview.py'
--- picard/ui/logview.py 2008-07-03 22:36:43 +0000
+++ picard/ui/logview.py 2009-11-23 22:30:56 +0000
@@ -26,14 +26,12 @@

def __init__(self, parent=None):
QtGui.QDialog.__init__(self, parent)
+ self.resize(540, 340)
self.setWindowTitle(_("Log"))
self.doc = QtGui.QTextDocument(self)
self.textCursor = QtGui.QTextCursor(self.doc)
font = QtGui.QFont()
- font.setFixedPitch(True)
- font.setPointSize(8)
- font.setWeight(QtGui.QFont.Normal)
- font.setFamily("")
+ font.setFamily("Monospace")
self.textFormat = QtGui.QTextCharFormat()
self.textFormat.setFont(font)
self.browser = QtGui.QTextBrowser(self)

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

[Branch ~musicbrainz-developers/picard/trunk] Rev 1011: Consistently use the string "Album" for the release title in the CD lookup dialog. This is used i...

2009-11-23T14:03:10Z

------------------------------------------------------------
revno: 1011
committer: Philipp Wolfer <ph.wolfer@...>
branch nick: trunk
timestamp: Mon 2009-11-23 23:00:08 +0100
message:
Consistently use the string "Album" for the release title in the CD lookup dialog. This is used in the rest of the application, too.
modified:
picard/ui/cdlookup.py

--
lp:picard
https://code.launchpad.net/~musicbrainz-developers/picard/trunk

You are subscribed to branch lp:picard.
To unsubscribe from this branch go to https://code.launchpad.net/~musicbrainz-developers/picard/trunk/+edit-subscription.

=== modified file 'picard/ui/cdlookup.py'
--- picard/ui/cdlookup.py 2009-06-02 20:46:22 +0000
+++ picard/ui/cdlookup.py 2009-11-23 22:00:08 +0000
@@ -28,7 +28,7 @@
self.disc = disc
self.ui = Ui_Dialog()
self.ui.setupUi(self)
- self.ui.release_list.setHeaderLabels([_(u"Score"), _(u"Title"), _(u"Artist")])
+ self.ui.release_list.setHeaderLabels([_(u"Score"), _(u"Album"), _(u"Artist")])
self.ui.release_list.header().resizeSection(0, 40)
if self.releases:
for release in self.releases:

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

r12315 - in mb_server/trunk: lib/MusicBrainz/Server/Edit root/static/scripts/MB/Control

2009-11-22T05:53:01Z

Author: acid2
Date: 2009-11-22 13:53:01 +0000 (Sun, 22 Nov 2009)
New Revision: 12315

Modified:
mb_server/trunk/lib/MusicBrainz/Server/Edit/WithDifferences.pm
mb_server/trunk/root/static/scripts/MB/Control/ArtistCreditEditor.js
Log:
Minor fixes

Modified: mb_server/trunk/lib/MusicBrainz/Server/Edit/WithDifferences.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Edit/WithDifferences.pm 2009-11-22 11:06:15 UTC (rev 12314)
+++ mb_server/trunk/lib/MusicBrainz/Server/Edit/WithDifferences.pm 2009-11-22 13:53:01 UTC (rev 12315)
@@ -31,15 +31,18 @@
for my $key (keys %$old) {
my $n = $new->{$key};
my $o = $old->{$key};
+ my $equal;
if (defined $n && defined $o) {
- my $equal = (ref $o || ref $n)
+ $equal = (ref $o || ref $n)
? deep_equal($n, $o)
: smart_match($n, $o);
+ } elsif (!defined $n && !defined $o) {
+ $equal = 1;
+ }

- if ($equal) {
- delete $old->{$key};
- delete $new->{$key};
- }
+ if ($equal) {
+ delete $old->{$key};
+ delete $new->{$key};
}
}

Modified: mb_server/trunk/root/static/scripts/MB/Control/ArtistCreditEditor.js
===================================================================
--- mb_server/trunk/root/static/scripts/MB/Control/ArtistCreditEditor.js 2009-11-22 11:06:15 UTC (rev 12314)
+++ mb_server/trunk/root/static/scripts/MB/Control/ArtistCreditEditor.js 2009-11-22 13:53:01 UTC (rev 12315)
@@ -31,7 +31,7 @@
var fieldMapping = {
join_phrase: 'joinPhrase',
name: 'altName',
- id: 'id'
+ artist_id: 'id'
};

function ArtistCredit(artist) {

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

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

2009-11-22T03:06:15Z

Author: ijabz
Date: 2009-11-22 11:06:15 +0000 (Sun, 22 Nov 2009)
New Revision: 12314

Modified:
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
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/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
Log:
#5496 updatd to use new getScore() method provided by changes to schema, because now using extension properly also
needed NamepacePrefixMapper class to define that extensions should be mapped to ext (by default just use prefixes ns2,ns3..).
Added test for json output and fixed bug with asin element outputtting the value of barcode.

Modified: 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/ArtistWriter.java 2009-11-22 11:01:46 UTC (rev 12313)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ArtistWriter.java 2009-11-22 11:06:15 UTC (rev 12314)
@@ -56,6 +56,7 @@
Artist artist = of.createArtist();

artist.setId(doc.get(ArtistIndexField.ARTIST_ID));
+ artist.setScore(String.valueOf((int)(result.score * 100)));

String artype = doc.get(ArtistIndexField.TYPE);
if (artype != null) {
@@ -63,7 +64,6 @@
}

- artist.getOtherAttributes().put(getScore(), String.valueOf((int) (result.score * 100)));

Modified: 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/LabelWriter.java 2009-11-22 11:01:46 UTC (rev 12313)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/LabelWriter.java 2009-11-22 11:06:15 UTC (rev 12314)
@@ -55,8 +55,7 @@
if(type!=null) {
label.setType(type.toLowerCase((Locale.US)));
}
- label.getOtherAttributes().put(getScore(), String.valueOf((int) (result.score * 100)));
-
+ label.setScore(String.valueOf((int)(result.score * 100)));
String name = doc.get(LabelIndexField.LABEL);
if (name != null) {
label.setName(name);

Modified: 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/RecordingWriter.java 2009-11-22 11:01:46 UTC (rev 12313)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/RecordingWriter.java 2009-11-22 11:06:15 UTC (rev 12314)
@@ -54,9 +54,7 @@
Recording recording = of.createRecording();

recording.setId(doc.get(RecordingIndexField.RECORDING_ID));
-
- recording.getOtherAttributes().put(getScore(), String.valueOf((int) (result.score * 100)));
-
+ recording.setScore(String.valueOf((int)(result.score * 100)));
String name = doc.get(RecordingIndexField.RECORDING_OUTPUT);

if (name != null) {

Modified: 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/ReleaseGroupWriter.java 2009-11-22 11:01:46 UTC (rev 12313)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ReleaseGroupWriter.java 2009-11-22 11:06:15 UTC (rev 12314)
@@ -54,9 +54,7 @@
MbDocument doc = result.doc;
ReleaseGroup releaseGroup = of.createReleaseGroup();
releaseGroup.setId(doc.get(ReleaseGroupIndexField.RELEASEGROUP_ID));
-
- releaseGroup.getOtherAttributes().put(getScore(), String.valueOf((int) (result.score * 100)));
-
+ releaseGroup.setScore(String.valueOf((int)(result.score * 100)));
String name = doc.get(ReleaseGroupIndexField.RELEASEGROUP);
if (name != null) {
releaseGroup.setTitle(name);

Modified: 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/ReleaseWriter.java 2009-11-22 11:01:46 UTC (rev 12313)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ReleaseWriter.java 2009-11-22 11:06:15 UTC (rev 12314)
@@ -54,6 +54,7 @@
MbDocument doc = result.doc;
Release release = of.createRelease();
release.setId(doc.get(ReleaseIndexField.RELEASE_ID));
+ release.setScore(String.valueOf((int)(result.score * 100)));

String name = doc.get(ReleaseIndexField.RELEASE);
if (name != null) {
@@ -89,11 +90,10 @@

String asin = doc.get(ReleaseIndexField.AMAZON_ID);
if (asin != null) {
- release.setAsin(barcode);
+ release.setAsin(asin);
}

- release.getOtherAttributes().put(getScore(), String.valueOf((int) (result.score * 100)));

TextRepresentation tr = of.createTextRepresentation();
String script = doc.get(ReleaseIndexField.SCRIPT);
@@ -111,7 +111,7 @@
}

String[] labels = doc.getValues(ReleaseIndexField.LABEL);
- //Releases can only have multiple labe;/catno combinations
+ //Releases can only have multiple label/catno combinations
if (labels.length > 0) {
LabelInfoList labelInfoList = of.createLabelInfoList();
String[] catnos = doc.getValues(ReleaseIndexField.CATALOG_NO);

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-22 11:01:46 UTC (rev 12313)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ResultsWriter.java 2009-11-22 11:06:15 UTC (rev 12314)
@@ -29,6 +29,7 @@
package org.musicbrainz.search.servlet.mmd2;

+import com.sun.xml.bind.marshaller.NamespacePrefixMapper;
import org.musicbrainz.mmd2.Metadata;
import org.musicbrainz.search.servlet.*;

@@ -46,8 +47,9 @@

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

- static final JAXBContext context = initContext();
- static final JSONJAXBContext jsoncontext = initJsonContext();
+ static final JAXBContext context = initContext();
+ static final NamespacePrefixMapper prefixMapper = new PreferredMapper();
+ static final JSONJAXBContext jsoncontext = initJsonContext();

public String getMimeType() {
return "application/xml; charset=UTF-8";
@@ -56,13 +58,7 @@
public String getJsonMimeType() {
return "application/json; charset=UTF-8";
}
- /**
- * @return
- */
- protected QName getScore() {
- return new QName("http://musicbrainz.org/ns/ext#-2.0", "score", "ext");
- }
-
+
private static JAXBContext initContext() {
try {
return JAXBContext.newInstance("org.musicbrainz.mmd2");
@@ -108,6 +104,7 @@
try {
Metadata metadata = write(results);
Marshaller m = context.createMarshaller();
+ m.setProperty("com.sun.xml.bind.namespacePrefixMapper", prefixMapper);
m.marshal(metadata, out);
}
catch (JAXBException je) {
@@ -128,4 +125,20 @@
throw new RuntimeException(ErrorMessage.NO_HANDLER_FOR_TYPE_AND_FORMAT.getMsg(this.getClass(), outputFormat));
}
}
+
+ /**
+ * Required to map score to ext namespace now that score defined properly because by default JAXB creates
+ * namespaces with names ns1,ns2..
+ */
+ public static class PreferredMapper extends NamespacePrefixMapper {
+ @Override
+ public String getPreferredPrefix(String namespaceUri, String suggestion, boolean requirePrefix) {
+ if(namespaceUri.equals("http://musicbrainz.org/ns/ext#-2.0"))
+ {
+ return "ext";
+ }
+ return null;
+ }
+ }
+
}
\ No newline at end of file

Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/WorkWriter.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/WorkWriter.java 2009-11-22 11:01:46 UTC (rev 12313)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/WorkWriter.java 2009-11-22 11:06:15 UTC (rev 12314)
@@ -53,7 +53,7 @@
MbDocument doc = result.doc;
Work work = of.createWork();
work.setId(doc.get(WorkIndexField.WORK_ID));
- work.getOtherAttributes().put(getScore(), String.valueOf((int) (result.score * 100)));
+ work.setScore(String.valueOf((int)(result.score * 100)));

String name = doc.get(WorkIndexField.WORK);
if (name != null) {

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-22 11:01:46 UTC (rev 12313)
+++ search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindArtistTest.java 2009-11-22 11:06:15 UTC (rev 12314)
@@ -64,11 +64,10 @@
writer.addDocument(doc.getLuceneDocument());
}
writer.close();
- ss = new ArtistSearch(new IndexSearcher(ramDir,true));
+ 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);
@@ -241,8 +240,6 @@

/**
-
- *
* @throws Exception
*/
public void testOutputXml() throws Exception {
@@ -257,6 +254,7 @@
String output = sw.toString();
System.out.println("Xml is" + output);
assertTrue(output.contains("id=\"4302e264-1cf0-4d1f-aca7-2a6f89e34b36\""));
+ assertTrue(output.contains("xmlns:ext=\"http://musicbrainz.org/ns/ext#-2.0\""));
assertTrue(output.contains("count=\"1\""));
assertTrue(output.contains("offset=\"0\""));
assertTrue(output.contains("type=\"group\""));
@@ -270,8 +268,6 @@
}

/**
-
- *
* @throws Exception
*/
public void testOutputXml2() throws Exception {
@@ -319,9 +315,7 @@
assertTrue(output.contains("<name>Echo & The Bunnymen</name>"));
}

- /**
-
- *
+ /**
* @throws Exception
*/
public void testOutputJson() throws Exception {
@@ -330,7 +324,7 @@
ResultsWriter writer = new ArtistWriter();
StringWriter sw = new StringWriter();
PrintWriter pr = new PrintWriter(sw);
- writer.write(pr, res,SearchServerServlet.RESPONSE_JSON);
+ writer.write(pr, res, SearchServerServlet.RESPONSE_JSON);
pr.close();

String output = sw.toString();
@@ -347,4 +341,18 @@
assertTrue(output.contains("\"gender\":\"male\""));
}

+ public void testOutputJsonMultiple() throws Exception {
+ Results res = ss.searchLucene("artist:\"Farming Incident\" OR artist:\"Echo & The Bunnymen\"", 0, 2);
+
+ ResultsWriter writer = new ArtistWriter();
+ StringWriter sw = new StringWriter();
+ PrintWriter pr = new PrintWriter(sw);
+ writer.write(pr, res, SearchServerServlet.RESPONSE_JSON);
+ pr.close();
+ String output = sw.toString();
+ assertTrue(output.contains("\"score\":\"100\""));
+ assertTrue(output.contains("\"score\":\"31\""));
+ }
+
+
}
\ 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-22 11:01:46 UTC (rev 12313)
+++ search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindLabelTest.java 2009-11-22 11:06:15 UTC (rev 12314)
@@ -10,7 +10,7 @@
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 org.musicbrainz.search.servlet.mmd2.*;

import java.io.PrintWriter;
import java.io.StringWriter;
@@ -218,6 +218,7 @@
System.out.println("Xml is" + output);
assertTrue(output.contains("count=\"1\""));
assertTrue(output.contains("offset=\"0\""));
+ assertTrue(output.contains("xmlns:ext=\"http://musicbrainz.org/ns/ext#-2.0\""));
assertTrue(output.contains("id=\"ff571ff4-04cb-4b9c-8a1c-354c330f863c\""));
assertTrue(output.contains("type=\"production\""));
assertTrue(output.contains("<name>Jockey Slut</name>"));
@@ -226,4 +227,28 @@
assertTrue(output.contains("<begin>1993</begin"));
assertTrue(output.contains("<end>2004</end>"));
}
+
+ /**
+ * @throws Exception
+ */
+ public void testOutputJson() throws Exception {
+
+ Results res = ss.searchLucene("label:\"Jockey Slut\"", 0, 10);
+ org.musicbrainz.search.servlet.mmd2.ResultsWriter writer = new LabelWriter();
+ StringWriter sw = new StringWriter();
+ PrintWriter pr = new PrintWriter(sw);
+ writer.write(pr, res, SearchServerServlet.RESPONSE_JSON);
+ pr.close();
+
+ String output = sw.toString();
+ System.out.println("Json is" + output);
+
+ assertTrue(output.contains("id\":\"ff571ff4-04cb-4b9c-8a1c-354c330f863c\""));
+ assertTrue(output.contains("\"count\":1"));
+ assertTrue(output.contains("\"offset\":0,"));
+ assertTrue(output.contains("\"type\":\"production\""));
+ assertTrue(output.contains("name\":\"Jockey Slut\""));
+ assertTrue(output.contains("\"sort-name\":\"Slut, Jockey\""));
+ assertTrue(output.contains("life-span\":{\"begin\":\"1993\""));
+ }
}
\ No newline at end of file

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-22 11:01:46 UTC (rev 12313)
+++ search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindRecordingTest.java 2009-11-22 11:06:15 UTC (rev 12314)
@@ -292,7 +292,7 @@

public void testOutputAsXml() throws Exception {

- Results res = ss.searchLucene("track:\"Gravitational Lenz\"", 0, 10);
+ Results res = ss.searchLucene("recording:\"Gravitational Lenz\"", 0, 10);
ResultsWriter writer = new RecordingWriter();
StringWriter sw = new StringWriter();
PrintWriter pr = new PrintWriter(sw);
@@ -302,7 +302,8 @@
System.out.println("Xml is" + output);
assertTrue(output.contains("count=\"1\""));
assertTrue(output.contains("offset=\"0\""));
- assertTrue(output.contains("<recording id=\"7ca7782b-a602-448b-b108-bb881a7be2d6\""));
+ assertTrue(output.contains("xmlns:ext=\"http://musicbrainz.org/ns/ext#-2.0\""));
+ assertTrue(output.contains("id=\"7ca7782b-a602-448b-b108-bb881a7be2d6\""));
assertTrue(output.contains("<title>Gravitational Lenz</title>"));
assertTrue(output.contains("<length>234000</length>"));
assertTrue(output.contains("<artist id=\"4302e264-1cf0-4d1f-aca7-2a6f89e34b36\""));
@@ -320,4 +321,28 @@

}

+ public void testOutputJson() throws Exception {
+
+ Results res = ss.searchLucene("recording:\"Gravitational Lenz\"", 0, 10);
+ ResultsWriter writer = new RecordingWriter();
+ StringWriter sw = new StringWriter();
+ PrintWriter pr = new PrintWriter(sw);
+ writer.write(pr, res, SearchServerServlet.RESPONSE_JSON);
+ pr.close();
+
+ String output = sw.toString();
+ System.out.println("Json is" + output);
+
+ assertTrue(output.contains("id\":\"7ca7782b-a602-448b-b108-bb881a7be2d6\""));
+ assertTrue(output.contains("\"count\":1"));
+ assertTrue(output.contains("\"offset\":0,"));
+ assertTrue(output.contains("\"score\":\"100\""));
+ assertTrue(output.contains("\"type\":[\"album\"]"));
+ assertTrue(output.contains("title\":\"Gravitational Lenz\""));
+ assertTrue(output.contains("\"length\":234000"));
+ assertTrue(output.contains("\"isrc\":[\"123456789"));
+ assertTrue(output.contains("\"position\":1"));
+
+ }
+
}

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-22 11:01:46 UTC (rev 12313)
+++ search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseGroupTest.java 2009-11-22 11:06:15 UTC (rev 12314)
@@ -12,6 +12,7 @@
import org.musicbrainz.search.servlet.mmd1.ReleaseGroupMmd1XmlWriter;
import org.musicbrainz.search.servlet.mmd2.ReleaseGroupWriter;

+
import java.io.PrintWriter;
import java.io.StringWriter;

@@ -73,7 +74,7 @@

writer.addDocument(doc.getLuceneDocument());
writer.close();
- ss = new ReleaseGroupSearch(new IndexSearcher(ramDir,true));
+ ss = new ReleaseGroupSearch(new IndexSearcher(ramDir, true));
}

public void testFindReleaseGroupById() throws Exception {
@@ -115,7 +116,7 @@
assertEquals("single", doc.get(ReleaseGroupIndexField.TYPE));
}

- public void testFindReleaseGroupByReleaseId() throws Exception {
+ public void testFindReleaseGroupByReleaseId() throws Exception {
Results res = ss.searchLucene("releaseid:\"2c7d81da-8fc3-3157-99c1-e9195ac92c46\"", 0, 10);
assertEquals(0, res.totalHits);
res = ss.searchLucene("release:secret", 0, 10);
@@ -168,16 +169,16 @@
}

public void testFindReleaseGroupByNumericType() throws Exception {
- Results res = ss.searchLucene("type:2", 0, 10);
- assertEquals(1, res.totalHits);
- Result result = res.results.get(0);
- MbDocument doc = result.doc;
- assertEquals("2c7d81da-8fc3-3157-99c1-e9195ac92c45", doc.get(ReleaseGroupIndexField.RELEASEGROUP_ID));
- assertEquals("Nobody's Twisting Your Arm", doc.get(ReleaseGroupIndexField.RELEASEGROUP));
- assertEquals("707622da-475f-48e1-905d-248718df6521", doc.get(ReleaseGroupIndexField.ARTIST_ID));
- assertEquals("The Wedding Present", doc.get(ReleaseGroupIndexField.ARTIST_NAME));
- assertEquals("single", doc.get(ReleaseGroupIndexField.TYPE));
- }
+ Results res = ss.searchLucene("type:2", 0, 10);
+ assertEquals(1, res.totalHits);
+ Result result = res.results.get(0);
+ MbDocument doc = result.doc;
+ assertEquals("2c7d81da-8fc3-3157-99c1-e9195ac92c45", doc.get(ReleaseGroupIndexField.RELEASEGROUP_ID));
+ assertEquals("Nobody's Twisting Your Arm", doc.get(ReleaseGroupIndexField.RELEASEGROUP));
+ assertEquals("707622da-475f-48e1-905d-248718df6521", doc.get(ReleaseGroupIndexField.ARTIST_ID));
+ assertEquals("The Wedding Present", doc.get(ReleaseGroupIndexField.ARTIST_NAME));
+ assertEquals("single", doc.get(ReleaseGroupIndexField.TYPE));
+ }

public void testFindReleaseGroupByDefault() throws Exception {
Results res = ss.searchLucene("\"secret\"", 0, 10);
@@ -192,7 +193,7 @@
assertEquals("The Wedding Present", doc.get(ReleaseGroupIndexField.ARTIST_NAME));
assertEquals("single", doc.get(ReleaseGroupIndexField.TYPE));
assertEquals("secret", doc.get(ReleaseGroupIndexField.RELEASE));
-
+
}

@@ -203,18 +204,18 @@
MbDocument doc = result.doc;
assertEquals("0011c128-b1f2-300e-88cc-c33c30dce704", doc.get(ReleaseGroupIndexField.RELEASEGROUP_ID));
assertEquals("Epics", doc.get(ReleaseGroupIndexField.RELEASEGROUP));
- assertEquals("Erich Kunzel and Cincinnati Pops",doc.get(ReleaseGroupIndexField.ARTIST));
+ assertEquals("Erich Kunzel and Cincinnati Pops", doc.get(ReleaseGroupIndexField.ARTIST));

}

public void testFindReleaseGroupByAllArtist2() throws Exception {
- Results res = ss.searchLucene("artist:\"Erich Kunzel and Cincinnati Pops\"", 0, 10);
- assertEquals(1, res.totalHits);
- Result result = res.results.get(0);
- MbDocument doc = result.doc;
- assertEquals("0011c128-b1f2-300e-88cc-c33c30dce704", doc.get(ReleaseGroupIndexField.RELEASEGROUP_ID));
- assertEquals("Epics", doc.get(ReleaseGroupIndexField.RELEASEGROUP));
- assertEquals("Erich Kunzel and Cincinnati Pops",doc.get(ReleaseGroupIndexField.ARTIST));
+ Results res = ss.searchLucene("artist:\"Erich Kunzel and Cincinnati Pops\"", 0, 10);
+ assertEquals(1, res.totalHits);
+ Result result = res.results.get(0);
+ MbDocument doc = result.doc;
+ assertEquals("0011c128-b1f2-300e-88cc-c33c30dce704", doc.get(ReleaseGroupIndexField.RELEASEGROUP_ID));
+ assertEquals("Epics", doc.get(ReleaseGroupIndexField.RELEASEGROUP));
+ assertEquals("Erich Kunzel and Cincinnati Pops", doc.get(ReleaseGroupIndexField.ARTIST));
}

@@ -225,7 +226,7 @@
MbDocument doc = result.doc;
assertEquals("0011c128-b1f2-300e-88cc-c33c30dce704", doc.get(ReleaseGroupIndexField.RELEASEGROUP_ID));
assertEquals("Epics", doc.get(ReleaseGroupIndexField.RELEASEGROUP));
- assertEquals("Erich Kunzel and Cincinnati Pops",doc.get(ReleaseGroupIndexField.ARTIST));
+ assertEquals("Erich Kunzel and Cincinnati Pops", doc.get(ReleaseGroupIndexField.ARTIST));

}

@@ -236,9 +237,10 @@
MbDocument doc = result.doc;
assertEquals("0011c128-b1f2-300e-88cc-c33c30dce704", doc.get(ReleaseGroupIndexField.RELEASEGROUP_ID));
assertEquals("Epics", doc.get(ReleaseGroupIndexField.RELEASEGROUP));
- assertEquals("Erich Kunzel and Cincinnati Pops",doc.get(ReleaseGroupIndexField.ARTIST));
+ assertEquals("Erich Kunzel and Cincinnati Pops", doc.get(ReleaseGroupIndexField.ARTIST));

}
+
public void testFindReleaseGroupBySortArtist2() throws Exception {
Results res = ss.searchLucene("sortname:\"Kunzel, Eric\"", 0, 10);
assertEquals(1, res.totalHits);
@@ -246,7 +248,7 @@
MbDocument doc = result.doc;
assertEquals("0011c128-b1f2-300e-88cc-c33c30dce704", doc.get(ReleaseGroupIndexField.RELEASEGROUP_ID));
assertEquals("Epics", doc.get(ReleaseGroupIndexField.RELEASEGROUP));
- assertEquals("Erich Kunzel and Cincinnati Pops",doc.get(ReleaseGroupIndexField.ARTIST));
+ assertEquals("Erich Kunzel and Cincinnati Pops", doc.get(ReleaseGroupIndexField.ARTIST));

}

@@ -279,7 +281,7 @@

}

- /**
+ /**
* Tests get same results as
* http://musicbrainz.org/ws/1/release-group/?type=xml&query=%22Nobody%27s%20Twisting%20Your%20Arm%22
*
@@ -297,6 +299,7 @@
System.out.println("Xml is" + output);
assertTrue(output.contains("count=\"1\""));
assertTrue(output.contains("offset=\"0\""));
+ assertTrue(output.contains("xmlns:ext=\"http://musicbrainz.org/ns/ext#-2.0\""));
assertTrue(output.contains("id=\"2c7d81da-8fc3-3157-99c1-e9195ac92c45\""));
assertTrue(output.contains("<title>Nobody's Twisting Your Arm</title>"));
assertTrue(output.contains("<name>The Wedding Present</name>"));
@@ -306,7 +309,7 @@
assertTrue(output.contains("artist id=\"707622da-475f-48e1-905d-248718df6521\""));
assertTrue(output.contains("type=\"single\""));
assertTrue(output.contains("release-list count=\"1\""));
- assertTrue(output.contains("<release id=\"2c7d81da-8fc3-3157-99c1-e9195ac92c46\"><title>secret</title></release>"));
+ assertTrue(output.contains("<release id=\"2c7d81da-8fc3-3157-99c1-e9195ac92c46\"><title>secret</title></release>"));

}
@@ -340,8 +343,7 @@

}

- /**
- *
+ /**
* @throws Exception
*/
public void testOutputAsAsXml2() throws Exception {
@@ -370,7 +372,38 @@
assertTrue(output.contains("<sort-name>Cincinnati Pops Orchestra, The</sort-name>"));
assertTrue(output.contains("artist id=\"d8fbd94c-cd06-4e8b-a559-761ad969d07e\""));
assertTrue(output.contains("release-list count=\"0\""));
+ }

+ public void testOutputJson() throws Exception {

+ Results res = ss.searchLucene("releasegroup:Epics", 0, 10);
+ ResultsWriter writer = new ReleaseGroupWriter();
+ StringWriter sw = new StringWriter();
+ PrintWriter pr = new PrintWriter(sw);
+ writer.write(pr, res, SearchServerServlet.RESPONSE_JSON);
+ pr.close();
+
+ String output = sw.toString();
+ System.out.println("Json is" + output);
+
+ assertTrue(output.contains("id\":\"0011c128-b1f2-300e-88cc-c33c30dce704\""));
+ assertTrue(output.contains("\"count\":1"));
+ assertTrue(output.contains("\"offset\":0,"));
+ assertTrue(output.contains("\"type\":[\"album\"]"));
+ assertTrue(output.contains("title\":\"Epics\""));
}
+
+ public void testOutputJsonMultiple() throws Exception {
+ Results res = ss.searchLucene("rgid:2c7d81da-8fc3-3157-99c1-e9195ac92c45 OR artist:kunzel", 0, 10);
+
+ org.musicbrainz.search.servlet.mmd2.ResultsWriter writer = new ReleaseGroupWriter();
+ StringWriter sw = new StringWriter();
+ PrintWriter pr = new PrintWriter(sw);
+ writer.write(pr, res, SearchServerServlet.RESPONSE_JSON);
+ pr.close();
+ String output = sw.toString();
+ assertTrue(output.contains("\"score\":\"100\""));
+ assertTrue(output.contains("\"score\":\"43\""));
+ }
+
}
\ No newline at end of file

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-22 11:01:46 UTC (rev 12313)
+++ search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseTest.java 2009-11-22 11:06:15 UTC (rev 12314)
@@ -12,6 +12,7 @@
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.ReleaseGroupWriter;
import org.musicbrainz.search.servlet.mmd2.ReleaseWriter;

import java.io.PrintWriter;
@@ -129,6 +130,9 @@
assertEquals(2, doc.getFields(ReleaseIndexField.CATALOG_NO).length);
assertEquals("WRATHCD25", doc.get(ReleaseIndexField.CATALOG_NO));
assertEquals(1, doc.getFields(ReleaseIndexField.BARCODE).length);
+ assertEquals("07599273202", doc.get(ReleaseIndexField.BARCODE));
+ assertEquals(1, doc.getFields(ReleaseIndexField.AMAZON_ID).length);
+ assertEquals("B00004Y6O9", doc.get(ReleaseIndexField.AMAZON_ID));

assertEquals(1, doc.getFields(ReleaseIndexField.COUNTRY).length);
assertEquals("gb", doc.get(ReleaseIndexField.COUNTRY));
@@ -545,6 +549,7 @@
System.out.println("Xml is" + output);
assertTrue(output.contains("count=\"1\""));
assertTrue(output.contains("offset=\"0\""));
+ assertTrue(output.contains("xmlns:ext=\"http://musicbrainz.org/ns/ext#-2.0\""));
assertTrue(output.contains("id=\"1d9e8ed6-3893-4d3b-aa7d-6cd79609e386\""));
assertTrue(output.contains("<language>eng</language>"));
assertTrue(output.contains("<script>latn</script>"));
@@ -558,10 +563,35 @@
assertTrue(output.contains("<date>2005</date>"));
assertTrue(output.contains("<country>gb</country>"));
assertTrue(output.contains("<format>vinyl</format>"));
- assertTrue(output.contains("<asin>07599273202</asin>"));
+ assertTrue(output.contains("<asin>B00004Y6O9</asin>"));

assertTrue(output.contains("<label><name>Wrath Records</name></label>"));
assertTrue(output.contains("<catalog-number>WRATHCD25</catalog-number>"));

}
+
+ public void testOutputJson() throws Exception {
+
+ Results res = ss.searchLucene("release:\"Our Glorious 5 Year Plan\"", 0, 10);
+ ResultsWriter writer = new ReleaseWriter();
+ StringWriter sw = new StringWriter();
+ PrintWriter pr = new PrintWriter(sw);
+ writer.write(pr, res, SearchServerServlet.RESPONSE_JSON);
+ pr.close();
+
+ String output = sw.toString();
+ System.out.println("Json is" + output);
+
+ assertTrue(output.contains("id\":\"1d9e8ed6-3893-4d3b-aa7d-6cd79609e386\""));
+ assertTrue(output.contains("\"count\":1"));
+ assertTrue(output.contains("\"offset\":0,"));
+ assertTrue(output.contains("\"type\":[\"album\"]"));
+ assertTrue(output.contains("title\":\"Our Glorious 5 Year Plan\""));
+ assertTrue(output.contains("\"status\":\"official\""));
+ assertTrue(output.contains("\"language\":\"eng\""));
+ assertTrue(output.contains("\"script\":\"latn\""));
+ assertTrue(output.contains("\"barcode\":\"07599273202\""));
+ assertTrue(output.contains("\"asin\":\"B00004Y6O9\""));
+
+ }
}
\ No newline at end of file

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

r12313 - in mmd-schema/trunk/brainz-mmd2-jaxb: . src/main/java/org/musicbrainz/mmd2 src/main/resources target target/classes

2009-11-22T03:01:47Z

Author: ijabz
Date: 2009-11-22 11:01:46 +0000 (Sun, 22 Nov 2009)
New Revision: 12313

Added:
mmd-schema/trunk/brainz-mmd2-jaxb/target/
mmd-schema/trunk/brainz-mmd2-jaxb/target/classes/
mmd-schema/trunk/brainz-mmd2-jaxb/target/classes/extensions.xsd
Modified:
mmd-schema/trunk/brainz-mmd2-jaxb/src/main/java/org/musicbrainz/mmd2/Alias.java
mmd-schema/trunk/brainz-mmd2-jaxb/src/main/java/org/musicbrainz/mmd2/Artist.java
mmd-schema/trunk/brainz-mmd2-jaxb/src/main/java/org/musicbrainz/mmd2/Label.java
mmd-schema/trunk/brainz-mmd2-jaxb/src/main/java/org/musicbrainz/mmd2/ObjectFactory.java
mmd-schema/trunk/brainz-mmd2-jaxb/src/main/java/org/musicbrainz/mmd2/Recording.java
mmd-schema/trunk/brainz-mmd2-jaxb/src/main/java/org/musicbrainz/mmd2/Release.java
mmd-schema/trunk/brainz-mmd2-jaxb/src/main/java/org/musicbrainz/mmd2/ReleaseGroup.java
mmd-schema/trunk/brainz-mmd2-jaxb/src/main/java/org/musicbrainz/mmd2/Work.java
mmd-schema/trunk/brainz-mmd2-jaxb/src/main/resources/musicbrainz_mmd-2.0.xsd
Log:
#5496 because score isnt actually defined in the schema it exposed a bug in Jerseys handling of unannmed attributes when generating json. The neatest solution is to define score in an extemsions.xsd, then added score as an attribute in the main xsd, although this neccessitates a manual mod to xsd whenever rng changes it also generates classes that better match the xml we want to return.

Modified: mmd-schema/trunk/brainz-mmd2-jaxb/src/main/java/org/musicbrainz/mmd2/Alias.java
===================================================================
--- mmd-schema/trunk/brainz-mmd2-jaxb/src/main/java/org/musicbrainz/mmd2/Alias.java 2009-11-21 16:11:26 UTC (rev 12312)
+++ mmd-schema/trunk/brainz-mmd2-jaxb/src/main/java/org/musicbrainz/mmd2/Alias.java 2009-11-22 11:01:46 UTC (rev 12313)
@@ -67,8 +67,8 @@
*
* <p>
* Objects of the following type(s) are allowed in the list
+ * {@link JAXBElement }{@code <}{@link String }{@code >}
* {@link String }
- * {@link JAXBElement }{@code <}{@link String }{@code >}
*
*
*/

Modified: mmd-schema/trunk/brainz-mmd2-jaxb/src/main/java/org/musicbrainz/mmd2/Artist.java
===================================================================
--- mmd-schema/trunk/brainz-mmd2-jaxb/src/main/java/org/musicbrainz/mmd2/Artist.java 2009-11-21 16:11:26 UTC (rev 12312)
+++ mmd-schema/trunk/brainz-mmd2-jaxb/src/main/java/org/musicbrainz/mmd2/Artist.java 2009-11-22 11:01:46 UTC (rev 12313)
@@ -112,6 +112,8 @@
@XmlAttribute
@XmlSchemaType(name = "anyURI")
protected String type;
+ @XmlAttribute(namespace = "http://musicbrainz.org/ns/ext#-2.0")
+ protected String score;
@XmlAnyAttribute
private Map<QName, String> otherAttributes = new HashMap<QName, String>();

@@ -558,6 +560,30 @@
}

/**
+ * Gets the value of the score property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getScore() {
+ return score;
+ }
+
+ /**
+ * Sets the value of the score property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setScore(String value) {
+ this.score = value;
+ }
+
+ /**
* Gets a map that contains attributes that aren't bound to any typed property on this class.
*
* <p>

Modified: mmd-schema/trunk/brainz-mmd2-jaxb/src/main/java/org/musicbrainz/mmd2/Label.java
===================================================================
--- mmd-schema/trunk/brainz-mmd2-jaxb/src/main/java/org/musicbrainz/mmd2/Label.java 2009-11-21 16:11:26 UTC (rev 12312)
+++ mmd-schema/trunk/brainz-mmd2-jaxb/src/main/java/org/musicbrainz/mmd2/Label.java 2009-11-22 11:01:46 UTC (rev 12313)
@@ -106,6 +106,8 @@
@XmlAttribute
@XmlSchemaType(name = "anyURI")
protected String type;
+ @XmlAttribute(namespace = "http://musicbrainz.org/ns/ext#-2.0")
+ protected String score;
@XmlAnyAttribute
private Map<QName, String> otherAttributes = new HashMap<QName, String>();

@@ -504,6 +506,30 @@
}

/**
+ * Gets the value of the score property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getScore() {
+ return score;
+ }
+
+ /**
+ * Sets the value of the score property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setScore(String value) {
+ this.score = value;
+ }
+
+ /**
* Gets a map that contains attributes that aren't bound to any typed property on this class.
*
* <p>

Modified: mmd-schema/trunk/brainz-mmd2-jaxb/src/main/java/org/musicbrainz/mmd2/ObjectFactory.java
===================================================================
--- mmd-schema/trunk/brainz-mmd2-jaxb/src/main/java/org/musicbrainz/mmd2/ObjectFactory.java 2009-11-21 16:11:26 UTC (rev 12312)
+++ mmd-schema/trunk/brainz-mmd2-jaxb/src/main/java/org/musicbrainz/mmd2/ObjectFactory.java 2009-11-22 11:01:46 UTC (rev 12313)
@@ -62,243 +62,243 @@
}

/**
- * Create an instance of {@link IsrcList }
+ * Create an instance of {@link RelationList }
*
*/
- public IsrcList createIsrcList() {
- return new IsrcList();
+ public RelationList createRelationList() {
+ return new RelationList();
}

/**
- * Create an instance of {@link Alias }
+ * Create an instance of {@link Release }
*
*/
- public Alias createAlias() {
- return new Alias();
+ public Release createRelease() {
+ return new Release();
}

/**
- * Create an instance of {@link TagList }
+ * Create an instance of {@link Alias }
*
*/
- public TagList createTagList() {
- return new TagList();
+ public Alias createAlias() {
+ return new Alias();
}

/**
- * Create an instance of {@link Metadata }
+ * Create an instance of {@link UserTagList }
*
*/
- public Metadata createMetadata() {
- return new Metadata();
+ public UserTagList createUserTagList() {
+ return new UserTagList();
}

/**
- * Create an instance of {@link TrackList }
+ * Create an instance of {@link Rating }
*
*/
- public TrackList createTrackList() {
- return new TrackList();
+ public Rating createRating() {
+ return new Rating();
}

/**
- * Create an instance of {@link Artist }
+ * Create an instance of {@link ArtistList }
*
*/
- public Artist createArtist() {
- return new Artist();
+ public ArtistList createArtistList() {
+ return new ArtistList();
}

/**
- * Create an instance of {@link Relation }
+ * Create an instance of {@link ReleaseGroup }
*
*/
- public Relation createRelation() {
- return new Relation();
+ public ReleaseGroup createReleaseGroup() {
+ return new ReleaseGroup();
}

/**
- * Create an instance of {@link UserTagList }
+ * Create an instance of {@link Label }
*
*/
- public UserTagList createUserTagList() {
- return new UserTagList();
+ public Label createLabel() {
+ return new Label();
}

/**
- * Create an instance of {@link Recording }
+ * Create an instance of {@link Work }
*
*/
- public Recording createRecording() {
- return new Recording();
+ public Work createWork() {
+ return new Work();
}

/**
- * Create an instance of {@link MediumList }
+ * Create an instance of {@link Track }
*
*/
- public MediumList createMediumList() {
- return new MediumList();
+ public Track createTrack() {
+ return new Track();
}

/**
- * Create an instance of {@link Medium }
+ * Create an instance of {@link PuidList }
*
*/
- public Medium createMedium() {
- return new Medium();
+ public PuidList createPuidList() {
+ return new PuidList();
}

/**
- * Create an instance of {@link Rating }
+ * Create an instance of {@link RecordingList }
*
*/
- public Rating createRating() {
- return new Rating();
+ public RecordingList createRecordingList() {
+ return new RecordingList();
}

/**
- * Create an instance of {@link AliasList }
+ * Create an instance of {@link LabelInfo }
*
*/
- public AliasList createAliasList() {
- return new AliasList();
+ public LabelInfo createLabelInfo() {
+ return new LabelInfo();
}

/**
- * Create an instance of {@link LifeSpan }
+ * Create an instance of {@link LabelList }
*
*/
- public LifeSpan createLifeSpan() {
- return new LifeSpan();
+ public LabelList createLabelList() {
+ return new LabelList();
}

/**
- * Create an instance of {@link Label }
+ * Create an instance of {@link Recording }
*
*/
- public Label createLabel() {
- return new Label();
+ public Recording createRecording() {
+ return new Recording();
}

/**
- * Create an instance of {@link ArtistCredit }
+ * Create an instance of {@link Medium }
*
*/
- public ArtistCredit createArtistCredit() {
- return new ArtistCredit();
+ public Medium createMedium() {
+ return new Medium();
}

/**
- * Create an instance of {@link WorkList }
+ * Create an instance of {@link DiscList }
*
*/
- public WorkList createWorkList() {
- return new WorkList();
+ public DiscList createDiscList() {
+ return new DiscList();
}

/**
- * Create an instance of {@link Release }
+ * Create an instance of {@link NameCredit }
*
*/
- public Release createRelease() {
- return new Release();
+ public NameCredit createNameCredit() {
+ return new NameCredit();
}

/**
- * Create an instance of {@link LabelInfoList }
+ * Create an instance of {@link MediumList }
*
*/
- public LabelInfoList createLabelInfoList() {
- return new LabelInfoList();
+ public MediumList createMediumList() {
+ return new MediumList();
}

/**
- * Create an instance of {@link PuidList }
+ * Create an instance of {@link Puid }
*
*/
- public PuidList createPuidList() {
- return new PuidList();
+ public Puid createPuid() {
+ return new Puid();
}

/**
- * Create an instance of {@link LabelInfo }
+ * Create an instance of {@link IsrcList }
*
*/
- public LabelInfo createLabelInfo() {
- return new LabelInfo();
+ public IsrcList createIsrcList() {
+ return new IsrcList();
}

/**
- * Create an instance of {@link Track }
+ * Create an instance of {@link TagList }
*
*/
- public Track createTrack() {
- return new Track();
+ public TagList createTagList() {
+ return new TagList();
}

/**
- * Create an instance of {@link ReleaseGroup }
+ * Create an instance of {@link Metadata }
*
*/
- public ReleaseGroup createReleaseGroup() {
- return new ReleaseGroup();
+ public Metadata createMetadata() {
+ return new Metadata();
}

/**
- * Create an instance of {@link Puid }
+ * Create an instance of {@link TextRepresentation }
*
*/
- public Puid createPuid() {
- return new Puid();
+ public TextRepresentation createTextRepresentation() {
+ return new TextRepresentation();
}

/**
- * Create an instance of {@link RecordingList }
+ * Create an instance of {@link LifeSpan }
*
*/
- public RecordingList createRecordingList() {
- return new RecordingList();
+ public LifeSpan createLifeSpan() {
+ return new LifeSpan();
}

/**
- * Create an instance of {@link ReleaseList }
+ * Create an instance of {@link Artist }
*
*/
- public ReleaseList createReleaseList() {
- return new ReleaseList();
+ public Artist createArtist() {
+ return new Artist();
}

/**
- * Create an instance of {@link ArtistList }
+ * Create an instance of {@link LabelInfoList }
*
*/
- public ArtistList createArtistList() {
- return new ArtistList();
+ public LabelInfoList createLabelInfoList() {
+ return new LabelInfoList();
}

/**
- * Create an instance of {@link TextRepresentation }
+ * Create an instance of {@link AliasList }
*
*/
- public TextRepresentation createTextRepresentation() {
- return new TextRepresentation();
+ public AliasList createAliasList() {
+ return new AliasList();
}

/**
- * Create an instance of {@link NameCredit }
+ * Create an instance of {@link ReleaseList }
*
*/
- public NameCredit createNameCredit() {
- return new NameCredit();
+ public ReleaseList createReleaseList() {
+ return new ReleaseList();
}

/**
- * Create an instance of {@link DiscList }
+ * Create an instance of {@link ReleaseGroupList }
*
*/
- public DiscList createDiscList() {
- return new DiscList();
+ public ReleaseGroupList createReleaseGroupList() {
+ return new ReleaseGroupList();
}

/**
@@ -310,43 +310,43 @@
}

/**
- * Create an instance of {@link LabelList }
+ * Create an instance of {@link Relation }
*
*/
- public LabelList createLabelList() {
- return new LabelList();
+ public Relation createRelation() {
+ return new Relation();
}

/**
- * Create an instance of {@link RelationList }
+ * Create an instance of {@link TrackList }
*
*/
- public RelationList createRelationList() {
- return new RelationList();
+ public TrackList createTrackList() {
+ return new TrackList();
}

/**
- * Create an instance of {@link Disc }
+ * Create an instance of {@link WorkList }
*
*/
- public Disc createDisc() {
- return new Disc();
+ public WorkList createWorkList() {
+ return new WorkList();
}

/**
- * Create an instance of {@link ReleaseGroupList }
+ * Create an instance of {@link ArtistCredit }
*
*/
- public ReleaseGroupList createReleaseGroupList() {
- return new ReleaseGroupList();
+ public ArtistCredit createArtistCredit() {
+ return new ArtistCredit();
}

/**
- * Create an instance of {@link Work }
+ * Create an instance of {@link Disc }
*
*/
- public Work createWork() {
- return new Work();
+ public Disc createDisc() {
+ return new Disc();
}

/**

Modified: mmd-schema/trunk/brainz-mmd2-jaxb/src/main/java/org/musicbrainz/mmd2/Recording.java
===================================================================
--- mmd-schema/trunk/brainz-mmd2-jaxb/src/main/java/org/musicbrainz/mmd2/Recording.java 2009-11-21 16:11:26 UTC (rev 12312)
+++ mmd-schema/trunk/brainz-mmd2-jaxb/src/main/java/org/musicbrainz/mmd2/Recording.java 2009-11-22 11:01:46 UTC (rev 12313)
@@ -98,6 +98,8 @@
@XmlAttribute
@XmlSchemaType(name = "anyURI")
protected String id;
+ @XmlAttribute(namespace = "http://musicbrainz.org/ns/ext#-2.0")
+ protected String score;
@XmlAnyAttribute
private Map<QName, String> otherAttributes = new HashMap<QName, String>();

@@ -448,6 +450,30 @@
}

/**
+ * Gets the value of the score property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getScore() {
+ return score;
+ }
+
+ /**
+ * Sets the value of the score property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setScore(String value) {
+ this.score = value;
+ }
+
+ /**
* Gets a map that contains attributes that aren't bound to any typed property on this class.
*
* <p>

Modified: mmd-schema/trunk/brainz-mmd2-jaxb/src/main/java/org/musicbrainz/mmd2/Release.java
===================================================================
--- mmd-schema/trunk/brainz-mmd2-jaxb/src/main/java/org/musicbrainz/mmd2/Release.java 2009-11-21 16:11:26 UTC (rev 12312)
+++ mmd-schema/trunk/brainz-mmd2-jaxb/src/main/java/org/musicbrainz/mmd2/Release.java 2009-11-22 11:01:46 UTC (rev 12313)
@@ -100,6 +100,8 @@
@XmlAttribute
@XmlSchemaType(name = "anyURI")
protected String id;
+ @XmlAttribute(namespace = "http://musicbrainz.org/ns/ext#-2.0")
+ protected String score;
@XmlAnyAttribute
private Map<QName, String> otherAttributes = new HashMap<QName, String>();

@@ -498,6 +500,30 @@
}

/**
+ * Gets the value of the score property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getScore() {
+ return score;
+ }
+
+ /**
+ * Sets the value of the score property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setScore(String value) {
+ this.score = value;
+ }
+
+ /**
* Gets a map that contains attributes that aren't bound to any typed property on this class.
*
* <p>

Modified: mmd-schema/trunk/brainz-mmd2-jaxb/src/main/java/org/musicbrainz/mmd2/ReleaseGroup.java
===================================================================
--- mmd-schema/trunk/brainz-mmd2-jaxb/src/main/java/org/musicbrainz/mmd2/ReleaseGroup.java 2009-11-21 16:11:26 UTC (rev 12312)
+++ mmd-schema/trunk/brainz-mmd2-jaxb/src/main/java/org/musicbrainz/mmd2/ReleaseGroup.java 2009-11-22 11:01:46 UTC (rev 12313)
@@ -86,6 +86,8 @@
protected String id;
@XmlAttribute
protected List<String> type;
+ @XmlAttribute(namespace = "http://musicbrainz.org/ns/ext#-2.0")
+ protected String score;
@XmlAnyAttribute
private Map<QName, String> otherAttributes = new HashMap<QName, String>();

@@ -369,6 +371,30 @@
}

/**
+ * Gets the value of the score property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getScore() {
+ return score;
+ }
+
+ /**
+ * Sets the value of the score property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setScore(String value) {
+ this.score = value;
+ }
+
+ /**
* Gets a map that contains attributes that aren't bound to any typed property on this class.
*
* <p>

Modified: mmd-schema/trunk/brainz-mmd2-jaxb/src/main/java/org/musicbrainz/mmd2/Work.java
===================================================================
--- mmd-schema/trunk/brainz-mmd2-jaxb/src/main/java/org/musicbrainz/mmd2/Work.java 2009-11-21 16:11:26 UTC (rev 12312)
+++ mmd-schema/trunk/brainz-mmd2-jaxb/src/main/java/org/musicbrainz/mmd2/Work.java 2009-11-22 11:01:46 UTC (rev 12313)
@@ -65,6 +65,8 @@
@XmlAttribute
@XmlSchemaType(name = "anyURI")
protected String type;
+ @XmlAttribute(namespace = "http://musicbrainz.org/ns/ext#-2.0")
+ protected String score;
@XmlAnyAttribute
private Map<QName, String> otherAttributes = new HashMap<QName, String>();

@@ -218,6 +220,30 @@
}

/**
+ * Gets the value of the score property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getScore() {
+ return score;
+ }
+
+ /**
+ * Sets the value of the score property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setScore(String value) {
+ this.score = value;
+ }
+
+ /**
* Gets a map that contains attributes that aren't bound to any typed property on this class.
*
* <p>

Modified: mmd-schema/trunk/brainz-mmd2-jaxb/src/main/resources/musicbrainz_mmd-2.0.xsd
===================================================================
--- mmd-schema/trunk/brainz-mmd2-jaxb/src/main/resources/musicbrainz_mmd-2.0.xsd 2009-11-21 16:11:26 UTC (rev 12312)
+++ mmd-schema/trunk/brainz-mmd2-jaxb/src/main/resources/musicbrainz_mmd-2.0.xsd 2009-11-22 11:01:46 UTC (rev 12313)
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>

-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://musicbrainz.org/ns/mmd-2.0#" xmlns:mmd-2.0="http://musicbrainz.org/ns/mmd-2.0#">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ targetNamespace="http://musicbrainz.org/ns/mmd-2.0#"
+ xmlns:ext="http://musicbrainz.org/ns/ext#-2.0"
+ xmlns:mmd-2.0="http://musicbrainz.org/ns/mmd-2.0#">
<xs:import schemaLocation="local.xsd"/>
+ <xs:import namespace="http://musicbrainz.org/ns/ext#-2.0" schemaLocation="extensions.xsd"/>
<xs:element name="metadata">
<xs:complexType>
<xs:sequence>
@@ -374,6 +381,7 @@
</xs:sequence>
</xs:group>
<xs:attributeGroup name="def_extension_attribute">
+ <xs:attribute ref="ext:score"/>
<xs:anyAttribute namespace="##other" processContents="skip"/>
</xs:attributeGroup>
<xs:group name="def_anything">

Property changes on: mmd-schema/trunk/brainz-mmd2-jaxb/target/classes/extensions.xsd
___________________________________________________________________
Added: svn:eol-style
+ native

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

r12312 - in mb_server/trunk/lib/MusicBrainz/Server: Data Edit

2009-11-21T08:11:26Z

Author: acid2
Date: 2009-11-21 16:11:26 +0000 (Sat, 21 Nov 2009)
New Revision: 12312

Modified:
mb_server/trunk/lib/MusicBrainz/Server/Data/Edit.pm
mb_server/trunk/lib/MusicBrainz/Server/Edit/Exceptions.pm
mb_server/trunk/lib/MusicBrainz/Server/Edit/WithDifferences.pm
Log:
Fix broken exception handling when creating empty edits

Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/Edit.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/Edit.pm 2009-11-21 15:31:43 UTC (rev 12311)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/Edit.pm 2009-11-21 16:11:26 UTC (rev 12312)
@@ -152,7 +152,7 @@
try {
$edit->initialize(%opts);
}
- catch (MusicBrainz::Server::Edit::Exceptions::NoChange $e) {
+ catch (MusicBrainz::Server::Edit::Exceptions::NoChanges $e) {
return;
}

Modified: mb_server/trunk/lib/MusicBrainz/Server/Edit/Exceptions.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Edit/Exceptions.pm 2009-11-21 15:31:43 UTC (rev 12311)
+++ mb_server/trunk/lib/MusicBrainz/Server/Edit/Exceptions.pm 2009-11-21 16:11:26 UTC (rev 12312)
@@ -1,7 +1,7 @@
package MusicBrainz::Server::Edit::Exceptions;

use Exception::Class (
- 'MusicBrainz::Server::Edit::Exception::NoChanges',
+ 'MusicBrainz::Server::Edit::Exceptions::NoChanges',
);

1;

Modified: mb_server/trunk/lib/MusicBrainz/Server/Edit/WithDifferences.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Edit/WithDifferences.pm 2009-11-21 15:31:43 UTC (rev 12311)
+++ mb_server/trunk/lib/MusicBrainz/Server/Edit/WithDifferences.pm 2009-11-21 16:11:26 UTC (rev 12312)
@@ -43,7 +43,7 @@
}
}

- MusicBrainz::Server::Edit::Exception::NoChanges->throw unless keys %$new && keys %$old;
+ MusicBrainz::Server::Edit::Exceptions::NoChanges->throw unless keys %$new && keys %$old;

return (
old => $old,

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

r12311 - mb_server/trunk

2009-11-21T07:31:44Z

Author: acid2
Date: 2009-11-21 15:31:43 +0000 (Sat, 21 Nov 2009)
New Revision: 12311

Modified:
mb_server/trunk/Makefile.PL
Log:
Add Test::Aggregate to the Makefile

Modified: mb_server/trunk/Makefile.PL
===================================================================
--- mb_server/trunk/Makefile.PL 2009-11-21 07:02:56 UTC (rev 12310)
+++ mb_server/trunk/Makefile.PL 2009-11-21 15:31:43 UTC (rev 12311)
@@ -71,6 +71,7 @@
recommends 'Apache::Session::File';

build_requires 'Test::Differences';
+build_requires 'Test::Aggregate';
build_requires 'XML::Parser';

catalyst;

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

r12310 - in mb_server/trunk: lib/MusicBrainz/Server/Entity root/artist root/components root/label t

2009-11-20T23:02:56Z

Author: warp
Date: 2009-11-21 07:02:56 +0000 (Sat, 21 Nov 2009)
New Revision: 12310

Added:
mb_server/trunk/lib/MusicBrainz/Server/Entity/AgeRole.pm
Modified:
mb_server/trunk/lib/MusicBrainz/Server/Entity/Artist.pm
mb_server/trunk/lib/MusicBrainz/Server/Entity/Label.pm
mb_server/trunk/root/artist/layout.tt
mb_server/trunk/root/components/common-macros.tt
mb_server/trunk/root/label/layout.tt
mb_server/trunk/t/entity_artist.t
mb_server/trunk/t/entity_label.t
Log:
This fixes #172, see review 460.

Merge branch '172b'

Modified: mb_server/trunk/lib/MusicBrainz/Server/Entity/Artist.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Entity/Artist.pm 2009-11-20 17:17:54 UTC (rev 12309)
+++ mb_server/trunk/lib/MusicBrainz/Server/Entity/Artist.pm 2009-11-21 07:02:56 UTC (rev 12310)
@@ -62,6 +62,8 @@
default => sub { MusicBrainz::Server::Entity::PartialDate->new() },
);

+with 'MusicBrainz::Server::Entity::AgeRole';
+
has 'country_id' => (
is => 'rw',
isa => 'Int'

Modified: mb_server/trunk/lib/MusicBrainz/Server/Entity/Label.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Entity/Label.pm 2009-11-20 17:17:54 UTC (rev 12309)
+++ mb_server/trunk/lib/MusicBrainz/Server/Entity/Label.pm 2009-11-21 07:02:56 UTC (rev 12310)
@@ -60,6 +60,8 @@
default => sub { MusicBrainz::Server::Entity::PartialDate->new() },
);

+with 'MusicBrainz::Server::Entity::AgeRole';
+
has 'country_id' => (
is => 'rw',
isa => 'Int'

Modified: mb_server/trunk/root/artist/layout.tt
===================================================================
--- mb_server/trunk/root/artist/layout.tt 2009-11-20 17:17:54 UTC (rev 12309)
+++ mb_server/trunk/root/artist/layout.tt 2009-11-21 07:02:56 UTC (rev 12310)
@@ -14,6 +14,9 @@
[% WRAPPER 'layout/sidebar/property.tt' label=l('Active:') %]
[% artist.begin_date.format or l("present") %] —
[% artist.end_date.format or l("present") %]
+ [% IF artist.has_age %]
+ ([% display_age (artist.age) %])
+ [% END %]
[% END %]
[%- END -%]
[% INCLUDE 'layout/sidebar/property.tt' label=l('Country:')

Modified: mb_server/trunk/root/components/common-macros.tt
===================================================================
--- mb_server/trunk/root/components/common-macros.tt 2009-11-20 17:17:54 UTC (rev 12309)
+++ mb_server/trunk/root/components/common-macros.tt 2009-11-21 07:02:56 UTC (rev 12310)
@@ -29,6 +29,12 @@
[%- MACRO ln(text, plural, num, args) BLOCK;
c.ngettext(text, plural, num, args);
END; -%]
+[%- MACRO display_age(age) BLOCK -%]
+ [%- IF age.0 -%][%- ln('{num} year', '{num} years', years, { num => age.0 }) -%]
+ [%- ELSIF age.1 -%][%- ln('{num} month', '{num} months', months, { num => age.1 }) -%]
+ [%- ELSE -%][%- ln('{num} day', '{num} days', days, { num => age.2 }) -%]
+ [%- END -%]
+[%- END -%]
[%- MACRO entity_link(entity, noicon) IF entity -%]
[%- mpclass = entity.has_mod_pending ? ' class="mp"' : '' -%]
[%- IF entity.entity_type == "url" -%]

Modified: mb_server/trunk/root/label/layout.tt
===================================================================
--- mb_server/trunk/root/label/layout.tt 2009-11-20 17:17:54 UTC (rev 12309)
+++ mb_server/trunk/root/label/layout.tt 2009-11-21 07:02:56 UTC (rev 12310)
@@ -9,6 +9,9 @@
[% WRAPPER 'layout/sidebar/property.tt' label=l('Active:') %]
[% label.begin_date.format or l("present") %] —
[% label.end_date.format or l("present") %]
+ [% IF label.has_age %]
+ ([% display_age (label.age) %])
+ [% END %]
[% END %]
[%- END -%]
[% INCLUDE 'layout/sidebar/property.tt' label=l('Country:')

Modified: mb_server/trunk/t/entity_artist.t
===================================================================
--- mb_server/trunk/t/entity_artist.t 2009-11-20 17:17:54 UTC (rev 12309)
+++ mb_server/trunk/t/entity_artist.t 2009-11-21 07:02:56 UTC (rev 12310)
@@ -1,6 +1,7 @@
use strict;
use warnings;
-use Test::More tests => 12;
+use Test::More;
+use Date::Calc qw(This_Year);
use_ok 'MusicBrainz::Server::Entity::Artist';
use_ok 'MusicBrainz::Server::Entity::ArtistType';
use_ok 'MusicBrainz::Server::Entity::ArtistAlias';
@@ -19,3 +20,59 @@

$artist->edits_pending(2);
is( $artist->edits_pending, 2 );
+
+ok( !$artist->has_age );
+
+# testing ->age with exact dates
+$artist->begin_date->year (1976);
+$artist->begin_date->month (7);
+$artist->begin_date->day (23);
+$artist->end_date->year (1976);
+$artist->end_date->month (7);
+$artist->end_date->day (24);
+my @got = $artist->age;
+is_deeply ( \@got, [0, 0, 1], "Artist age 1 day" );
+
+$artist->end_date->year (1976);
+$artist->end_date->month (8);
+$artist->end_date->day (1);
+@got = $artist->age;
+is_deeply( \@got, [0, 0, 9], "Artist age 9 days" );
+
+$artist->end_date->month (11);
+@got = $artist->age;
+is_deeply( \@got, [0, 3, 9], "Artist age 3 months" );
+
+$artist->begin_date->year (1553);
+@got = $artist->age;
+is_deeply( \@got, [423, 3, 9], "Artist age 423 years" );
+
+$artist->end_date->year (2140);
+@got = $artist->age;
+is_deeply( \@got, [587, 3, 9], "Artist age 587 years" );
+
+# testing ->age with an empty end date.
+$artist = MusicBrainz::Server::Entity::Artist->new();
+$artist->begin_date->year (This_Year() - 24);
+is( ($artist->age)[0], 24, "Artist still alive, age 24 years" );
+
+# testing ->age with partial dates
+$artist->begin_date->year (2011);
+$artist->end_date->year (2012);
+@got = $artist->age;
+is_deeply( \@got, [1, 0, 0], "Artist with partial dates, age 1 year" );
+
+$artist->end_date->month (12);
+@got = $artist->age;
+is_deeply( \@got, [1, 11, 0], "Artist with partial dates, age 1 year" );
+
+$artist->begin_date->month (12);
+$artist->end_date->month (1);
+@got = $artist->age;
+is_deeply( \@got, [0, 1, 0], "Artist with partial dates, age 1 month" );
+
+$artist->begin_date->day (31);
+@got = $artist->age;
+is_deeply ( \@got, [0, 0, 1], "Artist with partial dates, age 1 day" );
+
+done_testing;

Modified: mb_server/trunk/t/entity_label.t
===================================================================
--- mb_server/trunk/t/entity_label.t 2009-11-20 17:17:54 UTC (rev 12309)
+++ mb_server/trunk/t/entity_label.t 2009-11-21 07:02:56 UTC (rev 12310)
@@ -1,6 +1,6 @@
use strict;
use warnings;
-use Test::More tests => 14;
+use Test::More;
use_ok 'MusicBrainz::Server::Entity::Label';
use_ok 'MusicBrainz::Server::Entity::LabelType';
use_ok 'MusicBrainz::Server::Entity::LabelAlias';
@@ -23,3 +23,11 @@

$label->edits_pending(2);
is( $label->edits_pending, 2 );
+
+ok( !$label->has_age );
+$label->begin_date->year (1976);
+$label->end_date->year (2009);
+my @got = $label->age;
+is_deeply( \@got, [33, 0, 0], "Label age 33 years" );
+
+done_testing;

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

r12309 - in mb_server/trunk: lib/MusicBrainz/Server/Edit/Medium root/release

2009-11-20T09:17:54Z

Author: acid2
Date: 2009-11-20 17:17:54 +0000 (Fri, 20 Nov 2009)
New Revision: 12309

Modified:
mb_server/trunk/lib/MusicBrainz/Server/Edit/Medium/Edit.pm
mb_server/trunk/root/release/edit.tt
Log:
Submitting release editor works

Conflicts:

root/release/edit.tt

Modified: mb_server/trunk/lib/MusicBrainz/Server/Edit/Medium/Edit.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Edit/Medium/Edit.pm 2009-11-20 17:13:15 UTC (rev 12308)
+++ mb_server/trunk/lib/MusicBrainz/Server/Edit/Medium/Edit.pm 2009-11-20 17:17:54 UTC (rev 12309)
@@ -13,12 +13,13 @@
sub edit_name { 'Edit Medium' }

sub alter_edit_pending { { Medium => [ shift->data->{medium_id} ] } }
+sub related_entities { { release => [ shift->release_id ] } }
sub models { [qw( Medium )] }

subtype 'MediumHash'
=> as Dict[
position => Optional[Int],
- name => Optional[Str],
+ name => Nullable[Str],
format_id => Nullable[Int],
];

@@ -30,6 +31,11 @@
]
);

+has 'release_id' => (
+ isa => 'Int',
+ is => 'rw',
+);
+
sub foreign_keys {
my $self = shift;
if (exists $self->data->{new}{format_id}) {
@@ -75,6 +81,7 @@
my $medium = delete $opts{medium}
or die 'You must specify the medium to edit';

+ $self->release_id($medium->release_id);
$self->data({
medium => $medium->id,
$self->_change_data($medium, %opts)

Modified: mb_server/trunk/root/release/edit.tt
===================================================================
--- mb_server/trunk/root/release/edit.tt 2009-11-20 17:13:15 UTC (rev 12308)
+++ mb_server/trunk/root/release/edit.tt 2009-11-20 17:17:54 UTC (rev 12309)
@@ -34,6 +34,8 @@
[% medium_field = form.field('mediums').field(loop.index) %]
<tr>
<td>
+ [% r.hidden(medium_field.field('id'));
+ r.hidden(medium_field.field('tracklist').field('id')) %]
<table class="medium tbl" id="[% medium_field.html_name %]">
<thead>
<tr class="subh">
@@ -61,7 +63,10 @@
<td class="position">
[% r.text(track_field.field('position'), class => 'pos') %]
</td>
- <td>[% r.text(track_field.field('name'), class => 'track-name') %]</td>
+ <td>
+ [% r.hidden(track_field.field('id'));
+ r.text(track_field.field('name'), class => 'track-name') %]
+ </td>
<td>[% r.artist_credit_editor(track_field.field('artist_credit')) %]</td>
<td>[% r.text(track_field.field('length'), class => 'track-length', size => 5) %]</td>
</tr>

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

r12308 - in mb_server/trunk/lib/MusicBrainz/Server: Data Edit/Track

2009-11-20T09:13:16Z

Author: acid2
Date: 2009-11-20 17:13:15 +0000 (Fri, 20 Nov 2009)
New Revision: 12308

Modified:
mb_server/trunk/lib/MusicBrainz/Server/Data/Release.pm
mb_server/trunk/lib/MusicBrainz/Server/Edit/Track/Edit.pm
Log:
Relate track edits to releases

Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/Release.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/Release.pm 2009-11-20 17:13:05 UTC (rev 12307)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/Release.pm 2009-11-20 17:13:15 UTC (rev 12308)
@@ -233,6 +233,20 @@
}, @_);
}

+sub find_ids_by_track_ids
+{
+ my ($self, @ids) = @_;
+ my $query = 'SELECT release
+ FROM medium
+ WHERE tracklist IN (
+ SELECT tracklist FROM track
+ WHERE id IN (' . placeholders(@ids) . ')
+ )';
+ my $sql = Sql->new($self->c->dbh);
+ return $sql->select_single_column_array($query, @ids);
+}
+
+
__PACKAGE__->meta->make_immutable;
no Moose;
1;

Modified: mb_server/trunk/lib/MusicBrainz/Server/Edit/Track/Edit.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Edit/Track/Edit.pm 2009-11-20 17:13:05 UTC (rev 12307)
+++ mb_server/trunk/lib/MusicBrainz/Server/Edit/Track/Edit.pm 2009-11-20 17:13:15 UTC (rev 12308)
@@ -20,7 +20,15 @@
sub edit_type { $EDIT_TRACK_EDIT }

sub alter_edit_pending { { Track => [ shift->track_id ] } }
+sub related_entities
+{
+ my $self = shift;
+ return {
+ release => $self->c->model('Release')->find_ids_by_track_ids($self->track_id)
+ }
+}

+
has 'track_id' => (
isa => 'Int',
is => 'rw',

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

r12307 - in mb_server/trunk: lib/MusicBrainz/Server lib/MusicBrainz/Server/Controller lib/MusicBrainz/Server/Data lib/MusicBrainz/Server/Edit lib/MusicBrainz/Server/Edit/Medium lib/MusicBrainz/Server/Edit/Release lib/MusicBrainz/Server/Edit/Track lib/MusicBrainz/Server/Edit/Tracklist root/edit root/edit/details t t/actions/release_editor t/controllers t/sql

2009-11-20T09:13:06Z

Author: acid2
Date: 2009-11-20 17:13:05 +0000 (Fri, 20 Nov 2009)
New Revision: 12307

Added:
mb_server/trunk/root/edit/details/add_track.tt
mb_server/trunk/root/edit/details/create_medium.tt
mb_server/trunk/root/edit/details/delete_medium.tt
mb_server/trunk/root/edit/details/delete_track.tt
mb_server/trunk/root/edit/details/edit_medium.tt
mb_server/trunk/root/edit/details/edit_release.tt
mb_server/trunk/root/edit/details/edit_track.tt
Modified:
mb_server/trunk/lib/MusicBrainz/Server/Controller/Release.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/Edit.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/Entity.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/EntityCacheBase.pm
mb_server/trunk/lib/MusicBrainz/Server/Edit.pm
mb_server/trunk/lib/MusicBrainz/Server/Edit/Medium/Create.pm
mb_server/trunk/lib/MusicBrainz/Server/Edit/Medium/Delete.pm
mb_server/trunk/lib/MusicBrainz/Server/Edit/Medium/Edit.pm
mb_server/trunk/lib/MusicBrainz/Server/Edit/Release/Edit.pm
mb_server/trunk/lib/MusicBrainz/Server/Edit/Track/Edit.pm
mb_server/trunk/lib/MusicBrainz/Server/Edit/Tracklist/AddTrack.pm
mb_server/trunk/lib/MusicBrainz/Server/Edit/Tracklist/DeleteTrack.pm
mb_server/trunk/lib/MusicBrainz/Server/Edit/Utils.pm
mb_server/trunk/root/edit/info.tt
mb_server/trunk/t/actions/release_editor/add-medium-existing.t
mb_server/trunk/t/actions/release_editor/add-medium-new-tracklist.t
mb_server/trunk/t/actions/release_editor/add-track.t
mb_server/trunk/t/actions/release_editor/delete-medium.t
mb_server/trunk/t/actions/release_editor/delete-track.t
mb_server/trunk/t/actions/release_editor/edit-medium.t
mb_server/trunk/t/actions/release_editor/edit-track.t
mb_server/trunk/t/actions/release_editor/header.t
mb_server/trunk/t/actions/release_editor/sidebar.t
mb_server/trunk/t/controllers/release_editor.t
mb_server/trunk/t/edit_medium_create.t
mb_server/trunk/t/edit_medium_delete.t
mb_server/trunk/t/sql/release_editor.sql
mb_server/trunk/t/sql/tracklist.sql
Log:
Templates to show all the edits of the release editor

Merge branch 'release-editor-templates'

Modified: mb_server/trunk/lib/MusicBrainz/Server/Controller/Release.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Controller/Release.pm 2009-11-20 16:40:52 UTC (rev 12306)
+++ mb_server/trunk/lib/MusicBrainz/Server/Controller/Release.pm 2009-11-20 17:13:05 UTC (rev 12307)
@@ -348,7 +348,7 @@
$c->model('Edit')->create(
editor_id => $c->user->id,
edit_type => $EDIT_TRACKLIST_DELETETRACK,
- track_id => $track->id
+ track => $track
);
}
else {
@@ -393,7 +393,7 @@
$c->model('Edit')->create(
editor_id => $c->user->id,
edit_type => $EDIT_MEDIUM_DELETE,
- medium_id => $medium->id
+ medium => $medium
);
}
else {

Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/Edit.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/Edit.pm 2009-11-20 16:40:52 UTC (rev 12306)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/Edit.pm 2009-11-20 17:13:05 UTC (rev 12307)
@@ -2,6 +2,7 @@
use Moose;

use Carp qw( croak );
+use Data::OptList;
use DateTime;
use TryCatch;
use List::MoreUtils qw( uniq zip );
@@ -219,11 +220,45 @@
sub load_all
{
my ($self, @edits) = @_;
- my @models = uniq map { @{ $_->models } } @edits;
- for my $model (@models) {
+
+ my $objects_to_load = {}; # Objects loaded with get_by_id
+ my $post_load_models = {}; # Objects loaded with ->load (after get_by_id)
+
+ for my $edit (@edits) {
+ my $edit_references = $edit->foreign_keys;
+ while (my ($model, $ids) = each %$edit_references) {
+ $objects_to_load->{$model} ||= [];
+ $ids = Data::OptList::mkopt_hash($ids);
+ while (my ($object_id, $extra_models) = each %$ids) {
+ push @{ $objects_to_load->{$model} }, $object_id;
+ $post_load_models->{$model}->{$object_id} = $extra_models
+ if $extra_models && @$extra_models;
+ }
+ }
+ }
+
+ my $loaded = {};
+ my $load_arguments = {};
+ while (my ($model, $ids) = each %$objects_to_load) {
my $m = ref $model ? $model : $self->c->model($model);
- $m->load(@edits);
+ $loaded->{$model} = $m->get_by_ids(@$ids);
+
+ # Now we need to load any extra information about each object
+ for my $id (@$ids) {
+ for my $extra (@{ $post_load_models->{$model}->{$id} }) {
+ $load_arguments->{$extra} ||= [];
+ push @{ $load_arguments->{$extra} }, $loaded->{$model}->{$id};
+ }
+ }
}
+
+ while (my ($model, $objs) = each %$load_arguments) {
+ $self->c->model($model)->load(@$objs);
+ }
+
+ for my $edit (@edits) {
+ $edit->display_data($edit->build_display_data($loaded));
+ }
}

# Runs it's own transaction

Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/Entity.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/Entity.pm 2009-11-20 16:40:52 UTC (rev 12306)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/Entity.pm 2009-11-20 17:13:05 UTC (rev 12307)
@@ -68,6 +68,8 @@
sub _get_by_keys
{
my ($self, $key, @ids) = @_;
+ @ids = grep { defined && $_ } @ids;
+ return unless @ids;
my $query = "SELECT " . $self->_columns .
" FROM " . $self->_table .
" WHERE $key IN (" . placeholders(@ids) . ")";

Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/EntityCacheBase.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/EntityCacheBase.pm 2009-11-20 16:40:52 UTC (rev 12306)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/EntityCacheBase.pm 2009-11-20 17:13:05 UTC (rev 12307)
@@ -6,6 +6,7 @@
around 'get_by_ids' => sub
{
my ($orig, $self, @ids) = @_;
+ return unless grep { defined && $_ } @ids;
my %ids = map { $_ => 1 } @ids;
my @keys = map { $self->_id_cache_prefix . ':' . $_ } keys %ids;
my $cache = $self->c->cache($self->_id_cache_prefix);

Modified: mb_server/trunk/lib/MusicBrainz/Server/Edit/Medium/Create.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Edit/Medium/Create.pm 2009-11-20 16:40:52 UTC (rev 12306)
+++ mb_server/trunk/lib/MusicBrainz/Server/Edit/Medium/Create.pm 2009-11-20 17:13:05 UTC (rev 12307)
@@ -14,18 +14,12 @@
sub edit_name { "Create Medium" }

sub alter_edit_pending { { Medium => [ shift->medium_id ] } }
-sub models { [qw( Medium )] }

has 'medium_id' => (
isa => 'Int',
- is => 'rw'
+ is => 'rw',
);

-has 'medium' => (
- isa => 'Medium',
- is => 'rw'
-);
-
has '+data' => (
isa => Dict[
name => Optional[Str],
@@ -36,12 +30,31 @@
]
);

+sub foreign_keys
+{
+ my $self = shift;
+ return {
+ Release => { $self->data->{release_id} => [ 'ArtistCredit' ] },
+ MediumFormat => { $self->data->{format_id} => [] }
+ };
+}
+
+sub build_display_data
+{
+ my ($self, $loaded) = @_;
+ return {
+ name => $self->data->{name},
+ format => $loaded->{MediumFormat}->{ $self->data->{format_id} },
+ position => $self->data->{position},
+ release => $loaded->{Release}->{ $self->data->{release_id} },
+ tracklist_id => $self->data->{tracklist_id},
+ };
+}
+
sub insert
{
my $self = shift;
my $medium = $self->c->model('Medium')->insert( $self->data );
-
- $self->medium($medium);
$self->medium_id($medium->id);
}

Modified: mb_server/trunk/lib/MusicBrainz/Server/Edit/Medium/Delete.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Edit/Medium/Delete.pm 2009-11-20 16:40:52 UTC (rev 12306)
+++ mb_server/trunk/lib/MusicBrainz/Server/Edit/Medium/Delete.pm 2009-11-20 17:13:05 UTC (rev 12307)
@@ -1,9 +1,10 @@
package MusicBrainz::Server::Edit::Medium::Delete;
use Moose;

-use MooseX::Types::Moose qw( Int );
+use MooseX::Types::Moose qw( Int Str );
use MooseX::Types::Structured qw( Dict );
use MusicBrainz::Server::Constants qw( $EDIT_MEDIUM_DELETE );
+use MusicBrainz::Server::Edit::Types qw( Nullable );
use MusicBrainz::Server::Entity::Types;

extends 'MusicBrainz::Server::Edit';
@@ -11,31 +12,57 @@
sub edit_type { $EDIT_MEDIUM_DELETE }
sub edit_name { 'Delete medium' }

-sub alter_edit_pending { { Medium => [ shift->medium_id ] } }
-sub models { [qw( Medium )] }
+sub alter_edit_pending { { Medium => [ shift->data->{medium_id} ] } }

-has 'medium_id' => (
- isa => 'Int',
- is => 'rw',
- lazy => 1,
- default => sub { shift->data->{medium_id} }
-);
-
-has 'medium' => (
- isa => 'Medium',
- is => 'rw'
-);
-
has '+data' => (
isa => Dict[
- medium_id => Int
+ medium_id => Int,
+ format_id => Nullable[Int],
+ tracklist_id => Int,
+ name => Nullable[Str],
+ position => Int,
+ release_id => Int
]
);

+sub foreign_keys
+{
+ my $self = shift;
+ return {
+ MediumFormat => { $self->data->{format_id} => [] },
+ Release => { $self->data->{release_id} => [qw( ArtistCredit )] }
+ };
+}
+
+sub build_display_data
+{
+ my ($self, $loaded) = @_;
+ return {
+ format => $loaded->{MediumFormat}->{ $self->data->{format_id} },
+ release => $loaded->{Release}->{ $self->data->{release_id} },
+ map { $_ => $self->data->{$_} } qw( name position tracklist_id )
+ }
+}
+
+sub initialize
+{
+ my ($self, %args) = @_;
+
+ my $medium = $args{medium} or die 'Missing required medium object';
+ $self->data({
+ medium_id => $medium->id,
+ format_id => $medium->format_id,
+ tracklist_id => $medium->tracklist_id,
+ name => $medium->name,
+ position => $medium->position,
+ release_id => $medium->release_id,
+ });
+}
+
sub accept
{
my $self = shift;
- $self->c->model('Medium')->delete($self->medium_id);
+ $self->c->model('Medium')->delete($self->data->{medium_id});
}

__PACKAGE__->meta->make_immutable;

Modified: mb_server/trunk/lib/MusicBrainz/Server/Edit/Medium/Edit.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Edit/Medium/Edit.pm 2009-11-20 16:40:52 UTC (rev 12306)
+++ mb_server/trunk/lib/MusicBrainz/Server/Edit/Medium/Edit.pm 2009-11-20 17:13:05 UTC (rev 12307)
@@ -12,24 +12,12 @@
sub edit_type { $EDIT_MEDIUM_EDIT }
sub edit_name { 'Edit Medium' }

-sub alter_edit_pending { { Medium => [ shift->medium_id ] } }
+sub alter_edit_pending { { Medium => [ shift->data->{medium_id} ] } }
sub models { [qw( Medium )] }

-has 'medium_id' => (
- isa => 'Int',
- is => 'rw',
- lazy => 1,
- default => sub { shift->data->{medium} }
-);
-
-has 'medium' => (
- is => 'rw',
-);
-
subtype 'MediumHash'
=> as Dict[
position => Optional[Int],
- tracklist_id => Optional[Int],
name => Optional[Str],
format_id => Nullable[Int],
];
@@ -42,13 +30,51 @@
]
);

+sub foreign_keys {
+ my $self = shift;
+ if (exists $self->data->{new}{format_id}) {
+ return {
+ MediumFormat => {
+ $self->data->{new}{format_id} => [],
+ $self->data->{old}{format_id} => [],
+ }
+ }
+ }
+ else {
+ return { };
+ }
+}
+
+sub build_display_data
+{
+ my ($self, $loaded) = @_;
+ my $data = {};
+
+ if (exists $self->data->{new}{format_id}) {
+ $data->{format} = {
+ new => $loaded->{MediumFormat}->{ $self->data->{new}{format_id} },
+ old => $loaded->{MediumFormat}->{ $self->data->{old}{format_id} }
+ };
+ }
+
+ for my $attribute (qw( name position )) {
+ if (exists $self->data->{new}{$attribute}) {
+ $data->{$attribute} = {
+ new => $self->data->{new}{$attribute},
+ old => $self->data->{old}{$attribute},
+ };
+ }
+ }
+
+ return $data;
+}
+
sub initialize
{
my ($self, %opts) = @_;
my $medium = delete $opts{medium}
or die 'You must specify the medium to edit';

- $self->medium($medium);
$self->data({
medium => $medium->id,
$self->_change_data($medium, %opts)

Modified: mb_server/trunk/lib/MusicBrainz/Server/Edit/Release/Edit.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Edit/Release/Edit.pm 2009-11-20 16:40:52 UTC (rev 12306)
+++ mb_server/trunk/lib/MusicBrainz/Server/Edit/Release/Edit.pm 2009-11-20 17:13:05 UTC (rev 12307)
@@ -7,29 +7,27 @@
use MusicBrainz::Server::Constants qw( $EDIT_RELEASE_EDIT );
use MusicBrainz::Server::Data::ArtistCredit;
use MusicBrainz::Server::Data::Release;
-use MusicBrainz::Server::Data::Utils qw( artist_credit_to_ref partial_date_to_hash );
+use MusicBrainz::Server::Data::Utils qw(
+ artist_credit_to_ref
+ partial_date_to_hash
+ partial_date_from_row
+);
use MusicBrainz::Server::Edit::Types qw( ArtistCreditDefinition Nullable PartialDateHash );
+use MusicBrainz::Server::Edit::Utils qw(
+ changed_relations
+ changed_display_data
+ load_artist_credit_definitions
+ artist_credit_from_loaded_definition
+);

extends 'MusicBrainz::Server::Edit::WithDifferences';

sub edit_type { $EDIT_RELEASE_EDIT }
-sub edit_name { 'Edit Release '}
+sub edit_name { 'Edit Release' }

-sub related_entities { { release => [ shift->release_id ] } }
-sub alter_edit_pending { { Release => [ shift->release_id ] } }
-sub models { [qw( Release )] }
+sub related_entities { { release => [ shift->data->{release} ] } }
+sub alter_edit_pending { { Release => [ shift->data->{release} ] } }

-has 'release_id' => (
- isa => 'Int',
- is => 'rw',
- lazy => 1,
- default => sub { shift->data->{release} }
-);
-
-has 'release' => (
- is => 'rw',
-);
-
subtype 'ReleaseHash'
=> as Dict[
name => Optional[Str],
@@ -53,6 +51,65 @@
]
);

+sub foreign_keys
+{
+ my ($self) = @_;
+ my $relations = {};
+ changed_relations($self->data, $relations, (
+ ReleasePackaging => 'packaging_id',
+ ReleaseStatus => 'status_id',
+ ReleaseGroup => 'release_group_id',
+ Country => 'country_id',
+ Language => 'language_id',
+ Script => 'script_id',
+ ));
+
+ if (exists $self->data->{new}{artist_credit}) {
+ $relations->{Artist} = {
+ map {
+ load_artist_credit_definitions($self->data->{$_}{artist_credit})
+ } qw( new old )
+ }
+ }
+
+ return $relations;
+}
+
+sub build_display_data
+{
+ my ($self, $loaded) = @_;
+
+ my %map = (
+ packaging => [ qw( packaging_id ReleasePackaging )],
+ status => [ qw( status_id ReleaseStatus )],
+ group => [ qw( release_group_id ReleaseGroup )],
+ country => [ qw( country_id Country )],
+ language => [ qw( language_id Language )],
+ script => [ qw( script_id Script )],
+ name => 'name',
+ barcode => 'barcode',
+ comment => 'comment',
+ );
+
+ my $data = changed_display_data($self->data, $loaded, %map);
+
+ if (exists $self->data->{new}{artist_credit}) {
+ $data->{artist_credit} = {
+ new => artist_credit_from_loaded_definition($loaded, $self->data->{new}{artist_credit}),
+ old => artist_credit_from_loaded_definition($loaded, $self->data->{old}{artist_credit})
+ }
+ }
+
+ if (exists $self->data->{new}{date}) {
+ $data->{date} = {
+ new => partial_date_from_row($self->data->{new}{date}),
+ old => partial_date_from_row($self->data->{old}{date}),
+ };
+ }
+
+ return $data;
+}
+
sub _mapping
{
return (
@@ -73,7 +130,6 @@
$ac_data->load($release);
}

- $self->release($release);
$self->data({
release => $release->id,
$self->_change_data($release, %opts)
@@ -89,7 +145,7 @@
my %data = %{ $self->data->{new} };
$data{artist_credit} = $ac_data->find_or_insert(@{ $data{artist_credit} });

- $release_data->update($self->release_id, \%data);
+ $release_data->update($self->data->{release}, \%data);
};

sub _xml_arguments { return ForceArray => [ 'artist_credit' ] }

Modified: mb_server/trunk/lib/MusicBrainz/Server/Edit/Track/Edit.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Edit/Track/Edit.pm 2009-11-20 16:40:52 UTC (rev 12306)
+++ mb_server/trunk/lib/MusicBrainz/Server/Edit/Track/Edit.pm 2009-11-20 17:13:05 UTC (rev 12307)
@@ -1,12 +1,18 @@
package MusicBrainz::Server::Edit::Track::Edit;
use Moose;

+use Moose::Util::TypeConstraints qw( as find_type_constraint subtype );
use MooseX::Types::Moose qw( Int Str );
use MooseX::Types::Structured qw( Dict Optional );
-use Moose::Util::TypeConstraints qw( as find_type_constraint subtype );
-use MusicBrainz::Server::Edit::Types qw( ArtistCreditDefinition );
use MusicBrainz::Server::Constants qw( $EDIT_TRACK_EDIT );
use MusicBrainz::Server::Data::Utils qw( artist_credit_to_ref );
+use MusicBrainz::Server::Edit::Types qw( ArtistCreditDefinition );
+use MusicBrainz::Server::Edit::Utils qw(
+ changed_relations
+ changed_display_data
+ load_artist_credit_definitions
+ artist_credit_from_loaded_definition
+);

extends 'MusicBrainz::Server::Edit::WithDifferences';

@@ -14,7 +20,6 @@
sub edit_type { $EDIT_TRACK_EDIT }

sub alter_edit_pending { { Track => [ shift->track_id ] } }
-sub models { [qw( Track )] }

has 'track_id' => (
isa => 'Int',
@@ -23,11 +28,6 @@
default => sub { shift->data->{track} }
);

-has 'track' => (
- isa => 'Track',
- is => 'rw',
-);
-
subtype 'TrackHash',
as Dict[
name => Optional[Str],
@@ -45,6 +45,46 @@
]
);

+sub foreign_keys
+{
+ my $self = shift;
+ my $relations = {};
+ changed_relations($self->data, $relations,
+ Recording => 'recording_id',
+ );
+
+ if (exists $self->data->{new}{artist_credit}) {
+ $relations->{Artist} = {
+ map {
+ load_artist_credit_definitions($self->data->{$_}{artist_credit})
+ } qw( new old )
+ }
+ }
+
+ return $relations;
+}
+
+sub build_display_data
+{
+ my ($self, $loaded) = @_;
+
+ my $data = changed_display_data($self->data, $loaded,
+ recording => [ qw( recording_id Recording )],
+ tracklist_id => 'tracklist_id',
+ position => 'position',
+ name => 'name',
+ );
+
+ if (exists $self->data->{new}{artist_credit}) {
+ $data->{artist_credit} = {
+ new => artist_credit_from_loaded_definition($loaded, $self->data->{new}{artist_credit}),
+ old => artist_credit_from_loaded_definition($loaded, $self->data->{old}{artist_credit})
+ }
+ }
+
+ return $data;
+}
+
sub _mapping
{
return (
@@ -63,7 +103,6 @@
}

$self->track_id($track->id);
- $self->track($track);
$self->data({
track => $track->id,
$self->_change_data($track, %opts)

Modified: mb_server/trunk/lib/MusicBrainz/Server/Edit/Tracklist/AddTrack.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Edit/Tracklist/AddTrack.pm 2009-11-20 16:40:52 UTC (rev 12306)
+++ mb_server/trunk/lib/MusicBrainz/Server/Edit/Tracklist/AddTrack.pm 2009-11-20 17:13:05 UTC (rev 12307)
@@ -5,6 +5,7 @@
use MooseX::Types::Structured qw( Dict );
use MusicBrainz::Server::Constants qw( $EDIT_TRACKLIST_ADDTRACK );
use MusicBrainz::Server::Edit::Types qw( ArtistCreditDefinition Nullable );
+use MusicBrainz::Server::Edit::Utils qw( load_artist_credit_definitions artist_credit_from_loaded_definition );

extends 'MusicBrainz::Server::Edit';

@@ -18,11 +19,6 @@
is => 'rw'
);

-has 'track' => (
- isa => 'Track',
- is => 'rw'
-);
-
has '+data' => (
isa => Dict[
tracklist_id => Int,
@@ -34,6 +30,28 @@
],
);

+sub foreign_keys
+{
+ my $self = shift;
+ return {
+ Recording => { $self->data->{recording_id} => [] },
+ Artist => { load_artist_credit_definitions($self->data->{artist_credit}) }
+ };
+}
+
+sub build_display_data
+{
+ my ($self, $loaded) = @_;
+
+ return {
+ name => $self->data->{name},
+ length => $self->data->{length},
+ tracklist_id => $self->data->{tracklist_id},
+ artist => artist_credit_from_loaded_definition($loaded, $self->data->{artist_credit}),
+ recording => $loaded->{Recording}->{ $self->data->{recording_id} }
+ };
+}
+
sub insert
{
my $self = shift;
@@ -54,7 +72,6 @@
}

my $track = $self->c->model('Track')->insert(\%data);
- $self->track($track);
$self->track_id($track->id);
}

Modified: mb_server/trunk/lib/MusicBrainz/Server/Edit/Tracklist/DeleteTrack.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Edit/Tracklist/DeleteTrack.pm 2009-11-20 16:40:52 UTC (rev 12306)
+++ mb_server/trunk/lib/MusicBrainz/Server/Edit/Tracklist/DeleteTrack.pm 2009-11-20 17:13:05 UTC (rev 12307)
@@ -1,36 +1,66 @@
package MusicBrainz::Server::Edit::Tracklist::DeleteTrack;
use Moose;

-use MooseX::Types::Moose qw( Int );
+use MooseX::Types::Moose qw( Int Str );
use MooseX::Types::Structured qw( Dict );
use MusicBrainz::Server::Constants qw( $EDIT_TRACKLIST_DELETETRACK );
+use MusicBrainz::Server::Data::Utils qw( artist_credit_to_ref );
+use MusicBrainz::Server::Edit::Types qw( ArtistCreditDefinition Nullable );
+use MusicBrainz::Server::Edit::Utils qw( load_artist_credit_definitions artist_credit_from_loaded_definition );

extends 'MusicBrainz::Server::Edit';

sub edit_name { 'Delete Track' }
sub edit_type { $EDIT_TRACKLIST_DELETETRACK }

-sub alter_edit_pending { { Track => [ shift->track_id ] } }
-sub models { [qw( Track )] }
+sub alter_edit_pending { { Track => [ shift->data->{track_id} ] } }

-has 'track_id' => (
- isa => 'Int',
- is => 'rw',
- lazy => 1,
- default => sub { shift->data->{track_id} }
-);
-
-has 'track' => (
- isa => 'Track',
- is => 'rw'
-);
-
has '+data' => (
isa => Dict[
- track_id => Int
+ track_id => Int,
+ name => Str,
+ artist_credit => ArtistCreditDefinition,
+ recording_id => Int,
],
);

+sub foreign_keys
+{
+ my $self = shift;
+ return {
+ Artist => { load_artist_credit_definitions($self->data->{artist_credit}) },
+ Recording => { $self->data->{recording_id} => [] }
+ };
+}
+
+sub build_display_data
+{
+ my ($self, $loaded) = @_;
+ return {
+ artist_credit => artist_credit_from_loaded_definition($loaded, $self->data->{artist_credit}),
+ recording => $loaded->{Recording}->{ $self->data->{recording_id} },
+ map { $_ => $self->data->{$_} } qw( length name )
+ }
+}
+
+sub initialize
+{
+ my ($self, %args) = @_;
+ my $track = delete $args{track} or die "Required 'track' object";
+
+ if (!$track->artist_credit)
+ {
+ $self->c->model('ArtistCredit')->load($track);
+ }
+
+ $self->data({
+ track_id => $track->id,
+ name => $track->name,
+ artist_credit => artist_credit_to_ref($track->artist_credit),
+ recording_id => $track->recording_id,
+ });
+}
+
sub accept
{
my $self = shift;
@@ -40,6 +70,8 @@
$track->position + 1, -1);
}

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

Modified: mb_server/trunk/lib/MusicBrainz/Server/Edit/Utils.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Edit/Utils.pm 2009-11-20 16:40:52 UTC (rev 12306)
+++ mb_server/trunk/lib/MusicBrainz/Server/Edit/Utils.pm 2009-11-20 17:13:05 UTC (rev 12307)
@@ -2,12 +2,19 @@

use strict;
use warnings;
+
use MusicBrainz::Server::Data::Utils qw( partial_date_to_hash );
+use MusicBrainz::Server::Entity::ArtistCredit;
+use MusicBrainz::Server::Entity::ArtistCreditName;

use base 'Exporter';

our @EXPORT_OK = qw(
date_closure
+ load_artist_credit_definitions
+ artist_credit_from_loaded_definition
+ changed_relations
+ changed_display_data
);

sub date_closure
@@ -18,6 +25,61 @@
return partial_date_to_hash($a->$attr);
};
}
+
+sub load_artist_credit_definitions
+{
+ return map { $_->{artist} => [] } map { @{ $_ } } @_;
+}
+
+sub artist_credit_from_loaded_definition
+{
+ my ($loaded, $definition) = @_;
+ return MusicBrainz::Server::Entity::ArtistCredit->new(
+ names => [
+ map {
+ MusicBrainz::Server::Entity::ArtistCreditName->new(
+ name => $_->{name},
+ artist => $loaded->{Artist}->{ $_->{artist} }
+ );
+ } @$definition,
+ ]
+ );
+}
+
+sub changed_relations
+{
+ my ($data, $relations, %mapping) = @_;
+ while (my ($model, $field) = each %mapping) {
+ next unless exists $data->{new}{$field};
+ $relations->{$model} ||= {};
+
+ $relations->{$model}->{ $data->{new}{$field} } = []
+ if defined $data->{new}{$field};
+
+ $relations->{$model}->{ $data->{old}{$field} } = []
+ if defined $data->{old}{$field};
+ }
+
+ return $relations;
+}
+
+sub changed_display_data
+{
+ my ($data, $loaded, %mapping) = @_;
+ my $display = {};
+ while (my ($tt_field, $accessor) = each %mapping) {
+ my ($field, $model) = ref $accessor ? @$accessor : ( $accessor );
+ next unless exists $data->{new}{$field};
+ my ($old, $new) = ($data->{old}{$field}, $data->{new}{$field});
+ $display->{$tt_field} = {
+ new => defined $new ? (defined $model ? $loaded->{$model}->{$new} : $new) : undef,
+ old => defined $old ? (defined $model ? $loaded->{$model}->{$old} : $old) : undef,
+ }
+ }
+
+ return $display;
+}
+
1;

=head1 COPYRIGHT

Modified: mb_server/trunk/lib/MusicBrainz/Server/Edit.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Edit.pm 2009-11-20 16:40:52 UTC (rev 12306)
+++ mb_server/trunk/lib/MusicBrainz/Server/Edit.pm 2009-11-20 17:13:05 UTC (rev 12307)
@@ -81,6 +81,12 @@
is => 'rw',
);

+has 'display_data' => (
+ isa => 'HashRef',
+ is => 'rw',
+ predicate => 'is_loaded'
+);
+
has 'auto_edit' => (
isa => 'Bool',
is => 'rw',
@@ -223,16 +229,13 @@
}
}

-=head2 models
+sub foreign_keys { { } }
+sub build_display_data
+{
+ my ($self, $loaded) = @_;
+ return { };
+}

-A list of all models that should attempt to load additional data for this edit.
-
-Returns an array ref of model names
-
-=cut
-
-sub models { return [] }
-
sub accept { }
sub reject { }
sub insert { }

Modified: mb_server/trunk/root/edit/info.tt
===================================================================
--- mb_server/trunk/root/edit/info.tt 2009-11-20 16:40:52 UTC (rev 12306)
+++ mb_server/trunk/root/edit/info.tt 2009-11-20 17:13:05 UTC (rev 12307)
@@ -2,6 +2,7 @@
<tr>
<th>[% l('Edit ID:') %]</th>
<td>[% link_edit(edit) %]</td>
+ </tr>
<tr>
<th>[% l('Editor:') %]</th>
<td>[%- link_editor(edit.editor) -%]</td>

Modified: mb_server/trunk/t/actions/release_editor/add-medium-existing.t
===================================================================
--- mb_server/trunk/t/actions/release_editor/add-medium-existing.t 2009-11-20 16:40:52 UTC (rev 12306)
+++ mb_server/trunk/t/actions/release_editor/add-medium-existing.t 2009-11-20 17:13:05 UTC (rev 12307)
@@ -34,4 +34,14 @@
name => 'Unreleased Hits',
}, '...edit has the right data');

+$mech->get_ok('/edit/' . $edit->id, 'Fetch the edit page');
+xml_ok($mech->content, '..is valid xml');
+$mech->content_contains('Unreleased Hits', '..contains medium name');
+$mech->content_contains('3', '..contains medium position'); # This is a really sloppy test...
+$mech->content_contains('Aerial', '..contains release name');
+$mech->content_contains('/release/f205627f-b70a-409d-adbe-66289b614e80', '...with a link to the release');
+$mech->content_contains('Artist', '..contains release artist name');
+$mech->content_contains('/artist/945c079d-374e-4436-9448-da92dedef3cf', '...with a link to the artist');
+$mech->content_contains('/tracklist/3', '..contains a link to the tracklist');
+
done_testing;

Modified: mb_server/trunk/t/actions/release_editor/add-medium-new-tracklist.t
===================================================================
--- mb_server/trunk/t/actions/release_editor/add-medium-new-tracklist.t 2009-11-20 16:40:52 UTC (rev 12306)
+++ mb_server/trunk/t/actions/release_editor/add-medium-new-tracklist.t 2009-11-20 17:13:05 UTC (rev 12307)
@@ -35,4 +35,14 @@
is($edit->data->{name}, 'Unreleased Hits', '...edit has the right data');
ok($edit->data->{tracklist_id}, '...edit has the right data');

+$mech->get_ok('/edit/' . $edit->id, 'Fetch edit page');
+xml_ok($mech->content, '..is valid xml');
+$mech->content_contains('Unreleased Hits', '..contains medium name');
+$mech->content_contains('5', '..contains medium position'); # This is a really sloppy test...
+$mech->content_contains('Format', '..contains format name');
+$mech->content_contains('Aerial', '..contains release name');
+$mech->content_contains('/release/f205627f-b70a-409d-adbe-66289b614e80', '...with a link to the release');
+$mech->content_contains('Artist', '..contains release artist name');
+$mech->content_contains('/artist/945c079d-374e-4436-9448-da92dedef3cf', '...with a link to the artist');
+
done_testing;

Modified: mb_server/trunk/t/actions/release_editor/add-track.t
===================================================================
--- mb_server/trunk/t/actions/release_editor/add-track.t 2009-11-20 16:40:52 UTC (rev 12306)
+++ mb_server/trunk/t/actions/release_editor/add-track.t 2009-11-20 17:13:05 UTC (rev 12307)
@@ -36,4 +36,22 @@
position => 4
}, '...edit has the right data');

+my $track = $c->model('Track')->get_by_id($edit->track_id);
+
+$mech->get_ok('/edit/' . $edit->id, 'Fetch the edit page');
+xml_ok($mech->content, '..xml is valid');
+$mech->content_contains('New track', '..contains track name');
+$mech->content_contains('A new recording was created for this track',
+ '..contains indicitation that this is a new recording');
+$mech->content_contains('/tracklist/1', '..contains a link to the tracklist');
+$mech->content_contains('The Edit Ninja', '..contains the artist name');
+$mech->content_contains('/artist/9f5ad190-caee-11de-8a39-0800200c9a66', '...and a link to the artist');
+
+TODO:
+{
+ local $TODO = 'Length in the edit';
+ ok(exists $edit->data->{length});
+ $mech->content_contains('4:20', '..contains the track length');
+}
+
done_testing;

Modified: mb_server/trunk/t/actions/release_editor/delete-medium.t
===================================================================
--- mb_server/trunk/t/actions/release_editor/delete-medium.t 2009-11-20 16:40:52 UTC (rev 12306)
+++ mb_server/trunk/t/actions/release_editor/delete-medium.t 2009-11-20 17:13:05 UTC (rev 12307)
@@ -23,8 +23,12 @@

my $edit = MusicBrainz::Server::Test->get_latest_edit($c);
isa_ok($edit, 'MusicBrainz::Server::Edit::Medium::Delete', '...edit is a delete-medium edit');
-is_deeply($edit->data, {
- medium_id => 1,
-}, '...edit has the right data');
+is($edit->data->{medium_id}, 1, '...edit has the correct medium id');

+$mech->get_ok('/edit/' . $edit->id, 'Fetch edit page');
+$mech->content_contains('A Sea of Honey', '..contains old medium name');
+$mech->content_contains('Format', '..contains old medium format');
+$mech->content_contains('1', '..contains old medium position');
+$mech->content_contains('/tracklist/1', '..contains link to show the tracklist for the medium');
+
done_testing;

Modified: mb_server/trunk/t/actions/release_editor/delete-track.t
===================================================================
--- mb_server/trunk/t/actions/release_editor/delete-track.t 2009-11-20 16:40:52 UTC (rev 12306)
+++ mb_server/trunk/t/actions/release_editor/delete-track.t 2009-11-20 17:13:05 UTC (rev 12307)
@@ -15,7 +15,6 @@
$mech->get_ok('/release/f205627f-b70a-409d-adbe-66289b614e80/edit', 'deleting tracks');
my $request = POST $mech->uri, [
'edit-release.mediums.0.tracklist.id' => '1',
- 'edit-release.mediums.0.tracklist.tracks.0.name' => 'Renamed track',
'edit-release.mediums.0.tracklist.tracks.0.id' => '1',
'edit-release.mediums.0.tracklist.tracks.0.deleted' => '1',
];
@@ -25,8 +24,13 @@

my $edit = MusicBrainz::Server::Test->get_latest_edit($c);
isa_ok($edit, 'MusicBrainz::Server::Edit::Tracklist::DeleteTrack', '...edit is a delete-track edit');
-is_deeply($edit->data, {
- track_id => 1,
-}, '...edit has the right data');
+is($edit->data->{track_id}, 1, '...edit has the right data');

+$mech->get_ok('/edit/' . $edit->id, 'Fetch edit page');
+xml_ok($mech->content, '..valid xml');
+$mech->content_contains('King of the Mountain', '..contains track name');
+$mech->content_contains('/recording/54b9d183-7dab-42ba-94a3-7388a66604b8', '..contains a link to the recording');
+$mech->content_contains('Artist', '..contains the artist name');
+$mech->content_contains('/artist/945c079d-374e-4436-9448-da92dedef3cf', '...with a link to the artist');
+
done_testing;

Modified: mb_server/trunk/t/actions/release_editor/edit-medium.t
===================================================================
--- mb_server/trunk/t/actions/release_editor/edit-medium.t 2009-11-20 16:40:52 UTC (rev 12306)
+++ mb_server/trunk/t/actions/release_editor/edit-medium.t 2009-11-20 17:13:05 UTC (rev 12307)
@@ -39,4 +39,18 @@
}
}, '...edit has the right data');

+$c->model('Edit')->load_all($edit);
+use Data::Dumper;
+warn Dumper $edit->display_data;
+
+
+$mech->get_ok('/edit/' . $edit->id);
+xml_ok($mech->content, '..valid xml');
+$mech->content_contains('Renamed Medium', '..has new medium name');
+$mech->content_contains('A Sea of Honey', '..has old medium name');
+$mech->content_contains('Format', '..has old format name');
+$mech->content_contains('Musical Box', '..has new format name');
+$mech->content_contains('2', '..has new position');
+$mech->content_contains('1', '..has old position');
+
done_testing;

Modified: mb_server/trunk/t/actions/release_editor/edit-track.t
===================================================================
--- mb_server/trunk/t/actions/release_editor/edit-track.t 2009-11-20 16:40:52 UTC (rev 12306)
+++ mb_server/trunk/t/actions/release_editor/edit-track.t 2009-11-20 17:13:05 UTC (rev 12307)
@@ -17,7 +17,7 @@
'edit-release.mediums.0.tracklist.id' => '1',
'edit-release.mediums.0.tracklist.tracks.0.name' => 'Renamed track',
'edit-release.mediums.0.tracklist.tracks.0.artist_credit.names.0.name' => 'The Edit Ninja',
- 'edit-release.mediums.0.tracklist.tracks.0.artist_credit.names.0.artist_id' => '5',
+ 'edit-release.mediums.0.tracklist.tracks.0.artist_credit.names.0.artist_id' => '2',
'edit-release.mediums.0.tracklist.tracks.0.id' => '1',
'edit-release.mediums.0.tracklist.tracks.0.length' => '4:20',
'edit-release.mediums.0.tracklist.tracks.0.position' => '4',
@@ -33,7 +33,7 @@
new => {
name => 'Renamed track',
artist_credit => [
- { name => 'The Edit Ninja', artist => 5 }
+ { name => 'The Edit Ninja', artist => 2 }
],
position => 4,
},
@@ -52,4 +52,13 @@
ok(exists $edit->data->{old}->{length});
}

-done_testing;
\ No newline at end of file
+$mech->get_ok('/edit/' . $edit->id, 'Fetch edit page');
+xml_ok($mech->content, '..valid xml');
+$mech->content_contains('Renamed track', '..contains new track name');
+$mech->content_contains('King of the Mountain', '..contains old track name');
+$mech->content_contains('The Edit Ninja', '..contains new artist name');
+$mech->content_contains('Artist', '..contains new artist name');
+$mech->content_contains('4', '..contains new position');
+$mech->content_contains('1', '..contains old position');
+
+done_testing;

Modified: mb_server/trunk/t/actions/release_editor/header.t
===================================================================
--- mb_server/trunk/t/actions/release_editor/header.t 2009-11-20 16:40:52 UTC (rev 12306)
+++ mb_server/trunk/t/actions/release_editor/header.t 2009-11-20 17:13:05 UTC (rev 12307)
@@ -15,7 +15,7 @@
$mech->get_ok('/release/f205627f-b70a-409d-adbe-66289b614e80/edit', 'edit header details');
my $request = POST $mech->uri, [
'edit-release.artist_credit.names.0.name' => 'Bob Marley',
- 'edit-release.artist_credit.names.0.artist_id' => 4,
+ 'edit-release.artist_credit.names.0.artist_id' => 2,
'edit-release.name' => 'A new name',
'edit-release.comment' => 'With a fancy comment',
];
@@ -29,7 +29,7 @@
release => 1,
new => {
artist_credit => [
- { name => 'Bob Marley', artist => 4 }
+ { name => 'Bob Marley', artist => 2 }
],
name => 'A new name',
comment => 'With a fancy comment',
@@ -43,4 +43,12 @@
}
}, '...edit has the right data');

+$mech->get_ok('/edit/' . $edit->id, 'Fetch the edit page');
+xml_ok($mech->content, '..valid xml');
+$mech->content_contains('A new name', '..contains new name');
+$mech->content_contains('Aerial', '..contains old name');
+$mech->content_contains('Artist', '..contains old artist name');
+$mech->content_contains('Bob Marley', '..contains new artist name');
+$mech->content_contains('With a fancy comment', '..contains new comment');
+
done_testing;

Modified: mb_server/trunk/t/actions/release_editor/sidebar.t
===================================================================
--- mb_server/trunk/t/actions/release_editor/sidebar.t 2009-11-20 16:40:52 UTC (rev 12306)
+++ mb_server/trunk/t/actions/release_editor/sidebar.t 2009-11-20 17:13:05 UTC (rev 12307)
@@ -22,9 +22,9 @@
'edit-release.date.day' => '25',
'edit-release.packaging_id' => '2',
'edit-release.status_id', '2',
- 'edit-release.language_id' => '2',
- 'edit-release.script_id' => '2',
- 'edit-release.country_id' => '2',
+ 'edit-release.language_id' => '1',
+ 'edit-release.script_id' => '1',
+ 'edit-release.country_id' => '1',
'edit-release.barcode' => '9780596001087',
];

@@ -43,9 +43,9 @@
},
packaging_id => 2,
status_id => 2,
- language_id => 2,
- script_id => 2,
- country_id => 2,
+ language_id => 1,
+ script_id => 1,
+ country_id => 1,
barcode => '9780596001087',
},
old => {
@@ -63,4 +63,17 @@
}
}, '...edit has the correct data');

+$mech->get_ok('/edit/' . $edit->id, 'Fetch the edit page');
+xml_ok($mech->content, '..valid xml');
+$mech->content_contains('2009', '..contains new year');
+$mech->content_contains('10', '..contains new month');
+$mech->content_contains('25', '..contains new day');
+$mech->content_contains('2007', '..contains old year');
+$mech->content_contains('Digipak', '..contains new packaging name');
+$mech->content_contains('Promotion', '..contains new status name');
+$mech->content_contains('9780596001087', '..contains new barcode');
+$mech->content_contains('Ugar', '..contains new script');
+$mech->content_contains('German', '..contains new language');
+$mech->content_contains('United Kingdom', '..contains new country');
+
done_testing;

Modified: mb_server/trunk/t/controllers/release_editor.t
===================================================================
--- mb_server/trunk/t/controllers/release_editor.t 2009-11-20 16:40:52 UTC (rev 12306)
+++ mb_server/trunk/t/controllers/release_editor.t 2009-11-20 17:13:05 UTC (rev 12307)
@@ -16,8 +16,8 @@
startup => sub {
MusicBrainz::Server::Test->prepare_test_server();
MusicBrainz::Server::Test->prepare_test_database($c, '+tracklist');
+ MusicBrainz::Server::Test->prepare_test_database($c, '+release_editor');
MusicBrainz::Server::Test->prepare_test_database($c, '+editor');
- MusicBrainz::Server::Test->prepare_test_database($c, '+release_editor');
MusicBrainz::Server::Test->prepare_raw_test_database($c);
},
teardown => sub { get('/logout') }

Modified: mb_server/trunk/t/edit_medium_create.t
===================================================================
--- mb_server/trunk/t/edit_medium_create.t 2009-11-20 16:40:52 UTC (rev 12306)
+++ mb_server/trunk/t/edit_medium_create.t 2009-11-20 17:13:05 UTC (rev 12307)
@@ -29,14 +29,12 @@
ok(defined $edit->id);

$c->model('Edit')->load_all($edit);
-ok(defined $edit->medium);
-is($edit->medium->id, $edit->medium_id);
-is($edit->medium->name, 'Studio');
-is($edit->medium->format_id, 1);
-is($edit->medium->tracklist_id, 1);
-is($edit->medium->position, 1);
-is($edit->medium->release_id, 1);
-is($edit->medium->edits_pending, 1);
+ok($edit->display_data);
+is($edit->display_data->{name}, 'Studio');
+is($edit->display_data->{position}, 1);
+is($edit->display_data->{format}->id, 1);
+is($edit->display_data->{release}->id, 1);
+is($edit->display_data->{release}->artist_credit->name, 'Tosca');

accept_edit($c, $edit);

Modified: mb_server/trunk/t/edit_medium_delete.t
===================================================================
--- mb_server/trunk/t/edit_medium_delete.t 2009-11-20 16:40:52 UTC (rev 12306)
+++ mb_server/trunk/t/edit_medium_delete.t 2009-11-20 17:13:05 UTC (rev 12307)
@@ -37,9 +37,10 @@
done_testing;

sub _create_edit {
+ my $medium = $c->model('Medium')->get_by_id(1);
return $c->model('Edit')->create(
edit_type => $EDIT_MEDIUM_DELETE,
- medium_id => 1,
+ medium => $medium,
editor_id => 1
);
}

Modified: mb_server/trunk/t/sql/release_editor.sql
===================================================================
--- mb_server/trunk/t/sql/release_editor.sql 2009-11-20 16:40:52 UTC (rev 12306)
+++ mb_server/trunk/t/sql/release_editor.sql 2009-11-20 17:13:05 UTC (rev 12307)
@@ -1,11 +1,17 @@
BEGIN;
SET client_min_messages TO 'warning';

+INSERT INTO language (id, isocode_3t, isocode_3b, isocode_2, name) VALUES (1, 'deu', 'ger', 'de', 'German');
+INSERT INTO script (id, isocode, isonumber, name) VALUES (1, 'Ugar', '040', 'Ugaritic');
+INSERT INTO country (id, isocode, name) VALUES (1, 'GB', 'United Kingdom');
+
INSERT INTO artist_name (id, name) VALUES (2, 'Other Artist');
INSERT INTO artist (id, name, sortname, gid) VALUES (2, 2, 2, '9f5ad190-caee-11de-8a39-0800200c9a66');
INSERT INTO tracklist (id) VALUES (3);
INSERT INTO track (id, tracklist, position, recording, name, artist_credit, length) VALUES (17, 3, 1, 1, 1, 1, 293720);
INSERT INTO medium_format (id, name) VALUES (2, 'Musical Box');
+INSERT INTO release_packaging (id, name) VALUES (2, 'Digipak');
+INSERT INTO release_status (id, name) VALUES (2, 'Promotion');

ALTER SEQUENCE artist_name_id_seq RESTART 3;
ALTER SEQUENCE medium_id_seq RESTART 5;

Modified: mb_server/trunk/t/sql/tracklist.sql
===================================================================
--- mb_server/trunk/t/sql/tracklist.sql 2009-11-20 16:40:52 UTC (rev 12306)
+++ mb_server/trunk/t/sql/tracklist.sql 2009-11-20 17:13:05 UTC (rev 12307)
@@ -5,12 +5,17 @@
TRUNCATE artist_credit_name CASCADE;
TRUNCATE artist_name CASCADE;
TRUNCATE artist CASCADE;
+TRUNCATE country CASCADE;
+TRUNCATE language CASCADE;
TRUNCATE medium CASCADE;
TRUNCATE medium_format CASCADE;
TRUNCATE recording CASCADE;
TRUNCATE release CASCADE;
TRUNCATE release_group CASCADE;
TRUNCATE release_name CASCADE;
+TRUNCATE release_status CASCADE;
+TRUNCATE release_packaging CASCADE;
+TRUNCATE script CASCADE;
TRUNCATE tracklist CASCADE;
TRUNCATE track CASCADE;
TRUNCATE track_name CASCADE;

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

r12306 - mb_server/trunk/lib/MusicBrainz/Server/Controller

2009-11-20T08:40:52Z

Author: acid2
Date: 2009-11-20 16:40:52 +0000 (Fri, 20 Nov 2009)
New Revision: 12306

Modified:
mb_server/trunk/lib/MusicBrainz/Server/Controller/Root.pm
Log:
Fix a test warning

Modified: mb_server/trunk/lib/MusicBrainz/Server/Controller/Root.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Controller/Root.pm 2009-11-20 16:37:56 UTC (rev 12305)
+++ mb_server/trunk/lib/MusicBrainz/Server/Controller/Root.pm 2009-11-20 16:40:52 UTC (rev 12306)
@@ -106,7 +106,7 @@
}
}

- if ($c->req->user_agent =~ /MSIE/i) {
+ if ($c->req->user_agent && $c->req->user_agent =~ /MSIE/i) {
$c->stash->{looks_like_ie} = 1;
$c->stash->{needs_chrome} = !($c->req->user_agent =~ /chromeframe/i);
}

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

r12305 - in mb_server/trunk: . lib/MusicBrainz/Server lib/MusicBrainz/Server/Data lib/MusicBrainz/Server/Edit lib/MusicBrainz/Server/Edit/Artist lib/MusicBrainz/Server/Edit/Label lib/MusicBrainz/Server/Edit/Medium lib/MusicBrainz/Server/Edit/Relationship lib/MusicBrainz/Server/Edit/Release lib/MusicBrainz/Server/Edit/ReleaseGroup lib/MusicBrainz/Server/Edit/Track lib/MusicBrainz/Server/Edit/Work t

2009-11-20T08:37:56Z

Author: acid2
Date: 2009-11-20 16:37:56 +0000 (Fri, 20 Nov 2009)
New Revision: 12305

Added:
mb_server/trunk/lib/MusicBrainz/Server/Edit/WithDifferences.pm
mb_server/trunk/t/edit_differences.t
Removed:
mb_server/trunk/t/edit.t
Modified:
mb_server/trunk/Makefile.PL
mb_server/trunk/lib/MusicBrainz/Server/Data/Edit.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/Link.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/Utils.pm
mb_server/trunk/lib/MusicBrainz/Server/Edit.pm
mb_server/trunk/lib/MusicBrainz/Server/Edit/Artist/Edit.pm
mb_server/trunk/lib/MusicBrainz/Server/Edit/Exceptions.pm
mb_server/trunk/lib/MusicBrainz/Server/Edit/Label/Edit.pm
mb_server/trunk/lib/MusicBrainz/Server/Edit/Medium/Edit.pm
mb_server/trunk/lib/MusicBrainz/Server/Edit/Relationship/Edit.pm
mb_server/trunk/lib/MusicBrainz/Server/Edit/Release/Edit.pm
mb_server/trunk/lib/MusicBrainz/Server/Edit/Release/EditReleaseLabel.pm
mb_server/trunk/lib/MusicBrainz/Server/Edit/ReleaseGroup/Edit.pm
mb_server/trunk/lib/MusicBrainz/Server/Edit/Track/Edit.pm
mb_server/trunk/lib/MusicBrainz/Server/Edit/Work/Edit.pm
Log:
Do not enter edits that make no changes

Merge branch 'difference-edits'

Modified: mb_server/trunk/Makefile.PL
===================================================================
--- mb_server/trunk/Makefile.PL 2009-11-20 15:18:30 UTC (rev 12304)
+++ mb_server/trunk/Makefile.PL 2009-11-20 16:37:56 UTC (rev 12305)
@@ -46,6 +46,7 @@
requires 'Locale::Maketext::Extract::Plugin::TT2';
requires 'Locale::TextDomain' => '1.16';
requires 'List::MoreUtils' => '0.22';
+requires 'Match::Smart';
requires 'MIME::Lite' => '3.023';
requires 'Moose' => '0.87';
requires 'MooseX::AttributeHelpers' => '0.17';

Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/Edit.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/Edit.pm 2009-11-20 15:18:30 UTC (rev 12304)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/Edit.pm 2009-11-20 16:37:56 UTC (rev 12305)
@@ -148,7 +148,12 @@
or die "Could not lookup edit type for $type";

my $edit = $class->new( editor_id => $editor_id, c => $self->c );
- $edit->initialize(%opts);
+ try {
+ $edit->initialize(%opts);
+ }
+ catch (MusicBrainz::Server::Edit::Exceptions::NoChange $e) {
+ return;
+ }

my $quality = $edit->determine_quality;
my $conditions = $edit->edit_conditions->{$quality};

Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/Link.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/Link.pm 2009-11-20 15:18:30 UTC (rev 12304)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/Link.pm 2009-11-20 16:37:56 UTC (rev 12305)
@@ -125,7 +125,7 @@
}
}

- my @attrs = @{ $values->{attributes} };
+ my @attrs = $values->{attributes} ? @{ $values->{attributes} } : ();

push @conditions, "attributecount = ?";
push @args, scalar(@attrs);

Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/Utils.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/Utils.pm 2009-11-20 15:18:30 UTC (rev 12304)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/Utils.pm 2009-11-20 16:37:56 UTC (rev 12305)
@@ -7,12 +7,14 @@
use OSSP::uuid;
use Sql;
use Readonly;
+use Storable;
use UNIVERSAL::require;

our @EXPORT_OK = qw(
artist_credit_to_ref
defined_hash
hash_to_row
+ deep_equal
add_partial_date_to_row
generate_gid
insert_and_create
@@ -228,6 +230,12 @@
return $order_by;
}

+sub deep_equal {
+ my ($a, $b) = @_;
+ local $Storable::canonical = 1;
+ return (Storable::freeze($a) eq Storable::freeze($b));
+}
+
1;

=head1 COPYRIGHT

Modified: mb_server/trunk/lib/MusicBrainz/Server/Edit/Artist/Edit.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Edit/Artist/Edit.pm 2009-11-20 15:18:30 UTC (rev 12304)
+++ mb_server/trunk/lib/MusicBrainz/Server/Edit/Artist/Edit.pm 2009-11-20 16:37:56 UTC (rev 12305)
@@ -10,7 +10,7 @@
use MooseX::Types::Moose qw( Maybe Str Int );
use MooseX::Types::Structured qw( Dict Optional );

-extends 'MusicBrainz::Server::Edit';
+extends 'MusicBrainz::Server::Edit::WithDifferences';

sub edit_type { $EDIT_ARTIST_EDIT }
sub edit_name { "Create Artist" }
@@ -67,9 +67,8 @@

$self->artist($artist);
$self->data({
- old => $self->_change_hash($artist, keys %opts),
- new => { %opts },
- artist => $artist->id
+ artist => $artist->id,
+ $self->_change_data($artist, %opts)
});
};

Modified: mb_server/trunk/lib/MusicBrainz/Server/Edit/Exceptions.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Edit/Exceptions.pm 2009-11-20 15:18:30 UTC (rev 12304)
+++ mb_server/trunk/lib/MusicBrainz/Server/Edit/Exceptions.pm 2009-11-20 16:37:56 UTC (rev 12305)
@@ -1,5 +1,7 @@
package MusicBrainz::Server::Edit::Exceptions;

-use Exception::Class ();
+use Exception::Class (
+ 'MusicBrainz::Server::Edit::Exception::NoChanges',
+);

1;

Modified: mb_server/trunk/lib/MusicBrainz/Server/Edit/Label/Edit.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Edit/Label/Edit.pm 2009-11-20 15:18:30 UTC (rev 12304)
+++ mb_server/trunk/lib/MusicBrainz/Server/Edit/Label/Edit.pm 2009-11-20 16:37:56 UTC (rev 12305)
@@ -9,7 +9,7 @@
use MusicBrainz::Server::Edit::Utils qw( date_closure );
use MusicBrainz::Server::Edit::Types qw( PartialDateHash Nullable );

-extends 'MusicBrainz::Server::Edit';
+extends 'MusicBrainz::Server::Edit::WithDifferences';

sub edit_type { $EDIT_LABEL_EDIT }
sub edit_name { "Edit Label" }
@@ -65,9 +65,8 @@
die "You must specify the label object to edit" unless defined $label;

$self->data({
- old => $self->_change_hash($label, keys %args),
- new => \%args,
- label => $label->id
+ label => $label->id,
+ $self->_change_data($label, %args)
});
};

Modified: mb_server/trunk/lib/MusicBrainz/Server/Edit/Medium/Edit.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Edit/Medium/Edit.pm 2009-11-20 15:18:30 UTC (rev 12304)
+++ mb_server/trunk/lib/MusicBrainz/Server/Edit/Medium/Edit.pm 2009-11-20 16:37:56 UTC (rev 12305)
@@ -7,7 +7,7 @@
use MusicBrainz::Server::Edit::Types qw( Nullable );
use Moose::Util::TypeConstraints qw( find_type_constraint subtype as );

-extends 'MusicBrainz::Server::Edit';
+extends 'MusicBrainz::Server::Edit::WithDifferences';

sub edit_type { $EDIT_MEDIUM_EDIT }
sub edit_name { 'Edit Medium' }
@@ -50,9 +50,8 @@

$self->medium($medium);
$self->data({
- old => $self->_change_hash($medium, keys %opts),
- new => { %opts },
medium => $medium->id,
+ $self->_change_data($medium, %opts)
});
}

Modified: mb_server/trunk/lib/MusicBrainz/Server/Edit/Relationship/Edit.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Edit/Relationship/Edit.pm 2009-11-20 15:18:30 UTC (rev 12304)
+++ mb_server/trunk/lib/MusicBrainz/Server/Edit/Relationship/Edit.pm 2009-11-20 16:37:56 UTC (rev 12305)
@@ -9,7 +9,7 @@
use MooseX::Types::Moose qw( ArrayRef Int Str );
use MooseX::Types::Structured qw( Dict );

-extends 'MusicBrainz::Server::Edit';
+extends 'MusicBrainz::Server::Edit::WithDifferences';

sub edit_type { $EDIT_RELATIONSHIP_EDIT }
sub edit_name { "Edit Relationship" }
@@ -95,8 +95,7 @@
type0 => $type0,
type1 => $type1,
relationship_id => $relationship->id,
- old => $self->_change_hash($relationship->link, keys %opts),
- new => { %opts },
+ $self->_change_data($relationship->link, %opts)
});
}

Modified: mb_server/trunk/lib/MusicBrainz/Server/Edit/Release/Edit.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Edit/Release/Edit.pm 2009-11-20 15:18:30 UTC (rev 12304)
+++ mb_server/trunk/lib/MusicBrainz/Server/Edit/Release/Edit.pm 2009-11-20 16:37:56 UTC (rev 12305)
@@ -10,7 +10,7 @@
use MusicBrainz::Server::Data::Utils qw( artist_credit_to_ref partial_date_to_hash );
use MusicBrainz::Server::Edit::Types qw( ArtistCreditDefinition Nullable PartialDateHash );

-extends 'MusicBrainz::Server::Edit';
+extends 'MusicBrainz::Server::Edit::WithDifferences';

sub edit_type { $EDIT_RELEASE_EDIT }
sub edit_name { 'Edit Release '}
@@ -75,11 +75,10 @@

$self->release($release);
$self->data({
- old => $self->_change_hash($release, keys %opts),
- new => \%opts,
release => $release->id,
+ $self->_change_data($release, %opts)
});
-};
+}

override 'accept' => sub
{

Modified: mb_server/trunk/lib/MusicBrainz/Server/Edit/Release/EditReleaseLabel.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Edit/Release/EditReleaseLabel.pm 2009-11-20 15:18:30 UTC (rev 12304)
+++ mb_server/trunk/lib/MusicBrainz/Server/Edit/Release/EditReleaseLabel.pm 2009-11-20 16:37:56 UTC (rev 12305)
@@ -63,10 +63,9 @@
unless defined $release_label;

$self->data({
- old => $self->_change_hash($release_label, keys %opts),
- new => { %opts },
release_label_id => $release_label->id,
- release_id => $release_label->release_id
+ release_id => $release_label->release_id,
+ $self->_change_data($release_label, keys %opts),
});
};

Modified: mb_server/trunk/lib/MusicBrainz/Server/Edit/ReleaseGroup/Edit.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Edit/ReleaseGroup/Edit.pm 2009-11-20 15:18:30 UTC (rev 12304)
+++ mb_server/trunk/lib/MusicBrainz/Server/Edit/ReleaseGroup/Edit.pm 2009-11-20 16:37:56 UTC (rev 12305)
@@ -13,7 +13,7 @@
use MooseX::Types::Moose qw( ArrayRef Maybe Str Int );
use MooseX::Types::Structured qw( Dict Optional );

-extends 'MusicBrainz::Server::Edit';
+extends 'MusicBrainz::Server::Edit::WithDifferences';

sub edit_type { $EDIT_RELEASEGROUP_EDIT }
sub edit_name { "Edit ReleaseGroup" }
@@ -71,9 +71,8 @@

$self->release_group($release_group);
$self->data({
- old => $self->_change_hash($release_group, keys %args),
- new => \%args,
- release_group => $release_group->id
+ release_group => $release_group->id,
+ $self->_change_data($release_group, %args)
});
};

Modified: mb_server/trunk/lib/MusicBrainz/Server/Edit/Track/Edit.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Edit/Track/Edit.pm 2009-11-20 15:18:30 UTC (rev 12304)
+++ mb_server/trunk/lib/MusicBrainz/Server/Edit/Track/Edit.pm 2009-11-20 16:37:56 UTC (rev 12305)
@@ -8,7 +8,7 @@
use MusicBrainz::Server::Constants qw( $EDIT_TRACK_EDIT );
use MusicBrainz::Server::Data::Utils qw( artist_credit_to_ref );

-extends 'MusicBrainz::Server::Edit';
+extends 'MusicBrainz::Server::Edit::WithDifferences';

sub edit_name { 'Edit track' }
sub edit_type { $EDIT_TRACK_EDIT }
@@ -66,8 +66,7 @@
$self->track($track);
$self->data({
track => $track->id,
- old => $self->_change_hash($track, keys %opts),
- new => { %opts },
+ $self->_change_data($track, %opts)
});
}

Modified: mb_server/trunk/lib/MusicBrainz/Server/Edit/Work/Edit.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Edit/Work/Edit.pm 2009-11-20 15:18:30 UTC (rev 12304)
+++ mb_server/trunk/lib/MusicBrainz/Server/Edit/Work/Edit.pm 2009-11-20 16:37:56 UTC (rev 12305)
@@ -9,7 +9,7 @@
use MusicBrainz::Server::Entity::Types;
use MusicBrainz::Server::Data::Utils qw( artist_credit_to_ref );

-extends 'MusicBrainz::Server::Edit';
+extends 'MusicBrainz::Server::Edit::WithDifferences';

sub edit_type { $EDIT_WORK_EDIT }
sub edit_name { 'Edit work' }
@@ -62,9 +62,8 @@
$self->work($work);
$self->work_id($work->id);
$self->data({
- old => $self->_change_hash($work, keys %opts),
- new => { %opts },
- work => $work->id
+ work => $work->id,
+ $self->_change_data($work, %opts)
});
}

Modified: mb_server/trunk/lib/MusicBrainz/Server/Edit.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Edit.pm 2009-11-20 15:18:30 UTC (rev 12304)
+++ mb_server/trunk/lib/MusicBrainz/Server/Edit.pm 2009-11-20 16:37:56 UTC (rev 12305)
@@ -247,18 +247,6 @@
$self->data(\%opts);
}

-sub _mapping { }
-sub _change_hash
-{
- my ($self, $instance, @keys) = @_;
- my %mapping = $self->_mapping;
- my %old = map {
- my $mapped = exists $mapping{$_} ? $mapping{$_} : $_;
- $_ => ref $mapped eq 'CODE' ? $mapped->($instance) : $instance->$mapped;
- } @keys;
- return \%old;
-}
-
__PACKAGE__->meta->make_immutable;
no Moose;

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

r12304 - in mb_server/trunk: lib/MusicBrainz/Server/Controller root root/ajax root/release root/scripts root/static/scripts root/static/scripts/MB/Control root/static/styles root/tracklist

2009-11-20T07:18:31Z

Author: acid2
Date: 2009-11-20 15:18:30 +0000 (Fri, 20 Nov 2009)
New Revision: 12304

Added:
mb_server/trunk/root/ajax/
mb_server/trunk/root/ajax/lookup_tracklist.tt
Modified:
mb_server/trunk/lib/MusicBrainz/Server/Controller/Ajax.pm
mb_server/trunk/root/release/edit.tt
mb_server/trunk/root/scripts/text_strings.tt
mb_server/trunk/root/static/scripts/MB/Control/ArtistCreditEditor.js
mb_server/trunk/root/static/scripts/MB/Control/TableSorting.js
mb_server/trunk/root/static/scripts/release_editor.js
mb_server/trunk/root/static/styles/release-editor.css
mb_server/trunk/root/tracklist/tracklist.tt
Log:
Support for adding new mediums

Merge branch 'new-medium'

Modified: mb_server/trunk/lib/MusicBrainz/Server/Controller/Ajax.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Controller/Ajax.pm 2009-11-19 09:53:20 UTC (rev 12303)
+++ mb_server/trunk/lib/MusicBrainz/Server/Controller/Ajax.pm 2009-11-20 15:18:30 UTC (rev 12304)
@@ -4,6 +4,33 @@
use List::Util qw( min );
use Encode qw(decode_utf8);

+sub lookup_tracklist : Local
+{
+ my ($self, $c) = @_;
+
+ my $release_name = $c->req->query_params->{release};
+ my $offset = $c->req->query_params->{offset} || 0;
+ my $limit = min ($c->req->query_params->{limit} || 10), 100;
+
+ if ($release_name) {
+ my ($search_results, $hits) = $c->model('DirectSearch')->search('release',
+ $release_name, $limit, $offset);
+
+ my @releases = map { $_->entity } @$search_results;
+
+ $c->model('Medium')->load_for_releases(@releases);
+ my @mediums = map { $_->all_mediums } @releases;
+
+ my @tracklists = map { $_->tracklist } @mediums;
+ $c->model('Track')->load_for_tracklists(@tracklists);
+ $c->model('ArtistCredit')->load(@releases, map { $_->all_tracks } @tracklists);
+
+ $c->stash(
+ releases => [ @releases ],
+ );
+ }
+}
+
sub search : Local
{
my ($self, $c) = @_;

Modified: mb_server/trunk/root/release/edit.tt
===================================================================
--- mb_server/trunk/root/release/edit.tt 2009-11-19 09:53:20 UTC (rev 12303)
+++ mb_server/trunk/root/release/edit.tt 2009-11-20 15:18:30 UTC (rev 12304)
@@ -34,10 +34,10 @@
[% medium_field = form.field('mediums').field(loop.index) %]
<tr>
<td>
- <table class="medium tbl">
+ <table class="medium tbl" id="[% medium_field.html_name %]">
<thead>
<tr class="subh">
- <th class="position">
+ <th class="medium-position">
<span>[% medium.position %]</span>
[% r.hidden(medium_field.field('position'), class => 'medium-position') %]
</th>
@@ -74,6 +74,50 @@
</tbody>
</table>

+ <table id="new-medium" class="tbl medium" style="display: none">
+ <thead>
+ <tr class="subh">
+ <th class="medium-position">
+ <span></span>
+ <input type="hidden"/>
+ </th>
+ <th colspan="3">
+ <input class="medium-name" />
+ </th>
+ </tr>
+ <tr>
+ <th class="position">[% l('#') %]</th>
+ <th class="title">[% l('Title') %]</th>
+ <th class="artist">[% l('Artist') %]</th>
+ <th class="length">[% l('Length') %]</th>
+ </tr>
+ </thead>
+ <tfoot />
+ <tbody />
+ </table>
+
+ <fieldset>
+ <legend>[% l('Add an existing tracklist') %]</legend>
+ <p>[% l('MusicBrainz supports using the same tracklist over multiple
+ releases, which is very convenient when the same disc can be found
+ in multiple releases (for example box sets). If you wish to reuse
+ an existing tracklist, search for the release name, and drag the
+ tracklist you wish to use into the release editor above.') %]</p>
+
+ <p>
+ <label>[% l('Release name:') %]</label>
+ <input id="existing-release-name" />
+ <input id="lookup-release" type="button"
+ value="[% l('Lookup release') %]"
+ style="margin-right: 10pt"/>
+ </p>
+
+ <div class="results">
+ <table class="tbl" id="lookup-tracklist-results">
+ </table>
+ </div>
+ </fieldset>
+
[%- INCLUDE 'forms/edit-note.tt' -%]
[% form_submit(l('Edit')) %]
</div>

Modified: mb_server/trunk/root/scripts/text_strings.tt
===================================================================
--- mb_server/trunk/root/scripts/text_strings.tt 2009-11-19 09:53:20 UTC (rev 12303)
+++ mb_server/trunk/root/scripts/text_strings.tt 2009-11-20 15:18:30 UTC (rev 12304)
@@ -39,5 +39,6 @@
Lookup : "[% l('Lookup') %]",
SearchErrorOccured : "[% l('Sorry, an error occured during your search') %]",
AddNewTrack: "[% l('Add another track') %]",
+ AddAnotherMedium : "[% l('Add another medium') %]"
});
})(MB);

Modified: mb_server/trunk/root/static/scripts/MB/Control/ArtistCreditEditor.js
===================================================================
--- mb_server/trunk/root/static/scripts/MB/Control/ArtistCreditEditor.js 2009-11-19 09:53:20 UTC (rev 12303)
+++ mb_server/trunk/root/static/scripts/MB/Control/ArtistCreditEditor.js 2009-11-20 15:18:30 UTC (rev 12304)
@@ -135,7 +135,8 @@
updateLivePreview();
}
});
- creditSorting.addTables(editor);
+ creditSorting.addDragSource(editor);
+ creditSorting.addDropTarget(editor);

// Row to add a new artist credit
var newLookup = new MB.Control.EntityLookup('artist', {
@@ -215,7 +216,7 @@
var ac = new ArtistCredit(artist);
credits.push(ac);
editorBody.append(ac.row);
- creditSorting.activate();
+ creditSorting.rebind();
},
openAt: function(node) {
if (currentEditor) {

Modified: mb_server/trunk/root/static/scripts/MB/Control/TableSorting.js
===================================================================
--- mb_server/trunk/root/static/scripts/MB/Control/TableSorting.js 2009-11-19 09:53:20 UTC (rev 12303)
+++ mb_server/trunk/root/static/scripts/MB/Control/TableSorting.js 2009-11-20 15:18:30 UTC (rev 12304)
@@ -20,12 +20,12 @@
var self = this;

options = $.extend({
- dragComplete: undefined
+ dragComplete: undefined,
}, options);

var currentDrag;
var currentOver;
- var tables;
+ var dragTables, dropTables;
var insertMethod;
var oldTable;
var rows;
@@ -43,7 +43,7 @@
ev.preventDefault();

// The cell the user clicked on isn't necessarily the row we want
- var possible = tables.children('tbody').children('tr');
+ var possible = dragTables.children('tbody').children('tr');
var el = ev.target;
while (el) {
var index = $.inArray(el, possible);
@@ -62,13 +62,15 @@
.mousemove(mouseMove)
.mouseup(endDrag);

- rows = tables.find('> tbody > tr');
+ rows = dropTables.find('> tbody > tr');

currentDrag = $(el);
startPos = currentDrag.prevAll().length;

oldTable = currentDrag.parent('table');
- dragHelper.append(currentDrag).show();
+ dragHelper
+ .append(currentDrag.clone())
+ .show();

mouseMove(ev);
}
@@ -129,7 +131,8 @@
var mY = ev.pageY;
var over = null;
rows.each(function() {
- over = $(this);
+ over = $(this);
+ if(over === currentDrag) { return false; }
insertMethod = above(over, mY) ? 'before' : 'after';

// Keep looping *until* we find a row that the mouse is in
@@ -144,11 +147,15 @@
}

$.extend(self, {
- activate: function(t) {
- tables.find(options.dragHandle).mousedown(beginDrag);
+ rebind: function() {
+ dragTables.find(options.dragHandle).mousedown(beginDrag);
},
- addTables: function(tab) {
- tables = tables ? tables.add(tab) : $(tab);
+ addDragSource: function(tab) {
+ dragTables = dragTables ? dragTables.add(tab) : $(tab);
+ dragTables.find(options.dragHandle).mousedown(beginDrag);
+ },
+ addDropTarget: function(tab) {
+ dropTables = dropTables ? dropTables.add(tab) : $(tab);
}
});
};

Modified: mb_server/trunk/root/static/scripts/release_editor.js
===================================================================
--- mb_server/trunk/root/static/scripts/release_editor.js 2009-11-19 09:53:20 UTC (rev 12303)
+++ mb_server/trunk/root/static/scripts/release_editor.js 2009-11-20 15:18:30 UTC (rev 12304)
@@ -25,12 +25,13 @@
}
});

+ var mediumSorter, trackSorter, mediumImporter;
+
$(function() {
// Very simple overlays
$("#sidebar dd:not(.date) > :input")
.add($('li.release-label input.catalog-number'))
.add($('#release-name'))
- .add($('#mediums input.medium-name'))
.each(function() { spanOverlay($(this)); });

// Release disambiguation comment
@@ -59,7 +60,7 @@
$('#sidebar ul.release-labels span.label').each(overlayLabelLookup);

// Support moving tracks
- var trackSorter = new MB.Control.TableSorting({
+ trackSorter = new MB.Control.TableSorting({
dragComplete: function(row, oldTable) {
// Loop over each changed medium...
var mediums = row.parent('table');
@@ -79,97 +80,147 @@
dragHandle: 'td.position'
});

- trackSorter.addTables('table#mediums table.medium');
- trackSorter.activate();
+ trackSorter.addDragSource('table#mediums table.medium');
+ trackSorter.addDropTarget('table#mediums table.medium');

// Support moving mediums
- var mediumSorter = new MB.Control.TableSorting({
- dragHandle: 'tr.subh th.position',
+ mediumSorter = new MB.Control.TableSorting({
+ dragHandle: 'th.medium-position',
dragComplete: function(row, oldTable) {
- // Loop over each medium
- $('table#mediums table.medium').each(function(i) {
- i++;
- var posCell = $(this).find('th.position');
- posCell.find('input').val(i);
- posCell.find('span').text(i);
- });
+ reorderMediums();
}
});
- mediumSorter.addTables('table#mediums');
- mediumSorter.activate();
+ mediumSorter.addDropTarget('table#mediums');
+ mediumSorter.addDragSource('table#mediums');

// Editing artist credits
acEditor($('#release-artist div.artist-credit'));

- // Setup track rows
- $('table#mediums tbody tr.track').each(function() {
- setupTrackRow($(this));
+ // Editing mediums
+ $('table#mediums .medium').each(function() {
+ setupMedium($(this));
});

+ // Overlay Medium Format
+ $('select.medium-format').each(function() {
+ spanOverlay($(this));
+ });
+
+ // Creating new mediums
+ var newMedium = $(MB.html.button({}, MB.text.AddAnotherMedium))
+ .insertAfter('#mediums')
+ .click(function(ev) {
+ ev.preventDefault();
+ addNewMedium();
+ });
+
+ // Support for looking tracklistings
+ mediumImporter = new MB.Control.TableSorting({
+ doRemove: false,
+ dragHandle: 'table.medium th.name',
+ dragComplete: function(row) {
+ var medium = createMedium(0);
+ medium.find('tbody').replaceWith(row.find('tbody'));
+ row.empty().append(medium);
+ setupMedium(medium, true);
+ $('#lookup-tracklist-results').empty();
+ reorderMediums();
+ }
+ });
+ mediumImporter.addDropTarget('table#mediums');
+
+ var loading = $(MB.html.img({ src: '/static/images/loading-small.gif' })).hide();
+ $('#lookup-release')
+ .click(function(ev) {
+ ev.preventDefault();
+ loading.show();
+ $.get('/ajax/lookup_tracklist', {
+ release: $('#existing-release-name').val()
+ }, function(data) {
+ loading.hide();
+ $('#lookup-tracklist-results').replaceWith(data);
+ mediumImporter.addDragSource($('#lookup-tracklist-results'));
+ });
+ }).after(loading);
+ });
+
+ function reorderMediums() {
+ // Loop over each medium
+ $('table#mediums table.medium').each(function(i) {
+ i++;
+ var posCell = $(this).find('th.medium-position');
+ posCell.find('input').val(i);
+ posCell.find('span').text(i);
+ });
+ }
+
+ function setupMedium(mediumTable, locked) {
+ mediumSorter.rebind();
+
// Support for creating new tracks
- $('table#mediums .medium tbody').each(function(mediumNumber) {
- var table = $(this);
- var newRow = $(MB.html.tr());
+ var newRow = $(MB.html.tr());

- var createTrackRow = function(ev) {
- ev.preventDefault();
+ // Overlay the medium name
+ spanOverlay(mediumTable.find('input.medium-name'));
+
+ if(locked) { return; }
+
+ var createTrackRow = function(ev) {
+ ev.preventDefault();

- var pos = table.find('tr.track').length;
- var prefix = 'edit-release.mediums.' + mediumNumber
- + '.tracklist.tracks.' + pos + '.';
+ var pos = mediumTable.find('tr.track').length;
+ var prefix = mediumTable.attr('id') + '.tracklist.tracks.' + pos + '.';

- pos++; // We display tracks with '1' as the starting index
+ pos++; // We display tracks with '1' as the starting index

- var artistCredit = $('#release-artist .artist-credit').clone();
- artistCredit.attr('id', prefix + 'artist_credit');
- artistCredit.find('input').each(function() {
- var inp = $(this);
- inp.attr('name', inp.attr('name').replace('edit-release.', prefix));
- });
+ var artistCredit = $('#release-artist .artist-credit').clone();
+ artistCredit.attr('id', prefix + 'artist_credit');
+ artistCredit.find('input').each(function() {
+ var inp = $(this);
+ inp.attr('name', inp.attr('name').replace('edit-release.', prefix));
+ });

- var tr = $(MB.html.tr({ 'class': 'track' + (pos % 2 == 0 ? ' ev' : '') },
- MB.html.td({ 'class': 'position' },
- MB.html.input({
- 'class': 'pos',
- value: pos,
- name: prefix + 'position'
- })) +
- MB.html.td({},
- MB.html.input({
- 'class': 'track-name',
- name: prefix + 'name'
- })) +
- MB.html.td({},
- MB.html.div({
- 'class': 'artist-credit',
- id: prefix + 'artist_credit'
- }, artistCredit.html())) +
- MB.html.td({},
- MB.html.input({
- 'class': 'track-length',
- value: '?:??',
- name: prefix + 'length'
- }))
- ));
- table.append(tr);
- setupTrackRow(tr);
- trackSorter.activate();
- };
+ var tr = $(MB.html.tr({ 'class': 'track' + (pos % 2 == 0 ? ' ev' : '') },
+ MB.html.td({ 'class': 'position' },
+ MB.html.input({
+ 'class': 'pos',
+ value: pos,
+ name: prefix + 'position'
+ })) +
+ MB.html.td({},
+ MB.html.input({
+ 'class': 'track-name',
+ name: prefix + 'name'
+ })) +
+ MB.html.td({},
+ MB.html.div({
+ 'class': 'artist-credit',
+ id: prefix + 'artist_credit'
+ }, artistCredit.html())) +
+ MB.html.td({},
+ MB.html.input({
+ 'class': 'track-length',
+ value: '?:??',
+ name: prefix + 'length'
+ }))
+ ));
+ mediumTable.append(tr);
+ setupTrackRow(tr);
+ trackSorter.rebind();
+ };

- $(MB.html.td({ colspan: '4' }))
- .append(
- $(MB.html.button({}, MB.text.AddNewTrack))
- .click(createTrackRow))
- .appendTo(newRow);
- table.closest('table').find('tfoot').append(newRow);
- });
+ $(MB.html.td({ colspan: '4' }))
+ .append(
+ $(MB.html.button({}, MB.text.AddNewTrack))
+ .click(createTrackRow))
+ .appendTo(newRow);
+ mediumTable.find('tfoot').append(newRow);

- // Overlay Medium Format
- $('select.medium-format').each(function() {
- spanOverlay($(this));
- console.log(MB.utility.displayedValue($(this)));
+ // Setup track rows
+ mediumTable.find('tr.track').each(function() {
+ setupTrackRow($(this));
});
- });
+ }

function setupTrackRow(row) {
// Deleting tracks
@@ -218,4 +269,37 @@
var overlay = new MB.Control.Overlay(MB.html.span({}, text));
overlay.draw(field);
}
+
+ function addNewMedium()
+ {
+ var pos = $('#mediums .medium').length;
+ var medium = createMedium(pos);
+
+ // Make sure we can drag tracks in and out of this medium
+ trackSorter.addDragSource(medium);
+ trackSorter.addDropTarget(medium);
+
+ setupMedium(medium);
+ }
+
+ function createMedium(pos) {
+ var medium = $('#new-medium')
+ .clone()
+ .show()
+ .attr('id', 'edit-release.mediums.' + pos);
+
+ $('#mediums > tbody').append(
+ $(MB.html.tr()).append(
+ $(MB.html.td()).append(medium)));
+
+ // Set the position field
+ var posCell = medium.find('.medium-position');
+ posCell.find('span').html(pos + 1);
+ posCell.find('input').val(pos);
+
+ // Make sure we can sort it too
+ mediumSorter.rebind();
+
+ return medium;
+ }
})(jQuery);

Modified: mb_server/trunk/root/static/styles/release-editor.css
===================================================================
--- mb_server/trunk/root/static/styles/release-editor.css 2009-11-19 09:53:20 UTC (rev 12303)
+++ mb_server/trunk/root/static/styles/release-editor.css 2009-11-20 15:18:30 UTC (rev 12304)
@@ -105,3 +105,13 @@
float: right;
margin-top: 8pt;
}
+
+.position {
+ width: 1.5em;
+}
+.length {
+ width: 5em;
+}
+.title {
+ width: 60%;
+}
\ No newline at end of file

Modified: mb_server/trunk/root/tracklist/tracklist.tt
===================================================================
--- mb_server/trunk/root/tracklist/tracklist.tt 2009-11-19 09:53:20 UTC (rev 12303)
+++ mb_server/trunk/root/tracklist/tracklist.tt 2009-11-20 15:18:30 UTC (rev 12304)
@@ -6,7 +6,9 @@
[%- IF show_artists -%]
<td>[% artist_credit(track.artist_credit) %]</td>
[%- END -%]
+ [% UNLESS hide_rating %]
<td class="c">[% rating_stars(recording) %]</td>
+ [% END %]
<td>[% track.length | format_length %]</td>
</tr>
[%- END -%]

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

[Branch ~musicbrainz-developers/picard/trunk] Rev 1010: Reorder cluster/lookup/scan options to be slightly more intuitive

2009-11-19T11:40:24Z

------------------------------------------------------------
revno: 1010
committer: Philipp Wolfer <ph.wolfer@...>
branch nick: trunk
timestamp: Thu 2009-11-19 20:13:09 +0100
message:
Reorder cluster/lookup/scan options to be slightly more intuitive
modified:
picard/ui/mainwindow.py

--
lp:picard
https://code.launchpad.net/~musicbrainz-developers/picard/trunk

You are subscribed to branch lp:picard.
To unsubscribe from this branch go to https://code.launchpad.net/~musicbrainz-developers/picard/trunk/+edit-subscription.

=== modified file 'picard/ui/mainwindow.py'
--- picard/ui/mainwindow.py 2009-11-19 19:08:24 +0000
+++ picard/ui/mainwindow.py 2009-11-19 19:13:09 +0000
@@ -430,9 +430,9 @@
button.setPopupMode(QtGui.QToolButton.MenuButtonPopup)
button.setMenu(self.cd_lookup_menu)

+ toolbar.addAction(self.cluster_action)
toolbar.addAction(self.autotag_action)
toolbar.addAction(self.analyze_action)
- toolbar.addAction(self.cluster_action)
toolbar.addAction(self.edit_tags_action)
toolbar.addAction(self.remove_action)
self.search_toolbar = toolbar = self.addToolBar(_(u"&Search Bar"))

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

[Branch ~musicbrainz-developers/picard/trunk] Rev 1009: Set Windows version in bug report link depending on the actual system.

2009-11-19T11:40:24Z

------------------------------------------------------------
revno: 1009
committer: Philipp Wolfer <ph.wolfer@...>
branch nick: win32
timestamp: Thu 2009-11-19 20:08:24 +0100
message:
Set Windows version in bug report link depending on the actual system.
modified:
picard/ui/mainwindow.py

--
lp:picard
https://code.launchpad.net/~musicbrainz-developers/picard/trunk

You are subscribed to branch lp:picard.
To unsubscribe from this branch go to https://code.launchpad.net/~musicbrainz-developers/picard/trunk/+edit-subscription.

=== modified file 'picard/ui/mainwindow.py'
--- picard/ui/mainwindow.py 2009-10-26 21:11:05 +0000
+++ picard/ui/mainwindow.py 2009-11-19 19:08:24 +0000
@@ -558,7 +558,20 @@
if sys.platform == "linux2":
args.append("os=Linux")
elif sys.platform == "win32":
- args.append("os=Windows+XP")
+ import platform
+ release = platform.release()
+ if release in ("post2008Server", "7"):
+ args.append("os=Windows+7")
+ elif release in ("Vista", "2008Server"):
+ args.append("os=Windows+Vista")
+ elif release in ("XP", "2003Server"):
+ args.append("os=Windows+XP")
+ elif release in ("NT", "2000"):
+ args.append("os=Windows+NT%2F2000")
+ elif release in ("95", "98", "Me"):
+ args.append("os=Windows+95%2F98%2FMe")
+ else:
+ args.append("os=Windows+XP")
elif sys.platform == "darwin":
args.append("os=Mac+OS+X")
webbrowser2.open("http://bugs.musicbrainz.org/newticket?" + "&".join(args))

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

r12303 - in search_server/branches/ngs: index/src/main/java/org/musicbrainz/search/analysis index/src/test/java/org/musicbrainz/search/analysis index/src/test/java/org/musicbrainz/search/index servlet/src/main/java/org/musicbrainz/search/servlet

2009-11-19T01:53:21Z

Author: ijabz
Date: 2009-11-19 09:53:20 +0000 (Thu, 19 Nov 2009)
New Revision: 12303

Modified:
search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/analysis/AccentFilter.java
search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/analysis/StandardFilter.java
search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/analysis/StandardTokenizer.java
search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/analysis/StandardUnaccentAnalyzer.java
search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/analysis/AccentFilterTest.java
search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/analysis/AmpersandTest.java
search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/analysis/CompareNormalizationFiltersTest.java
search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/analysis/Issue1006Test.java
search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/analysis/Issue1446Test.java
search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/analysis/Issue3309Test.java
search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/analysis/Issue4775Test.java
search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/analysis/StopWordsTest.java
search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/AnnotationIndexTest.java
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/ArtistQueryParser.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/LabelQueryParser.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/ReleaseGroupQueryParser.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ReleaseQueryParser.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/WorkQueryParser.java
Log:
Modified code to use Version parameter introduce in some constructors in Lucene 2.9.1 and required to use non-deprecated code, which is in turn a prerequisite for using Lucene 3.0
Also fixed other Lucene deprecated code including a change to AccentFilter (that should improve performance a little)

Modified: search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/analysis/AccentFilter.java
===================================================================
--- search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/analysis/AccentFilter.java 2009-11-17 11:34:07 UTC (rev 12302)
+++ search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/analysis/AccentFilter.java 2009-11-19 09:53:20 UTC (rev 12303)
@@ -29,32 +29,39 @@
package org.musicbrainz.search.analysis;

import org.apache.lucene.analysis.*;
+import org.apache.lucene.analysis.tokenattributes.TermAttribute;
+import org.apache.lucene.analysis.tokenattributes.TypeAttribute;

+import java.io.IOException;
+
/**
* A filter that replaces accented characters by their unaccented equivalents.
*/
public class AccentFilter extends TokenFilter {
-
+
private char[] output = new char[256];
private int outputPos;

+ private TermAttribute termAttr;
+
public AccentFilter(TokenStream input) {
super(input);
+ termAttr = (TermAttribute) addAttribute(TermAttribute.class);
}

- @Override
- public final Token next(Token result) throws java.io.IOException {
- result = input.next(result);
- if (result != null) {
- final char[] buffer = result.termBuffer();
- final int length = result.termLength();
- if (removeAccents(buffer, length))
- result.setTermBuffer(output, 0, outputPos);
- return result;
+ @Override
+ public boolean incrementToken() throws IOException {
+ if (!input.incrementToken())
+ return false;
+
+ final char[] buffer = termAttr.termBuffer();
+ final int length = termAttr.termLength();
+ if (removeAccents(buffer, length)) {
+ termAttr.setTermBuffer(output, 0, outputPos);
}
- return null;
+ return true;
}
-
+
protected final boolean removeAccents(char[] input, int length) {
final int maxSizeNeeded = 2 * length;
int size = output.length;
@@ -65,7 +72,7 @@
outputPos = 0;

for (int i = 0; i < length; i++) {
- int c = (int)input[i];
+ int c = (int) input[i];

int block = UnaccentIndexes.indexes[c >> UnaccentData.BLOCK_SHIFT];
int position = c & UnaccentData.BLOCK_MASK;
@@ -73,19 +80,19 @@
short[] positions = UnaccentPositions.positions[block];
int unacPosition = positions[position];
int unacLength = positions[position + 1] - unacPosition;
-
+
if (unacLength > 0) {
// allocate a new char array, if necessary
if (size != output.length)
output = new char[size];
// copy front of the input
if (inputPos < i) {
- System.arraycopy(input, inputPos, output, outputPos, i - inputPos);
+ System.arraycopy(input, inputPos, output, outputPos, i - inputPos);
outputPos += i - inputPos;
}
// copy unaccented data
System.arraycopy(UnaccentData.data[block], unacPosition,
- output, outputPos, unacLength);
+ output, outputPos, unacLength);
outputPos += unacLength;
inputPos = i + 1;
}

Modified: search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/analysis/StandardFilter.java
===================================================================
--- search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/analysis/StandardFilter.java 2009-11-17 11:34:07 UTC (rev 12302)
+++ search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/analysis/StandardFilter.java 2009-11-19 09:53:20 UTC (rev 12303)
@@ -11,7 +11,7 @@
* Normalizes tokens extracted with {@link org.apache.lucene.analysis.standard.StandardTokenizer}.
* <p/>
* This is based on StandardFilter in that tokens identified as Acronyms have there dots removed but unlike StandardFilter
- * apostrophes are always removed and there is no epecial rule for words ending in 's .
+ * apostrophes are always removed and there is no special rule for words ending in 's .
* <p/>
* Whereas StandardFilter usually leaves apostrophes unless word ends with 's whereby the 's is removed.
*/

Modified: search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/analysis/StandardTokenizer.java
===================================================================
--- search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/analysis/StandardTokenizer.java 2009-11-17 11:34:07 UTC (rev 12302)
+++ search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/analysis/StandardTokenizer.java 2009-11-19 09:53:20 UTC (rev 12303)
@@ -29,6 +29,44 @@
* directory to your project and maintaining your own grammar-based tokenizer.
*/

+
+import java.io.IOException;
+import java.io.Reader;
+
+import org.apache.lucene.analysis.Token;
+import org.apache.lucene.analysis.Tokenizer;
+import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
+import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
+import org.apache.lucene.analysis.tokenattributes.TermAttribute;
+import org.apache.lucene.analysis.tokenattributes.TypeAttribute;
+import org.apache.lucene.util.AttributeSource;
+import org.apache.lucene.util.Version;
+
+/** A grammar-based tokenizer constructed with JFlex
+ *
+ * <p> This should be a good tokenizer for most European-language documents:
+ *
+ * <ul>
+ * <li>Splits words at punctuation characters, removing punctuation. However, a
+ * dot that's not followed by whitespace is considered part of a token.
+ * <li>Splits words at hyphens, unless there's a number in the token, in which case
+ * the whole token is interpreted as a product number and is not split.
+ * <li>Recognizes email addresses and internet hostnames as one token.
+ * </ul>
+ *
+ * <p>Many applications have specific tokenizer needs. If this tokenizer does
+ * not suit your application, please consider copying this source code
+ * directory to your project and maintaining your own grammar-based tokenizer.
+ *
+ * <a name="version"/>
+ * <p>You must specify the required {@link Version}
+ * compatibility when creating StandardAnalyzer:
+ * <ul>
+ * <li> As of 2.4, Tokens incorrectly identified as acronyms
+ * are corrected (see <a href="https://issues.apache.org/jira/browse/LUCENE-1068">LUCENE-1608</a>
+ * </ul>
+ */
+
public class StandardTokenizer extends Tokenizer {
/** A private instance of the JFlex-constructed scanner */
private final StandardTokenizerImpl scanner;
@@ -91,9 +129,12 @@
/**
* Creates a new instance of the {@link StandardTokenizer}. Attaches the
* <code>input</code> to a newly created JFlex scanner.
+ *
+ * @deprecated Use {@link #StandardTokenizer(Version,
+ * Reader)} instead
*/
public StandardTokenizer(Reader input) {
- this(input, false);
+ this(Version.LUCENE_24, input);
}

/**
@@ -104,6 +145,8 @@
* @param replaceInvalidAcronym Set to true to replace mischaracterized acronyms with HOST.
*
* See http://issues.apache.org/jira/browse/LUCENE-1068
+ *
+ * @deprecated Use {@link #StandardTokenizer(Version, Reader)} instead
*/
public StandardTokenizer(Reader input, boolean replaceInvalidAcronym) {
super();
@@ -112,7 +155,23 @@
}

/**
+ * Creates a new instance of the {@link org.apache.lucene.analysis.standard.StandardTokenizer}. Attaches
+ * the <code>input</code> to the newly created JFlex scanner.
+ *
+ * @param input The input reader
+ *
+ * See http://issues.apache.org/jira/browse/LUCENE-1068
+ */
+ public StandardTokenizer(Version matchVersion, Reader input) {
+ super();
+ this.scanner = new StandardTokenizerImpl(input);
+ init(input, matchVersion);
+ }
+
+ /**
* Creates a new StandardTokenizer with a given {@link AttributeSource}.
+ *
+ * @deprecated Use {@link #StandardTokenizer(Version, AttributeSource, Reader)} instead
*/
public StandardTokenizer(AttributeSource source, Reader input, boolean replaceInvalidAcronym) {
super(source);
@@ -121,7 +180,18 @@
}

/**
+ * Creates a new StandardTokenizer with a given {@link AttributeSource}.
+ */
+ public StandardTokenizer(Version matchVersion, AttributeSource source, Reader input) {
+ super(source);
+ this.scanner = new StandardTokenizerImpl(input);
+ init(input, matchVersion);
+ }
+
+ /**
* Creates a new StandardTokenizer with a given {@link org.apache.lucene.util.AttributeSource.AttributeFactory}
+ *
+ * @deprecated Use {@link #StandardTokenizer(Version, org.apache.lucene.util.AttributeSource.AttributeFactory, Reader)} instead
*/
public StandardTokenizer(AttributeFactory factory, Reader input, boolean replaceInvalidAcronym) {
super(factory);
@@ -129,6 +199,15 @@
init(input, replaceInvalidAcronym);
}

+ /**
+ * Creates a new StandardTokenizer with a given {@link org.apache.lucene.util.AttributeSource.AttributeFactory}
+ */
+ public StandardTokenizer(Version matchVersion, AttributeFactory factory, Reader input) {
+ super(factory);
+ this.scanner = new StandardTokenizerImpl(input);
+ init(input, matchVersion);
+ }
+
private void init(Reader input, boolean replaceInvalidAcronym) {
this.replaceInvalidAcronym = replaceInvalidAcronym;
this.input = input;
@@ -138,6 +217,14 @@
typeAtt = (TypeAttribute) addAttribute(TypeAttribute.class);
}

+ private void init(Reader input, Version matchVersion) {
+ if (matchVersion.onOrAfter(Version.LUCENE_24)) {
+ init(input, true);
+ } else {
+ init(input, false);
+ }
+ }
+
// this tokenizer generates three attributes:
// offset, positionIncrement and type
private TermAttribute termAtt;
@@ -242,3 +329,4 @@
this.replaceInvalidAcronym = replaceInvalidAcronym;
}
}
+

Modified: search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/analysis/StandardUnaccentAnalyzer.java
===================================================================
--- search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/analysis/StandardUnaccentAnalyzer.java 2009-11-17 11:34:07 UTC (rev 12302)
+++ search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/analysis/StandardUnaccentAnalyzer.java 2009-11-19 09:53:20 UTC (rev 12303)
@@ -39,6 +39,7 @@
import java.io.Reader;

import com.ibm.icu.text.Transliterator;
+import org.apache.lucene.util.Version;

/**
* Filters StandardTokenizer with StandardFilter, ICUTransformFilter, AccentFilter, LowerCaseFilter
@@ -59,7 +60,7 @@

public TokenStream tokenStream(String fieldName, Reader reader) {
CharFilter mappingCharFilter = new MappingCharFilter(charConvertMap,reader);
- StandardTokenizer tokenStream = new StandardTokenizer(mappingCharFilter);
+ StandardTokenizer tokenStream = new StandardTokenizer(Version.LUCENE_CURRENT,mappingCharFilter);
TokenStream result = new ICUTransformFilter(tokenStream, Transliterator.getInstance("[ー[:Script=Katakana:]]Katakana-Hiragana"));
result = new StandardFilter(result);
result = new AccentFilter(result);
@@ -77,7 +78,7 @@
if (streams == null) {
streams = new SavedStreams();
setPreviousTokenStream(streams);
- streams.tokenStream = new StandardTokenizer(new MappingCharFilter(charConvertMap,reader));
+ streams.tokenStream = new StandardTokenizer(Version.LUCENE_CURRENT,new MappingCharFilter(charConvertMap,reader));
streams.filteredTokenStream = new ICUTransformFilter(streams.tokenStream, Transliterator.getInstance("[ー[:Script=Katakana:]]Katakana-Hiragana"));
streams.filteredTokenStream = new StandardFilter(streams.filteredTokenStream);
streams.filteredTokenStream = new AccentFilter(streams.filteredTokenStream);

Modified: search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/analysis/AccentFilterTest.java
===================================================================
--- search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/analysis/AccentFilterTest.java 2009-11-17 11:34:07 UTC (rev 12302)
+++ search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/analysis/AccentFilterTest.java 2009-11-19 09:53:20 UTC (rev 12303)
@@ -7,6 +7,7 @@
import org.apache.lucene.search.*;
import org.apache.lucene.document.*;
import org.apache.lucene.queryParser.*;
+import org.apache.lucene.util.Version;

public class AccentFilterTest extends TestCase {

@@ -54,7 +55,7 @@

public void testSearchUnaccented() throws Exception {
IndexSearcher searcher = new IndexSearcher(dir,true);
- Query q = new QueryParser("name", analyzer).parse("test");
+ Query q = new QueryParser(Version.LUCENE_CURRENT,"name", analyzer).parse("test");
TopDocs docs = searcher.search(q,10);
assertEquals(2, docs.totalHits);
ScoreDoc scoredocs[] = docs.scoreDocs;
@@ -64,7 +65,7 @@

public void testSearchAccented() throws Exception {
IndexSearcher searcher = new IndexSearcher(dir,true);
- Query q = new QueryParser("name", analyzer).parse("tést");
+ Query q = new QueryParser(Version.LUCENE_CURRENT,"name", analyzer).parse("tést");
TopDocs docs = searcher.search(q,10);
assertEquals(2, docs.totalHits);
ScoreDoc scoredocs[] = docs.scoreDocs;
@@ -74,7 +75,7 @@

public void testSearchAccented2() throws Exception {
IndexSearcher searcher = new IndexSearcher(dir,true);
- Query q = new QueryParser("name", analyzer).parse("abcaef");
+ Query q = new QueryParser(Version.LUCENE_CURRENT,"name", analyzer).parse("abcaef");
TopDocs docs = searcher.search(q,10);
ScoreDoc scoredocs[] = docs.scoreDocs;
assertEquals(1, docs.totalHits);
@@ -105,7 +106,7 @@
*/
public void testSearchQe() throws Exception {
IndexSearcher searcher = new IndexSearcher(dir,true);
- Query q = new QueryParser("name", analyzer).parse("qwe");
+ Query q = new QueryParser(Version.LUCENE_CURRENT,"name", analyzer).parse("qwe");
TopDocs docs = searcher.search(q,10);
ScoreDoc scoredocs[] = docs.scoreDocs;
assertEquals(1, docs.totalHits);
@@ -116,7 +117,7 @@

public void testSearchQe2() throws Exception {
IndexSearcher searcher = new IndexSearcher(dir,true);
- Query q = new QueryParser("name", analyzer).parse("qwee");
+ Query q = new QueryParser(Version.LUCENE_CURRENT,"name", analyzer).parse("qwee");
TopDocs docs = searcher.search(q,10);
ScoreDoc scoredocs[] = docs.scoreDocs;
assertEquals(1, docs.totalHits);

Modified: search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/analysis/AmpersandTest.java
===================================================================
--- search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/analysis/AmpersandTest.java 2009-11-17 11:34:07 UTC (rev 12302)
+++ search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/analysis/AmpersandTest.java 2009-11-19 09:53:20 UTC (rev 12303)
@@ -4,6 +4,9 @@
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.Token;
import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
+import org.apache.lucene.analysis.tokenattributes.TermAttribute;
+import org.apache.lucene.analysis.tokenattributes.TypeAttribute;
import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.document.Document;
@@ -11,28 +14,31 @@
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
import org.apache.lucene.queryParser.QueryParser;
+import org.apache.lucene.util.Version;

import java.io.StringReader;

public class AmpersandTest extends TestCase {

- /** Show tokenizer on its own removes ampersands */
+ /**
+ * Show tokenizer on its own removes ampersands
+ */
public void testAmpersandTokenizing() throws Exception {
- {
- Tokenizer tokenizer = new StandardTokenizer(new StringReader("Platinum & Gold"));
- Token t;
- int count=0;
- while((t =tokenizer.next())!=null)
- {
- //System.out.println(t.toString());
- count++;
- }
- assertEquals(2,count);
+
+ int count = 0;
+
+ Tokenizer tokenizer = new StandardTokenizer(Version.LUCENE_CURRENT,new StringReader("Platinum & Gold"));
+ while (tokenizer.incrementToken()) {
+ count++;
}
+ assertEquals(2, count);
+
}

- /** Test filter is being used for indexing and searching , and can search either way*/
+ /**
+ * Test filter is being used for indexing and searching , and can search either way
+ */
public void testAmpersandSearching() throws Exception {

Analyzer analyzer = new StandardUnaccentAnalyzer();
@@ -40,23 +46,23 @@
IndexWriter writer = new IndexWriter(dir, analyzer, true, IndexWriter.MaxFieldLength.LIMITED);
{
Document doc = new Document();
- doc.add(new Field("name","Platinum & Gold", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(new Field("name", "Platinum & Gold", Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(doc);
}
writer.close();

- IndexSearcher searcher = new IndexSearcher(dir,true);
+ IndexSearcher searcher = new IndexSearcher(dir, true);
{
- Query q = new QueryParser("name", analyzer).parse("\"Platinum & Gold\"");
+ Query q = new QueryParser(Version.LUCENE_CURRENT, "name", analyzer).parse("\"Platinum & Gold\"");
System.out.println(q);
- assertEquals(1, searcher.search(q,10).totalHits);
+ assertEquals(1, searcher.search(q, 10).totalHits);
}

{
- Query q = new QueryParser("name", analyzer).parse("\"Platinum and Gold\"");
+ Query q = new QueryParser(Version.LUCENE_CURRENT, "name", analyzer).parse("\"Platinum and Gold\"");
System.out.println(q);
- assertEquals(1, searcher.search(q,10).totalHits);
+ assertEquals(1, searcher.search(q, 10).totalHits);
}
}
}

Modified: search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/analysis/CompareNormalizationFiltersTest.java
===================================================================
--- search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/analysis/CompareNormalizationFiltersTest.java 2009-11-17 11:34:07 UTC (rev 12302)
+++ search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/analysis/CompareNormalizationFiltersTest.java 2009-11-19 09:53:20 UTC (rev 12303)
@@ -7,6 +7,8 @@
import java.io.IOException;

import com.ibm.icu.text.Normalizer;
+import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
+import org.apache.lucene.analysis.tokenattributes.TermAttribute;

/**
* Compare FIlters
@@ -50,33 +52,41 @@

System.out.println("Chars that are changed by one filter different to other filter");
System.out.println("input:existingfilter:newfilter");
- while((t0=tokenizer0.next())!=null)
+
+ TermAttribute term = (TermAttribute)tokenizer0.addAttribute(TermAttribute.class);
+ TermAttribute term1 = (TermAttribute)result1.addAttribute(TermAttribute.class);
+ TermAttribute term2 = (TermAttribute)result2.addAttribute(TermAttribute.class);
+ TermAttribute term3 = (TermAttribute)result3.addAttribute(TermAttribute.class);
+ TermAttribute term4 = (TermAttribute)result4.addAttribute(TermAttribute.class);
+
+ while(tokenizer0.incrementToken())
{
- t =result1.next();
- t2=result2.next();
- t3=result3.next();
- t4=result4.next();
+ result1.incrementToken();
+ result2.incrementToken();
+ result3.incrementToken();
+ result4.incrementToken();

- if(!t0.term().equals(t.term()))
+
+ if(!term1.term().equals(term.term()))
{
changedByAccent ++;
}
- if(!t2.term().equals(t.term()))
- {
+ if(!term2.term().equals(term.term()))
+ {
changedByASCII ++;
}
- if(!t3.term().equals(t.term()))
- {
+ if(!term3.term().equals(term.term()))
+ {
changedByNFKC ++;
}
- if(!t4.term().equals(t.term()))
- {
+ if(!term4.term().equals(term.term()))
+ {
changedByASCIIAndNFKC ++;
}
if(
- (!t0.term().equals(t2.term()))
+ (!term.term().equals(term2.term()))
&&
- (t0.term().equals(t.term()))
+ (term.term().equals(term4.term()))
)

Modified: search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/analysis/Issue1006Test.java
===================================================================
--- search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/analysis/Issue1006Test.java 2009-11-17 11:34:07 UTC (rev 12302)
+++ search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/analysis/Issue1006Test.java 2009-11-19 09:53:20 UTC (rev 12303)
@@ -1,5 +1,8 @@
package org.musicbrainz.search.analysis;

+import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
+import org.apache.lucene.analysis.tokenattributes.TermAttribute;
+import org.apache.lucene.analysis.tokenattributes.TypeAttribute;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.queryParser.QueryParser;
@@ -14,90 +17,135 @@

import junit.framework.TestCase;
import com.ibm.icu.text.Transliterator;
+import org.apache.lucene.util.Version;

import java.io.StringReader;

public class Issue1006Test extends TestCase {

- /** Tests word is preserved and identified as alpahnumeric
+ /**
+ * Tests word is preserved and identified as alpahnumeric
*
* @throws Exception
*/
public void testKatakanaHiraganaTokenizer() throws Exception {

{
- Tokenizer tokenizer = new StandardTokenizer(new StringReader("ゲーム"));
- Token t;
- while((t =tokenizer.next())!=null)
- {
- //System.out.println(t.toString());
- assertEquals("(ゲーム,0,3,type=<ALPHANUM>)",t.toString());
+ Tokenizer tokenizer = new StandardTokenizer(Version.LUCENE_CURRENT,new StringReader("ゲーム"));
+ TermAttribute term = (TermAttribute) tokenizer.addAttribute(TermAttribute.class);
+ TypeAttribute type = (TypeAttribute) tokenizer.addAttribute(TypeAttribute.class);
+ OffsetAttribute offset = (OffsetAttribute) tokenizer.addAttribute(OffsetAttribute.class);
+ while (tokenizer.incrementToken()) {
+ assertEquals("<ALPHANUM>", type.type());
+ assertEquals("ゲーム", term.term());
+ assertEquals(0, offset.startOffset());
+ assertEquals(3, offset.endOffset());
+
+
}
}

{
- Tokenizer tokenizer = new StandardTokenizer(new StringReader("ゲエム"));
- Token t;
- while((t =tokenizer.next())!=null)
- {
- //System.out.println(t.toString());
- assertEquals("(ゲエム,0,3,type=<ALPHANUM>)",t.toString());
+ Tokenizer tokenizer = new StandardTokenizer(Version.LUCENE_CURRENT,new StringReader("ゲエム"));
+ TermAttribute term = (TermAttribute) tokenizer.addAttribute(TermAttribute.class);
+ TypeAttribute type = (TypeAttribute) tokenizer.addAttribute(TypeAttribute.class);
+ OffsetAttribute offset = (OffsetAttribute) tokenizer.addAttribute(OffsetAttribute.class);
+
+ while (tokenizer.incrementToken()) {
+
+
+ assertEquals("<ALPHANUM>", type.type());
+ assertEquals("ゲエム", term.term());
+ assertEquals(0, offset.startOffset());
+ assertEquals(3, offset.endOffset());
+
}
}

{
- Tokenizer tokenizer = new StandardTokenizer(new StringReader("げえむ"));
- Token t;
- while((t =tokenizer.next())!=null)
- {
- //System.out.println(t.toString());
- assertEquals("(げえむ,0,3,type=<ALPHANUM>)",t.toString());
+ Tokenizer tokenizer = new StandardTokenizer(Version.LUCENE_CURRENT,new StringReader("げえむ"));
+ TermAttribute term = (TermAttribute) tokenizer.addAttribute(TermAttribute.class);
+ TypeAttribute type = (TypeAttribute) tokenizer.addAttribute(TypeAttribute.class);
+ OffsetAttribute offset = (OffsetAttribute) tokenizer.addAttribute(OffsetAttribute.class);
+
+ while (tokenizer.incrementToken()) {
+
+ assertEquals("<ALPHANUM>", type.type());
+ assertEquals("げえむ", term.term());
+ assertEquals(0, offset.startOffset());
+ assertEquals(3, offset.endOffset());
}
}
}

- /** Test ICU Transformer converts as expected
+ /**
+ * Test ICU Transformer converts as expected
*
* @throws Exception
*/
public void testKatakanaHiraganaEquivalenceFilter() throws Exception {

{
- Tokenizer tokenizer = new StandardTokenizer(new StringReader("ゲーム"));
+
+ Tokenizer tokenizer = new StandardTokenizer(Version.LUCENE_CURRENT,new StringReader("ゲーム"));
TokenStream result = new ICUTransformFilter(tokenizer, Transliterator.getInstance("[ー[:Script=Katakana:]]Katakana-Hiragana"));
- Token t;
- while((t =result.next())!=null)
- {
- //System.out.println(t.toString());
- assertEquals("(げえむ,0,3,type=<ALPHANUM>)",t.toString());
+
+ TermAttribute term = (TermAttribute) result.addAttribute(TermAttribute.class);
+ TypeAttribute type = (TypeAttribute) result.addAttribute(TypeAttribute.class);
+ OffsetAttribute offset = (OffsetAttribute) result.addAttribute(OffsetAttribute.class);
+
+ while (result.incrementToken()) {
+
+ assertEquals("<ALPHANUM>", type.type());
+ assertEquals("げえむ", term.term());
+ assertEquals(0, offset.startOffset());
+ assertEquals(3, offset.endOffset());
}
}

{
- Tokenizer tokenizer = new StandardTokenizer(new StringReader("ゲエム"));
+
+ Tokenizer tokenizer = new StandardTokenizer(Version.LUCENE_CURRENT,new StringReader("ゲエム"));
TokenStream result = new ICUTransformFilter(tokenizer, Transliterator.getInstance("[ー[:Script=Katakana:]]Katakana-Hiragana"));
- Token t;
- while((t =result.next())!=null)
- {
- //System.out.println(t.toString());
- assertEquals("(げえむ,0,3,type=<ALPHANUM>)",t.toString());
+
+ TermAttribute term = (TermAttribute) result.addAttribute(TermAttribute.class);
+ TypeAttribute type = (TypeAttribute) result.addAttribute(TypeAttribute.class);
+ OffsetAttribute offset = (OffsetAttribute) result.addAttribute(OffsetAttribute.class);
+
+ while (result.incrementToken()) {
+
+ assertEquals("<ALPHANUM>", type.type());
+ assertEquals("げえむ", term.term());
+ assertEquals(0, offset.startOffset());
+ assertEquals(3, offset.endOffset());
}
}

{
- Tokenizer tokenizer = new StandardTokenizer(new StringReader("げえむ"));
+
+ Tokenizer tokenizer = new StandardTokenizer(Version.LUCENE_CURRENT,new StringReader("げえむ"));
TokenStream result = new ICUTransformFilter(tokenizer, Transliterator.getInstance("[ー[:Script=Katakana:]]Katakana-Hiragana"));
- Token t;
- while((t =result.next())!=null)
- {
- //System.out.println(t.toString());
- assertEquals("(げえむ,0,3,type=<ALPHANUM>)",t.toString());
+
+ TermAttribute term = (TermAttribute) result.addAttribute(TermAttribute.class);
+ TypeAttribute type = (TypeAttribute) result.addAttribute(TypeAttribute.class);
+ OffsetAttribute offset = (OffsetAttribute) result.addAttribute(OffsetAttribute.class);
+
+ while (result.incrementToken()) {
+
+ assertEquals("<ALPHANUM>", type.type());
+ assertEquals("げえむ", term.term());
+ assertEquals(0, offset.startOffset());
+ assertEquals(3, offset.endOffset());
}
}
+
+
}

- /** Test filter is being used for indexing and searching */
+ /**
+ * Test filter is being used for indexing and searching
+ */
public void testKatakanaHiraganaEquivalence() throws Exception {

Analyzer analyzer = new StandardUnaccentAnalyzer();
@@ -121,24 +169,23 @@
writer.close();

-
- IndexSearcher searcher = new IndexSearcher(dir,true);
+ IndexSearcher searcher = new IndexSearcher(dir, true);
{
- Query q = new QueryParser("name", analyzer).parse("ゲーム");
+ Query q = new QueryParser(Version.LUCENE_CURRENT, "name", analyzer).parse("ゲーム");
//System.out.println(q);
- assertEquals(3, searcher.search(q,10).totalHits);
+ assertEquals(3, searcher.search(q, 10).totalHits);
}

{
- Query q = new QueryParser("name", analyzer).parse("ゲエム");
+ Query q = new QueryParser(Version.LUCENE_CURRENT, "name", analyzer).parse("ゲエム");
//System.out.println(q);
- assertEquals(3, searcher.search(q,10).totalHits);
+ assertEquals(3, searcher.search(q, 10).totalHits);
}

{
- Query q = new QueryParser("name", analyzer).parse("げえむ");
+ Query q = new QueryParser(Version.LUCENE_CURRENT, "name", analyzer).parse("げえむ");
//System.out.println(q);
- assertEquals(3, searcher.search(q,10).totalHits);
+ assertEquals(3, searcher.search(q, 10).totalHits);
}

}

Modified: search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/analysis/Issue1446Test.java
===================================================================
--- search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/analysis/Issue1446Test.java 2009-11-17 11:34:07 UTC (rev 12302)
+++ search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/analysis/Issue1446Test.java 2009-11-19 09:53:20 UTC (rev 12303)
@@ -11,6 +11,7 @@
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.queryParser.QueryParser;
import junit.framework.TestCase;
+import org.apache.lucene.util.Version;

public class Issue1446Test extends TestCase {

@@ -31,7 +32,7 @@
writer.close();

IndexSearcher searcher = new IndexSearcher(dir,true);
- Query q = new QueryParser("name", analyzer).parse("ア");
+ Query q = new QueryParser(Version.LUCENE_CURRENT,"name", analyzer).parse("ア");
TopDocs docs = searcher.search(q,10);
ScoreDoc scoredocs[] = docs.scoreDocs;
assertEquals(1, docs.totalHits);
@@ -49,7 +50,7 @@
writer.close();

IndexSearcher searcher = new IndexSearcher(dir,true);
- Query q = new QueryParser("name", analyzer).parse("ョ");
+ Query q = new QueryParser(Version.LUCENE_CURRENT,"name", analyzer).parse("ョ");
TopDocs docs = searcher.search(q,10);
ScoreDoc scoredocs[] = docs.scoreDocs;
assertEquals(1, docs.totalHits);
@@ -66,7 +67,7 @@
writer.close();

IndexSearcher searcher = new IndexSearcher(dir,true);
- Query q = new QueryParser("name", analyzer).parse("え");
+ Query q = new QueryParser(Version.LUCENE_CURRENT,"name", analyzer).parse("え");
TopDocs docs = searcher.search(q,10);
ScoreDoc scoredocs[] = docs.scoreDocs;
assertEquals(1, docs.totalHits);
@@ -84,7 +85,7 @@
writer.close();

IndexSearcher searcher = new IndexSearcher(dir,true);
- Query q = new QueryParser("name", analyzer).parse("っ");
+ Query q = new QueryParser(Version.LUCENE_CURRENT,"name", analyzer).parse("っ");
TopDocs docs = searcher.search(q,10);
ScoreDoc scoredocs[] = docs.scoreDocs;
assertEquals(1, docs.totalHits);

Modified: search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/analysis/Issue3309Test.java
===================================================================
--- search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/analysis/Issue3309Test.java 2009-11-17 11:34:07 UTC (rev 12302)
+++ search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/analysis/Issue3309Test.java 2009-11-19 09:53:20 UTC (rev 12303)
@@ -1,22 +1,18 @@
package org.musicbrainz.search.analysis;

+import junit.framework.TestCase;
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.Token;
-import org.apache.lucene.store.RAMDirectory;
-import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
-import org.apache.lucene.search.Hits;
import org.apache.lucene.search.TopDocs;
-import org.apache.lucene.queryParser.QueryParser;
-import junit.framework.TestCase;
+import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.util.Version;

-import java.io.StringReader;

-
public class Issue3309Test extends TestCase {

public void testMatchAcronymnsWithoutTrailingDot() throws Exception {
@@ -30,7 +26,7 @@
writer.close();

IndexSearcher searcher = new IndexSearcher(dir,true);
- Query q = new QueryParser("name", analyzer).parse("R.E.S");
+ Query q = new QueryParser(Version.LUCENE_CURRENT,"name", analyzer).parse("R.E.S");
TopDocs docs = searcher.search(q,10);
assertEquals(1, docs.totalHits);
}
@@ -46,7 +42,7 @@
writer.close();

IndexSearcher searcher = new IndexSearcher(dir,true);
- Query q = new QueryParser("name", analyzer).parse("R.E.S.");
+ Query q = new QueryParser(Version.LUCENE_CURRENT,"name", analyzer).parse("R.E.S.");
TopDocs docs = searcher.search(q,10);
assertEquals(1, docs.totalHits);
}

Modified: search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/analysis/Issue4775Test.java
===================================================================
--- search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/analysis/Issue4775Test.java 2009-11-17 11:34:07 UTC (rev 12302)
+++ search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/analysis/Issue4775Test.java 2009-11-19 09:53:20 UTC (rev 12303)
@@ -1,15 +1,15 @@
package org.musicbrainz.search.analysis;

import junit.framework.TestCase;
-import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
-import org.apache.lucene.search.Hits;
-import org.apache.lucene.queryParser.QueryParser;
+import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.util.Version;

public class Issue4775Test extends TestCase {
@@ -29,27 +29,27 @@

IndexSearcher searcher = new IndexSearcher(dir,true);
{
- Query q = new QueryParser("name", analyzer).parse("Oreilly");
+ Query q = new QueryParser(Version.LUCENE_CURRENT,"name", analyzer).parse("Oreilly");
assertEquals(1, searcher.search(q,10).totalHits);
}

{
- Query q = new QueryParser("name", analyzer).parse("Theres");
+ Query q = new QueryParser(Version.LUCENE_CURRENT,"name", analyzer).parse("Theres");
assertEquals(1, searcher.search(q,10).totalHits);
}

{
- Query q = new QueryParser("name", analyzer).parse("there's");
+ Query q = new QueryParser(Version.LUCENE_CURRENT,"name", analyzer).parse("there's");
assertEquals(1, searcher.search(q,10).totalHits);
}

{
- Query q = new QueryParser("name", analyzer).parse("There");
+ Query q = new QueryParser(Version.LUCENE_CURRENT,"name", analyzer).parse("There");
assertEquals(0, searcher.search(q,10).totalHits);
}

{
- Query q = new QueryParser("name", analyzer).parse("it's'");
+ Query q = new QueryParser(Version.LUCENE_CURRENT,"name", analyzer).parse("it's'");
assertEquals(1, searcher.search(q,10).totalHits);
}
}
@@ -70,17 +70,17 @@

IndexSearcher searcher = new IndexSearcher(dir,true);
{
- Query q = new QueryParser("name", analyzer).parse("res");
+ Query q = new QueryParser(Version.LUCENE_CURRENT,"name", analyzer).parse("res");
assertEquals(1, searcher.search(q,10).totalHits);
}

{
- Query q = new QueryParser("name", analyzer).parse("R.E.S.");
+ Query q = new QueryParser(Version.LUCENE_CURRENT,"name", analyzer).parse("R.E.S.");
assertEquals(1, searcher.search(q,10).totalHits);
}

{
- Query q = new QueryParser("name", analyzer).parse("R.E.S");
+ Query q = new QueryParser(Version.LUCENE_CURRENT,"name", analyzer).parse("R.E.S");
assertEquals(1, searcher.search(q,10).totalHits);
}

Modified: search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/analysis/StopWordsTest.java
===================================================================
--- search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/analysis/StopWordsTest.java 2009-11-17 11:34:07 UTC (rev 12302)
+++ search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/analysis/StopWordsTest.java 2009-11-19 09:53:20 UTC (rev 12303)
@@ -3,14 +3,15 @@
import junit.framework.TestCase;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.store.RAMDirectory;
-import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
-import org.apache.lucene.search.Hits;
-import org.apache.lucene.queryParser.QueryParser;
+import org.apache.lucene.search.TopDocs;
+import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.util.Version;

import java.util.HashSet;

@@ -27,35 +28,35 @@

public void testUnableToFindStopWordsWithStandardAnalyser() throws Exception {

- Analyzer analyzer = new StandardAnalyzer();
+ Analyzer analyzer = new StandardAnalyzer(Version.LUCENE_CURRENT);
RAMDirectory dir = new RAMDirectory();
IndexWriter writer = new IndexWriter(dir, analyzer, true, IndexWriter.MaxFieldLength.LIMITED);
Document doc = new Document();
- doc.add(new Field("name", "that", Field.Store.YES, Field.Index.TOKENIZED));
+ doc.add(new Field("name", "that", Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(doc);
writer.close();

- IndexSearcher searcher = new IndexSearcher(dir);
- Query q = new QueryParser("name", analyzer).parse("that");
- Hits hits = searcher.search(q);
- assertEquals(0, hits.length());
+ IndexSearcher searcher = new IndexSearcher(dir,true);
+ Query q = new QueryParser(Version.LUCENE_CURRENT,"name", analyzer).parse("that");
+ TopDocs docs = searcher.search(q,null,100);
+ assertEquals(0, docs.totalHits);

}

public void testAbleToFindStopWordsWithStandardAnalyserIfNoStopWords() throws Exception {

- Analyzer analyzer = new StandardAnalyzer(new HashSet());
+ Analyzer analyzer = new StandardAnalyzer(Version.LUCENE_CURRENT,new HashSet());
RAMDirectory dir = new RAMDirectory();
IndexWriter writer = new IndexWriter(dir, analyzer, true, IndexWriter.MaxFieldLength.LIMITED);
Document doc = new Document();
- doc.add(new Field("name", "that", Field.Store.YES, Field.Index.TOKENIZED));
+ doc.add(new Field("name", "that", Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(doc);
writer.close();

- IndexSearcher searcher = new IndexSearcher(dir);
- Query q = new QueryParser("name", analyzer).parse("that");
- Hits hits = searcher.search(q);
- assertEquals(1, hits.length());
+ IndexSearcher searcher = new IndexSearcher(dir,true);
+ Query q = new QueryParser(Version.LUCENE_CURRENT,"name", analyzer).parse("that");
+ TopDocs docs = searcher.search(q,null,100);
+ assertEquals(1, docs.totalHits);
}

public void testAbleToFindStopWords() throws Exception {
@@ -64,14 +65,14 @@
RAMDirectory dir = new RAMDirectory();
IndexWriter writer = new IndexWriter(dir, analyzer, true, IndexWriter.MaxFieldLength.LIMITED);
Document doc = new Document();
- doc.add(new Field("name", "that", Field.Store.YES, Field.Index.TOKENIZED));
+ doc.add(new Field("name", "that", Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(doc);
writer.close();

- IndexSearcher searcher = new IndexSearcher(dir);
- Query q = new QueryParser("name", analyzer).parse("that");
- Hits hits = searcher.search(q);
- assertEquals(1, hits.length());
+ IndexSearcher searcher = new IndexSearcher(dir,true);
+ Query q = new QueryParser(Version.LUCENE_CURRENT,"name", analyzer).parse("that");
+ TopDocs docs = searcher.search(q,null,100);
+ assertEquals(1, docs.totalHits);

}
}

Modified: search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/AnnotationIndexTest.java
===================================================================
--- search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/AnnotationIndexTest.java 2009-11-17 11:34:07 UTC (rev 12302)
+++ search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/AnnotationIndexTest.java 2009-11-19 09:53:20 UTC (rev 12303)
@@ -161,7 +161,6 @@
addAnnotationOne();
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
-
IndexReader ir = IndexReader.open(ramDir, true);
assertEquals(1, ir.numDocs());
{

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-17 11:34:07 UTC (rev 12302)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/AnnotationSearch.java 2009-11-19 09:53:20 UTC (rev 12303)
@@ -2,6 +2,7 @@

import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.queryParser.QueryParser;
+import org.apache.lucene.util.Version;
import org.musicbrainz.search.index.AnnotationIndexField;
import org.musicbrainz.search.analysis.PerFieldEntityAnalyzer;

@@ -34,7 +35,7 @@

@Override
protected QueryParser getParser() {
- return new QueryParser(defaultFields.get(0), analyzer);
+ return new QueryParser(Version.LUCENE_CURRENT,defaultFields.get(0), analyzer);
}

Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ArtistQueryParser.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ArtistQueryParser.java 2009-11-17 11:34:07 UTC (rev 12302)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ArtistQueryParser.java 2009-11-19 09:53:20 UTC (rev 12303)
@@ -4,6 +4,7 @@
import org.apache.lucene.queryParser.MultiFieldQueryParser;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.util.Version;
import org.musicbrainz.search.index.ArtistIndexField;
import org.musicbrainz.search.index.ArtistType;

@@ -15,7 +16,7 @@
public class ArtistQueryParser extends MultiFieldQueryParser {

public ArtistQueryParser(java.lang.String[] strings, org.apache.lucene.analysis.Analyzer analyzer) {
- super(strings, analyzer);
+ super(Version.LUCENE_CURRENT,strings, analyzer);
}

protected Query newTermQuery(Term term) {

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-17 11:34:07 UTC (rev 12302)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/CDStubSearch.java 2009-11-19 09:53:20 UTC (rev 12303)
@@ -3,6 +3,7 @@
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.queryParser.MultiFieldQueryParser;
+import org.apache.lucene.util.Version;
import org.musicbrainz.search.index.CDStubIndexField;
import org.musicbrainz.search.analysis.PerFieldEntityAnalyzer;

@@ -35,7 +36,7 @@

@Override
protected QueryParser getParser() {
- return new MultiFieldQueryParser(defaultFields.toArray(new String[0]), analyzer);
+ return new MultiFieldQueryParser(Version.LUCENE_CURRENT,defaultFields.toArray(new String[0]), analyzer);
}

}

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-17 11:34:07 UTC (rev 12302)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/FreeDBSearch.java 2009-11-19 09:53:20 UTC (rev 12303)
@@ -3,6 +3,7 @@
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.queryParser.MultiFieldQueryParser;
+import org.apache.lucene.util.Version;
import org.musicbrainz.search.index.FreeDBIndexField;
import org.musicbrainz.search.analysis.PerFieldEntityAnalyzer;

@@ -36,6 +37,6 @@

@Override
protected QueryParser getParser() {
- return new MultiFieldQueryParser(defaultFields.toArray(new String[0]), analyzer);
+ return new MultiFieldQueryParser(Version.LUCENE_CURRENT,defaultFields.toArray(new String[0]), analyzer);
}
}
\ No newline at end of file

Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/LabelQueryParser.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/LabelQueryParser.java 2009-11-17 11:34:07 UTC (rev 12302)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/LabelQueryParser.java 2009-11-19 09:53:20 UTC (rev 12303)
@@ -4,13 +4,14 @@
import org.apache.lucene.queryParser.MultiFieldQueryParser;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.util.Version;
import org.musicbrainz.search.index.*;

public class LabelQueryParser extends MultiFieldQueryParser {

public LabelQueryParser(java.lang.String[] strings, org.apache.lucene.analysis.Analyzer analyzer)
{
- super(strings,analyzer);
+ super(Version.LUCENE_CURRENT,strings,analyzer);
}

protected Query newTermQuery(Term term) {

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-17 11:34:07 UTC (rev 12302)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/RecordingQueryParser.java 2009-11-19 09:53:20 UTC (rev 12303)
@@ -8,6 +8,7 @@
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.TermRangeQuery;
import org.apache.lucene.util.NumericUtils;
+import org.apache.lucene.util.Version;
import org.musicbrainz.search.index.RecordingIndexField;
import org.musicbrainz.search.index.ReleaseGroupType;
import org.musicbrainz.search.servlet.mmd1.V1TrackIndexField;
@@ -20,7 +21,7 @@
public class RecordingQueryParser extends QueryParser {

public RecordingQueryParser(String field, Analyzer a) {
- super(field, a);
+ super(Version.LUCENE_CURRENT,field, a);
}

/**

Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ReleaseGroupQueryParser.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ReleaseGroupQueryParser.java 2009-11-17 11:34:07 UTC (rev 12302)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ReleaseGroupQueryParser.java 2009-11-19 09:53:20 UTC (rev 12303)
@@ -5,6 +5,7 @@
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.util.Version;
import org.musicbrainz.search.index.ReleaseGroupType;
import org.musicbrainz.search.index.ReleaseGroupIndexField;

@@ -16,7 +17,7 @@
public class ReleaseGroupQueryParser extends QueryParser {

public ReleaseGroupQueryParser(String field, Analyzer a) {
- super(field, a);
+ super(Version.LUCENE_CURRENT,field, a);
}

protected Query newTermQuery(Term term) {

Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ReleaseQueryParser.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ReleaseQueryParser.java 2009-11-17 11:34:07 UTC (rev 12302)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/ReleaseQueryParser.java 2009-11-19 09:53:20 UTC (rev 12303)
@@ -6,6 +6,7 @@
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.util.NumericUtils;
+import org.apache.lucene.util.Version;
import org.musicbrainz.search.index.*;

@@ -16,7 +17,7 @@
public class ReleaseQueryParser extends QueryParser {

public ReleaseQueryParser(String field, Analyzer a) {
- super(field, a);
+ super(Version.LUCENE_CURRENT,field, a);
}

protected Query newTermQuery(Term term) {

Modified: search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/WorkQueryParser.java
===================================================================
--- search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/WorkQueryParser.java 2009-11-17 11:34:07 UTC (rev 12302)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/WorkQueryParser.java 2009-11-19 09:53:20 UTC (rev 12303)
@@ -7,6 +7,7 @@
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.TermRangeQuery;
import org.apache.lucene.util.NumericUtils;
+import org.apache.lucene.util.Version;
import org.musicbrainz.search.index.*;

@@ -17,6 +18,6 @@
public class WorkQueryParser extends QueryParser {

public WorkQueryParser(String field, Analyzer a) {
- super(field, a);
+ super(Version.LUCENE_CURRENT,field, a);
}
}
\ No newline at end of file

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

r12302 - in search_server/branches/ngs: index servlet

2009-11-17T03:34:07Z

Author: ijabz
Date: 2009-11-17 11:34:07 +0000 (Tue, 17 Nov 2009)
New Revision: 12302

Modified:
search_server/branches/ngs/index/pom.xml
search_server/branches/ngs/servlet/pom.xml
Log:
Update lucene to lucene 2.9.1 (which fixes a couple of bugs in 2.9.0)

Modified: search_server/branches/ngs/index/pom.xml
===================================================================
--- search_server/branches/ngs/index/pom.xml 2009-11-17 11:29:49 UTC (rev 12301)
+++ search_server/branches/ngs/index/pom.xml 2009-11-17 11:34:07 UTC (rev 12302)
@@ -31,7 +31,7 @@
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
- <version>2.9.0</version>
+ <version>2.9.1</version>
<scope>compile</scope>
</dependency>
<dependency>

Modified: search_server/branches/ngs/servlet/pom.xml
===================================================================
--- search_server/branches/ngs/servlet/pom.xml 2009-11-17 11:29:49 UTC (rev 12301)
+++ search_server/branches/ngs/servlet/pom.xml 2009-11-17 11:34:07 UTC (rev 12302)
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
- <version>2.9.0</version>
+ <version>2.9.1</version>
<scope>compile</scope>
</dependency>
<dependency>

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

r12301 - search_server/branches/ngs/servlet

2009-11-17T03:29:49Z

Author: ijabz
Date: 2009-11-17 11:29:49 +0000 (Tue, 17 Nov 2009)
New Revision: 12301

Modified:
search_server/branches/ngs/servlet/pom.xml
Log:
Update version of jersey to new stable release (used for json output)

Modified: search_server/branches/ngs/servlet/pom.xml
===================================================================
--- search_server/branches/ngs/servlet/pom.xml 2009-11-17 11:28:36 UTC (rev 12300)
+++ search_server/branches/ngs/servlet/pom.xml 2009-11-17 11:29:49 UTC (rev 12301)
@@ -70,7 +70,7 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
- <version>1.1.2-ea</version>
+ <version>1.1.4</version>
</dependency>
<dependency>
<groupId>org.musicbrainz.search</groupId>

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

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

2009-11-17T03:28:36Z

Author: ijabz
Date: 2009-11-17 11:28:36 +0000 (Tue, 17 Nov 2009)
New Revision: 12300

Modified:
search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java
search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/RecordingIndexField.java
search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/AbstractIndexTest.java
search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java
search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/RecordingWriter.java
search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindRecordingTest.java
Log:
Support for indexing and displaying ISRCs linked to a recording

Modified: search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java
===================================================================
--- search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java 2009-11-16 21:35:25 UTC (rev 12299)
+++ search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java 2009-11-17 11:28:36 UTC (rev 12300)
@@ -65,7 +65,14 @@
}

public void init() throws SQLException {
- addPreparedStatement("ARTISTS",
+ addPreparedStatement("ISRCS",
+ "SELECT recording as recordingId, " +
+ "isrc " +
+ "FROM isrc " +
+ "WHERE recording BETWEEN ? AND ? " +
+ "order by recording,id");
+
+ addPreparedStatement("ARTISTS",
"SELECT re.id as recordingId, " +
"acn.position as pos, " +
"acn.joinphrase as joinphrase, " +
@@ -112,6 +119,38 @@
}

/**
+ * Get ISRC Information for the recordings
+ *
+ * @param min
+ * @param max
+ * @return
+ * @throws SQLException
+ * @throws IOException
+ */
+ private Map<Integer, List<String>> loadISRCs(int min, int max) throws SQLException, IOException{
+
+ //ISRC
+ Map<Integer, List<String>> isrcWrapper = new HashMap<Integer, List<String>>();
+ PreparedStatement st = getPreparedStatement("ISRCS");
+ st.setInt(1, min);
+ st.setInt(2, max);
+ ResultSet rs = st.executeQuery();
+ while (rs.next()) {
+ int recordingId = rs.getInt("recordingId");
+ List<String> list;
+ if (!isrcWrapper.containsKey(recordingId)) {
+ list = new LinkedList<String>();
+ isrcWrapper.put(recordingId, list);
+ } else {
+ list = isrcWrapper.get(recordingId);
+ }
+ String isrc = new String(rs.getString("isrc"));
+ list.add(isrc);
+ }
+ return isrcWrapper;
+ }
+
+ /**
* Get Artist Information for the recordings
*
* @param min
@@ -204,6 +243,7 @@
private void loadRecordings(IndexWriter indexWriter,
int min,
int max,
+ Map<Integer, List<String>> isrcs,
Map<Integer, List<ArtistWrapper>> artists,
Map<Integer, List<TrackWrapper>> tracks) throws SQLException, IOException{

@@ -212,19 +252,21 @@
st.setInt(2, max);
ResultSet rs = st.executeQuery();
while (rs.next()) {
- indexWriter.addDocument(documentFromResultSet(rs,artists,tracks));
+ indexWriter.addDocument(documentFromResultSet(rs,isrcs,artists,tracks));
}

}

public void indexData(IndexWriter indexWriter, int min, int max) throws SQLException, IOException {
+ Map<Integer, List<String>> isrcWrapper = loadISRCs(min,max);
Map<Integer, List<ArtistWrapper>> artistWrapper = loadArtists(min,max);
Map<Integer, List<TrackWrapper>> trackWrapper = loadTracks(min,max);

- loadRecordings(indexWriter,min,max,artistWrapper,trackWrapper);
+ loadRecordings(indexWriter,min,max,isrcWrapper,artistWrapper,trackWrapper);
}

public Document documentFromResultSet(ResultSet rs,
+ Map<Integer, List<String>> isrcs,
Map<Integer, List<ArtistWrapper>> artists,
Map<Integer, List<TrackWrapper>> tracks) throws SQLException {

@@ -237,6 +279,13 @@
doc.addNumericField(RecordingIndexField.DURATION, rs.getInt("duration"));
doc.addNumericField(RecordingIndexField.QUANTIZED_DURATION, rs.getInt("duration") / QUANTIZED_DURATION);

+ if (isrcs.containsKey(id)) {
+ //For each credit artist for this recording
+ for (String isrc : isrcs.get(id)) {
+ doc.addField(RecordingIndexField.ISRC, isrc);
+ }
+ }
+
if (tracks.containsKey(id)) {
//For each track for this recording
for (TrackWrapper track : tracks.get(id)) {
@@ -266,6 +315,8 @@

doc.addField(RecordingIndexField.ARTIST, ArtistWrapper.createFullArtistCredit(artists.get(id)));
}
+
+
return doc.getLuceneDocument();
}

Modified: search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/RecordingIndexField.java
===================================================================
--- search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/RecordingIndexField.java 2009-11-16 21:35:25 UTC (rev 12299)
+++ search_server/branches/ngs/index/src/main/java/org/musicbrainz/search/index/RecordingIndexField.java 2009-11-17 11:28:36 UTC (rev 12300)
@@ -3,6 +3,7 @@
import org.apache.lucene.document.Field;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.KeywordAnalyzer;
+import org.musicbrainz.search.analysis.CaseInsensitiveKeywordAnalyzer;

/**
* Fields created in Lucene Search Index
@@ -27,7 +28,9 @@
ARTIST_COMMENT ("comment", Field.Store.YES, Field.Index.ANALYZED),
TRACK_OUTPUT ("trackoutoutput", Field.Store.YES, Field.Index.NO),
RECORDING_OUTPUT ("recordingoutput", Field.Store.YES, Field.Index.NO),
- MEDIUM_POS_OUTPUT ("mediumposoutput", Field.Store.YES, Field.Index.NO),
+ MEDIUM_POS_OUTPUT ("mediumposoutput", Field.Store.YES, Field.Index.NO),
+ ISRC ("isrc", Field.Store.YES, Field.Index.ANALYZED, new CaseInsensitiveKeywordAnalyzer()),
+
;

private String name;

Modified: search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/AbstractIndexTest.java
===================================================================
--- search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/AbstractIndexTest.java 2009-11-16 21:35:25 UTC (rev 12299)
+++ search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/AbstractIndexTest.java 2009-11-17 11:28:36 UTC (rev 12300)
@@ -57,6 +57,7 @@
stmt.addBatch("DROP TABLE track_name");
stmt.addBatch("DROP TABLE track");
stmt.addBatch("DROP TABLE recording");
+ stmt.addBatch("DROP TABLE isrc");

stmt.addBatch("DROP TABLE annotation");
stmt.addBatch("DROP TABLE artist_annotation");
@@ -363,6 +364,16 @@
" editpending integer NOT NULL DEFAULT 0," +
" CONSTRAINT recording_pkey PRIMARY KEY (id)" +
")");
+
+ stmt.addBatch("CREATE TABLE isrc" +
+ "(" +
+ " id serial NOT NULL," +
+ " recording integer NOT NULL," +
+ " isrc character(12) NOT NULL," +
+ " source smallint," +
+ " editpending integer NOT NULL DEFAULT 0," +
+ " CONSTRAINT isrc_pkey PRIMARY KEY (id)" +
+ ")");
}

protected void setupAnnotationTables(Statement stmt) throws Exception {

Modified: search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java
===================================================================
--- search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java 2009-11-16 21:35:25 UTC (rev 12299)
+++ search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java 2009-11-17 11:28:36 UTC (rev 12300)
@@ -84,6 +84,13 @@
+ "VALUES (1, '2f250ed2-6285-40f1-aa2a-14f1c05e9765', 1,1,33000, null,1)");
stmt.addBatch("INSERT INTO track_name(id, name, refcount)VALUES (1, 'Do It Clean', 1) ");
stmt.addBatch("INSERT INTO track_name(id, name, refcount)VALUES (2, 'Do It Cleans', 1) ");
+
+ stmt.addBatch("INSERT INTO isrc(" +
+ " id, recording, isrc, source, editpending)" +
+ " VALUES (1, 1, '1234568', null, 1);");
+ stmt.addBatch("INSERT INTO isrc(" +
+ " id, recording, isrc, source, editpending)" +
+ " VALUES (2, 1, 'abcdefghi', null, 1);");
stmt.executeBatch();
stmt.close();
conn.close();
@@ -163,6 +170,7 @@
assertEquals(1, doc.getFields(RecordingIndexField.RECORDING_OUTPUT.getName()).length);
assertEquals(1, doc.getFields(RecordingIndexField.TRACK_OUTPUT.getName()).length);
assertEquals(1, doc.getFields(RecordingIndexField.RECORDING_ID.getName()).length);
+ assertEquals(2, doc.getFields(RecordingIndexField.ISRC.getName()).length);
assertEquals("2f250ed2-6285-40f1-aa2a-14f1c05e9765", doc.getField(RecordingIndexField.RECORDING_ID.getName()).stringValue());
assertEquals("Do It Clean", doc.getField(RecordingIndexField.RECORDING.getName()).stringValue());
assertEquals("Crocodiles (bonus disc)", doc.getField(RecordingIndexField.RELEASE.getName()).stringValue());
@@ -173,6 +181,7 @@
assertEquals(2, NumericUtils.prefixCodedToInt(doc.getField(RecordingIndexField.NUM_TRACKS.getName()).stringValue()));
assertEquals(4, NumericUtils.prefixCodedToInt(doc.getField(RecordingIndexField.TRACKNUM.getName()).stringValue()));
assertEquals(33000, NumericUtils.prefixCodedToInt(doc.getField(RecordingIndexField.DURATION.getName()).stringValue()));
+ assertEquals("1234568", doc.getField(RecordingIndexField.ISRC.getName()).stringValue());

}
ir.close();
@@ -318,7 +327,49 @@
ir.close();
}

+ /**
+ * Basic test of all fields
+ *
+ * @throws Exception
+ */
+ public void testISRC() throws Exception {

+ addTrackOne();
+ RAMDirectory ramDir = new RAMDirectory();
+ createIndex(ramDir);
+
+ IndexReader ir = IndexReader.open(ramDir, true);
+ assertEquals(1, ir.numDocs());
+ {
+ Document doc = ir.document(0);
+ assertEquals(2, doc.getFields(RecordingIndexField.ISRC.getName()).length);
+ assertEquals("1234568", doc.getField(RecordingIndexField.ISRC.getName()).stringValue());
+
+ }
+ ir.close();
+ }
+
+
+ /**
+ * Basic test of all fields
+ *
+ * @throws Exception
+ */
+ public void testNoISRC() throws Exception {
+
+ addTrackTwo();
+ RAMDirectory ramDir = new RAMDirectory();
+ createIndex(ramDir);
+
+ IndexReader ir = IndexReader.open(ramDir, true);
+ assertEquals(1, ir.numDocs());
+ {
+ Document doc = ir.document(0);
+ assertEquals(0, doc.getFields(RecordingIndexField.ISRC.getName()).length);
+
+ }
+ ir.close();
+ }
public void testToAvoidWarnings()
{
assertEquals(1,1);

Modified: 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/RecordingWriter.java 2009-11-16 21:35:25 UTC (rev 12299)
+++ search_server/branches/ngs/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/RecordingWriter.java 2009-11-17 11:28:36 UTC (rev 12300)
@@ -68,6 +68,16 @@
recording.setLength(BigInteger.valueOf(NumericUtils.prefixCodedToInt(duration)));
}

+ String[] isrcs = doc.getValues(RecordingIndexField.ISRC);
+ if(isrcs.length>0) {
+ IsrcList isrcList = of.createIsrcList();
+ for (int i = 0; i < isrcs.length; i++) {
+
+ isrcList.getIsrc().add(isrcs[i]);
+ }
+ recording.setIsrcList(isrcList);
+ }
+
String[] artistIds = doc.getValues(RecordingIndexField.ARTIST_ID);
String[] artistNames = doc.getValues(RecordingIndexField.ARTIST_NAME);
String[] artistJoinPhrases = doc.getValues(RecordingIndexField.ARTIST_JOINPHRASE);

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-16 21:35:25 UTC (rev 12299)
+++ search_server/branches/ngs/servlet/src/test/java/org/musicbrainz/search/servlet/FindRecordingTest.java 2009-11-17 11:28:36 UTC (rev 12300)
@@ -58,6 +58,9 @@
doc.addField(RecordingIndexField.RECORDING, "Gravitational Lens");
doc.addField(RecordingIndexField.MEDIUM_POS_OUTPUT, "1");
doc.addField(RecordingIndexField.RELEASE_TYPE, ReleaseGroupType.ALBUM.getName());
+ doc.addField(RecordingIndexField.ISRC, "123456789");
+ doc.addField(RecordingIndexField.ISRC, "abcdefghi");
+
writer.addDocument(doc.getLuceneDocument());
writer.close();
ss = new RecordingSearch(new IndexSearcher(ramDir,true));
@@ -95,6 +98,7 @@
assertEquals("Our Glorious 5 Year Plan", doc.get(RecordingIndexField.RELEASE));
assertEquals(234000, NumericUtils.prefixCodedToInt(doc.get(RecordingIndexField.DURATION)));
assertEquals("Gravitational Lens", doc.get(RecordingIndexField.TRACK_OUTPUT));
+ assertEquals("123456789", doc.get(RecordingIndexField.ISRC));
}

public void testFindRecordingByV1TrackId() throws Exception {
@@ -185,6 +189,13 @@
assertEquals("7ca7782b-a602-448b-b108-bb881a7be2d6", doc.get(RecordingIndexField.RECORDING_ID));
}

+ public void testFindRecordingByISRC() throws Exception {
+ Results res = ss.searchLucene("isrc:123456789", 0, 10);
+ assertEquals(1, res.totalHits);
+ Result result = res.results.get(0);
+ MbDocument doc = result.doc;
+ assertEquals("7ca7782b-a602-448b-b108-bb881a7be2d6", doc.get(RecordingIndexField.RECORDING_ID));
+ }

public void testFindRecordingByNonNumericDuration() throws Exception {
Results res = ss.searchLucene("dur:fred", 0, 10);
@@ -303,7 +314,10 @@
assertTrue(output.contains("count=\"10\""));
assertTrue(output.contains("offset=\"0\""));
assertTrue(output.contains("count=\"1\""));
+ assertTrue(output.contains("<isrc>123456789</isrc>"));
+ assertTrue(output.contains("<isrc>abcdefghi</isrc>"));
assertTrue(output.contains("<title>Gravitational Lens</title>"));
+
}

}

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