[mb-commits] r11106 - in mb_server/trunk: . admin/apache admin/sql admin/sql/updates cgi-bin/MusicBrainz/Server htdocs/cdi htdocs/scripts

root at musicbrainz.org root at musicbrainz.org
Wed Jan 21 07:24:12 UTC 2009 

Author: luks
Date: 2009-01-21 07:24:12 +0000 (Wed, 21 Jan 2009)
New Revision: 11106

Modified:
   mb_server/trunk/
   mb_server/trunk/admin/apache/rewrite.conf
   mb_server/trunk/admin/apache/startup.pl.default
   mb_server/trunk/admin/apache/vh_mb_backend.conf.default
   mb_server/trunk/admin/sql/PopulateMetaTables.sql
   mb_server/trunk/admin/sql/updates/PopulateAlbumDateAdded.pl
   mb_server/trunk/cgi-bin/MusicBrainz/Server/CDStub.pm
   mb_server/trunk/htdocs/cdi/searchrelease.html
   mb_server/trunk/htdocs/scripts/jsvoting.js
Log:
Merge the release branch (testing 1.5's merging)


Property changes on: mb_server/trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /mb_server/branches/Discographies-BRANCH:9889-9891,9921,9924,9930,9941,9947,9962-9963,9974-9975,9996-9998,10088,10093-10097,10117,10129,10138,10141,10146-10147,10203,10208,10216-10219,10222-10235,10237-10240,10244-10246,10251-10257,10259-10261,10305,10312,10316,10318-10323,10325,10327,10336-10337,10428,10488,10498-10499,10517-10518,10523
/mb_server/branches/EnhancedVoting-BRANCH:9427-9428,9457,9620,9938,9948,10107,10118-10119,10263,10329-10331
/mb_server/branches/RELEASE_20081123-BRANCH:10850-11058
/mb_server/branches/Rating-BRANCH:9965,10120,10209-10215,10313-10315,10317,10324,10328,10338,10340-10341,10343,10457-10458,10474-10477,10494-10496
   + /mb_server/branches/Discographies-BRANCH:9889-9891,9921,9924,9930,9941,9947,9962-9963,9974-9975,9996-9998,10088,10093-10097,10117,10129,10138,10141,10146-10147,10203,10208,10216-10219,10222-10235,10237-10240,10244-10246,10251-10257,10259-10261,10305,10312,10316,10318-10323,10325,10327,10336-10337,10428,10488,10498-10499,10517-10518,10523
/mb_server/branches/EnhancedVoting-BRANCH:9427-9428,9457,9620,9938,9948,10107,10118-10119,10263,10329-10331
/mb_server/branches/RELEASE_20081123-BRANCH:10849-11105
/mb_server/branches/Rating-BRANCH:9965,10120,10209-10215,10313-10315,10317,10324,10328,10338,10340-10341,10343,10457-10458,10474-10477,10494-10496


Property changes on: mb_server/trunk/admin/apache/rewrite.conf
___________________________________________________________________
Modified: svn:mergeinfo
   - /mb_server/branches/RELEASE_20081123-BRANCH/admin/apache/rewrite.conf:10850-11058
   + /mb_server/branches/RELEASE_20081123-BRANCH/admin/apache/rewrite.conf:10849-11105


Property changes on: mb_server/trunk/admin/apache/startup.pl.default
___________________________________________________________________
Modified: svn:mergeinfo
   - /mb_server/branches/RELEASE_20081123-BRANCH/admin/apache/startup.pl.default:10850-11058
   + /mb_server/branches/RELEASE_20081123-BRANCH/admin/apache/startup.pl.default:10849-11105


Property changes on: mb_server/trunk/admin/apache/vh_mb_backend.conf.default
___________________________________________________________________
Modified: svn:mergeinfo
   - /mb_server/branches/RELEASE_20081123-BRANCH/admin/apache/vh_mb_backend.conf.default:10850-11058
   + /mb_server/branches/RELEASE_20081123-BRANCH/admin/apache/vh_mb_backend.conf.default:10849-11105


Property changes on: mb_server/trunk/admin/sql/PopulateMetaTables.sql
___________________________________________________________________
Modified: svn:mergeinfo
   - /mb_server/branches/EnhancedVoting-BRANCH/admin/sql/PopulateAlbumMeta.sql:9427-9428,9457,9620,9938,9948,10107,10118-10119,10263,10329-10331
/mb_server/branches/RELEASE_20081123-BRANCH/admin/sql/PopulateMetaTables.sql:10850-11058
/mb_server/branches/Rating-BRANCH/admin/sql/PopulateAlbumMeta.sql:9965,10120,10209-10215,10313-10315,10317,10324,10328,10338,10340-10341,10343,10457-10458,10474-10477,10494-10496
   + /mb_server/branches/EnhancedVoting-BRANCH/admin/sql/PopulateAlbumMeta.sql:9427-9428,9457,9620,9938,9948,10107,10118-10119,10263,10329-10331
/mb_server/branches/RELEASE_20081123-BRANCH/admin/sql/PopulateMetaTables.sql:10849-11105
/mb_server/branches/Rating-BRANCH/admin/sql/PopulateAlbumMeta.sql:9965,10120,10209-10215,10313-10315,10317,10324,10328,10338,10340-10341,10343,10457-10458,10474-10477,10494-10496


Property changes on: mb_server/trunk/admin/sql/updates/PopulateAlbumDateAdded.pl
___________________________________________________________________
Modified: svn:mergeinfo
   - /mb_server/branches/Discographies-BRANCH/admin/PopulateAlbumDateAdded.pl:9889-9891,9921,9924,9930,9941,9947,9962-9963,9974-9975,9996-9998,10088,10093-10097,10117,10129,10138,10141,10146-10147,10203,10208,10216-10219,10222-10235,10237-10240,10244-10246,10251-10257,10259-10261,10305,10312,10316,10318-10323,10325,10327,10336-10337,10428,10488,10498-10499,10517-10518,10523
/mb_server/branches/EnhancedVoting-BRANCH/admin/PopulateAlbumDateAdded.pl:9427-9428,9457,9620,9938,9948,10107,10118-10119,10263,10329-10331
/mb_server/branches/RELEASE_20081123-BRANCH/admin/sql/updates/PopulateAlbumDateAdded.pl:10850-11058
/mb_server/branches/Rating-BRANCH/admin/PopulateAlbumDateAdded.pl:9965,10120,10209-10215,10313-10315,10317,10324,10328,10338,10340-10341,10343,10457-10458,10474-10477,10494-10496
   + /mb_server/branches/Discographies-BRANCH/admin/PopulateAlbumDateAdded.pl:9889-9891,9921,9924,9930,9941,9947,9962-9963,9974-9975,9996-9998,10088,10093-10097,10117,10129,10138,10141,10146-10147,10203,10208,10216-10219,10222-10235,10237-10240,10244-10246,10251-10257,10259-10261,10305,10312,10316,10318-10323,10325,10327,10336-10337,10428,10488,10498-10499,10517-10518,10523
/mb_server/branches/EnhancedVoting-BRANCH/admin/PopulateAlbumDateAdded.pl:9427-9428,9457,9620,9938,9948,10107,10118-10119,10263,10329-10331
/mb_server/branches/RELEASE_20081123-BRANCH/admin/sql/updates/PopulateAlbumDateAdded.pl:10849-11105
/mb_server/branches/Rating-BRANCH/admin/PopulateAlbumDateAdded.pl:9965,10120,10209-10215,10313-10315,10317,10324,10328,10338,10340-10341,10343,10457-10458,10474-10477,10494-10496

Modified: mb_server/trunk/cgi-bin/MusicBrainz/Server/CDStub.pm
===================================================================
--- mb_server/trunk/cgi-bin/MusicBrainz/Server/CDStub.pm	2009-01-21 07:16:24 UTC (rev 11105)
+++ mb_server/trunk/cgi-bin/MusicBrainz/Server/CDStub.pm	2009-01-21 07:24:12 UTC (rev 11106)
@@ -144,12 +144,11 @@
 	{
 		$active = $sql->SelectListOfHashes("SELECT release_raw.id, title, artist, added, lastmodified,
 											lookupcount, modifycount,
-			                                (lookupcount + modifycount) AS count,
 											discid, trackcount, leadoutoffset, trackoffset
 			                           FROM release_raw, cdtoc_raw
 								      WHERE release_raw.id = cdtoc_raw.release
 									    AND lookupcount + modifycount > 0
-								   ORDER BY count desc
+								   ORDER BY lookupcount desc, modifycount desc
 							          LIMIT 1000");
 		$timestamp = time();
 		$numitems = scalar(@$active);

Modified: mb_server/trunk/htdocs/cdi/searchrelease.html
===================================================================
--- mb_server/trunk/htdocs/cdi/searchrelease.html	2009-01-21 07:16:24 UTC (rev 11105)
+++ mb_server/trunk/htdocs/cdi/searchrelease.html	2009-01-21 07:24:12 UTC (rev 11106)
@@ -319,7 +319,7 @@
 			</tr>
 
 %		my $i = 0;
-%		for my $artist (sort { $a->{"_sortname_"} cmp $b->{"_sortname_"} } values %unusedartists)
+%		OUTER: for my $artist (sort { $a->{"_sortname_"} cmp $b->{"_sortname_"} } values %unusedartists)
 %		{
 %			for my $release (sort { $a->{_name_} cmp $b->{_name_} } @{ $artist->{"_unused_"} })
 %			{
@@ -340,12 +340,13 @@
 							<& /comp/form/hiddenfield, "tracks", $tracks &>
 							<& /comp/form/hiddenfield, "search", $search &>
 							<& /comp/form/hiddenfield, "showallreleases", 1 &>
+							<& /comp/form/hiddenfield, "barcode", $barcode &>
 						</div>
 					</form>
 				</td>
 			</tr>
 
-%						last;
+%						last OUTER;
 %					}
 %				}
 

Modified: mb_server/trunk/htdocs/scripts/jsvoting.js
===================================================================
--- mb_server/trunk/htdocs/scripts/jsvoting.js	2009-01-21 07:16:24 UTC (rev 11105)
+++ mb_server/trunk/htdocs/scripts/jsvoting.js	2009-01-21 07:24:12 UTC (rev 11106)
@@ -34,7 +34,7 @@
    // member variables
    // ----------------------------------------------------------------------------
    this.addnote_msg = "Add note";
-   this.delnote_msg = "Del note";
+   this.delnote_msg = "Delete note";
 
    this.vote_inputs = {
     "yes": new Array(),

More information about the MusicBrainz-commits mailing list