From januszop at gmail.com Mon Jan 3 04:37:26 2011 From: januszop at gmail.com (januszop at gmail.com) Date: Mon, 3 Jan 2011 05:37:26 +0200 Subject: [Koha-patches] [PATCH] Corrections to addbiblio.tmpl to be able to delete repetable mandatory subfields Message-ID: From januszop at gmail.com Mon Jan 3 04:52:14 2011 From: januszop at gmail.com (Janusz Kaczmarek) Date: Mon, 3 Jan 2011 04:52:14 +0200=0A= Subject: [PATCH] Corrections to addbiblio.tmpl to be able to delete = Message-ID: repetable mandatory subfields=0A= Content-Type: text/plain; charset=3D"utf-8"=0A= =0A= ---=0A= .../prog/en/modules/cataloguing/addbiblio.tmpl | 8 +++++---=0A= 1 files changed, 5 insertions(+), 3 deletions(-)=0A= =0A= diff --git = a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl = b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl=0A= index 0fa4dc1..1bd0dac 100644=0A= --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl=0A= +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl=0A= @@ -131,9 +131,11 @@ function AreMandatoriesNotOk(){=0A= var tag=3Dmandatories[i].substr(4,3);=0A= var subfield=3Dmandatories[i].substr(17,1);=0A= var = tagnumber=3Dmandatories[i].substr(19,mandatories[i].lastIndexOf("_")-19);=0A= - tabflag[tag+subfield+tagnumber]=3Dnew Array();=0A= - tabflag[tag+subfield+tagnumber][0]=3D0;=0A= - if( ! document.getElementById(mandatories[i]).value){=0A= + if (tabflag[tag+subfield+tagnumber] =3D=3D null) { =0A= + tabflag[tag+subfield+tagnumber]=3Dnew Array();=0A= + tabflag[tag+subfield+tagnumber][0]=3D0; =0A= + }=0A= + if( tabflag[tag+subfield+tagnumber][0] !=3D 1 && = (document.getElementById(mandatories[i]) !=3D null && ! = document.getElementById(mandatories[i]).value || = document.getElementById(mandatories[i]) =3D=3D null)){=0A= tabflag[tag+subfield+tagnumber][0] =3D 0 + = tabflag[tag+subfield+tagnumber] ;=0A= = document.getElementById(mandatories[i]).setAttribute('class','subfield_no= t_filled');=0A= document.getElementById(mandatories[i]).focus();=0A= -- =0A= 1.5.6.5=0A= =0A= ------=_NextPart_000_0032_01CBAB08.4EA11A20-- From januszop at gmail.com Mon Jan 3 16:29:45 2011 From: januszop at gmail.com (januszop at gmail.com) Date: Mon, 3 Jan 2011 17:29:45 +0200 Subject: [Koha-patches] [PATCH] Changes to sub merge in C4::AuthoritiesMarc to refine authorities merging Message-ID: C4/AuthoritiesMarc.pm | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm index d07cca4..81bdf51 100644 --- a/C4/AuthoritiesMarc.pm +++ b/C4/AuthoritiesMarc.pm @@ -1300,6 +1300,13 @@ sub merge { $oConnection->destroy(); } #warn scalar(@reccache)." biblios to update"; + #Get a list of authority controlled subfields + $sth = $dbh->prepare("select distinct tagsubfield from auth_subfield_structure where authtypecode=? and tagfield=? and tab >=0"); + $sth->execute($authtypecodeto, $auth_tag_to_report_to); + my @subfields_controlled_by_auth_to; + while (my ($tagsubfield) = $sth->fetchrow) { + push @subfields_controlled_by_auth_to, $tagsubfield ; + } # Get All candidate Tags for the change # (This will reduce the search scope in marc records). $sth = $dbh->prepare("select distinct tagfield from marc_subfield_structure where authtypecode=?"); @@ -1332,6 +1339,9 @@ sub merge { $field_to->add_subfields($subfield->[0] =>$subfield->[1]); $exclude.= $subfield->[0]; } + foreach my $subt (@subfields_controlled_by_auth_to) { + $exclude.= $subt; + } $exclude='['.$exclude.']'; # add subfields in $field not included in @record_to my @restore= grep {$_->[0]!~/$exclude/} $field->subfields(); -- 1.5.6.5 From nengard at bywatersolutions.com Tue Jan 4 15:04:41 2011 From: nengard at bywatersolutions.com (Nicole Engard) Date: Tue, 4 Jan 2011 09:04:41 -0500 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 4945 - Patron search is limited by default to the currently logged-in library Message-ID: <1294149881-2510-1-git-send-email-nengard@bywatersolutions.com> From: Owen Leonard I couldn't figure out how (or whether) GetBranchesLoop could be convinced to return a list of branches without selecting one, so I swapped GetBranchesLoop with GetBranches. This will preselect a branch only if a branch has been submitted as part of a query. This does NOT preselect the correct branch when IndependantBranches is turned on. I also added a template variable which is true if a query has been submitted with a branch or a category so that the extra form fields can be displayed, reminding the user that they added limiters to their query. Signed-off-by: Nicole Engard --- .../prog/en/includes/patron-search.inc | 5 ++- members/member.pl | 34 ++++++++++---------- members/members-home.pl | 14 +++++++- 3 files changed, 33 insertions(+), 20 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc index d1b096e..d454839 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc @@ -114,8 +114,9 @@ YAHOO.util.Event.onContentReady("header_search", function() { diff --git a/members/member.pl b/members/member.pl index 755a051..df688d1 100755 --- a/members/member.pl +++ b/members/member.pl @@ -49,11 +49,21 @@ my $theme = $input->param('theme') || "default"; my $patron = $input->Vars; foreach (keys %$patron){ - delete $$patron{$_} unless($$patron{$_}); + delete $$patron{$_} unless($$patron{$_}); } - my @categories=C4::Category->all; -my $branches=(defined $$patron{branchcode}?GetBranchesLoop($$patron{branchcode}):GetBranchesLoop()); + +my $branches = GetBranches; +my @branchloop; + +foreach (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) { + my $selected = 1 if $branches->{$_}->{branchcode} eq $$patron{branchcode}; + my %row = ( value => $_, + selected => $selected, + branchname => $branches->{$_}->{branchname}, + ); + push @branchloop, \%row; +} my %categories_dislay; @@ -119,11 +129,6 @@ foreach my $borrower(@$results[$from..$to-1]){ push(@resultsdata, \%row); } -if ($$patron{branchcode}){ - foreach my $branch (grep{$_->{value} eq $$patron{branchcode}}@$branches){ - $$branch{selected}=1; - } -} if ($$patron{categorycode}){ foreach my $category (grep{$_->{categorycode} eq $$patron{categorycode}}@categories){ $$category{selected}=1; @@ -142,9 +147,9 @@ my $base_url = ); my @letters = map { {letter => $_} } ( 'A' .. 'Z'); -$template->param( letters => \@letters ); $template->param( + letters => \@letters, paginationbar => pagination_bar( $base_url, int( $count / $resultsperpage ) + ($count % $resultsperpage ? 1 : 0), @@ -154,15 +159,10 @@ $template->param( from => ($startfrom-1)*$resultsperpage+1, to => $to, multipage => ($count != $to+1 || $startfrom!=1), -); -$template->param( - branchloop=>$branches, + advsearch => ($$patron{categorycode} || $$patron{branchcode}), + branchloop=>\@branchloop, categories=>\@categories, -); - - -$template->param( - searching => "1", + searching => "1", actionname =>basename($0), %$patron, numresults => $count, diff --git a/members/members-home.pl b/members/members-home.pl index 04fc557..120e65f 100755 --- a/members/members-home.pl +++ b/members/members-home.pl @@ -51,9 +51,21 @@ if($quicksearch){ debug => 1, }); } + +my $branches = GetBranches; +my @branchloop; +foreach (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) { + my $selected = 1 if $branches->{$_}->{branchcode} eq $branch; + my %row = ( value => $_, + selected => $selected, + branchname => $branches->{$_}->{branchname}, + ); + push @branchloop, \%row; +} + my @categories=C4::Category->all; $template->param( - branchloop=>(defined $branch?GetBranchesLoop($branch):GetBranchesLoop()), + branchloop=>\@branchloop, categories=>\@categories, ); $template->param( -- 1.5.6.5 From oleonard at myacpl.org Tue Jan 4 16:43:02 2011 From: oleonard at myacpl.org (Owen Leonard) Date: Tue, 4 Jan 2011 10:43:02 -0500 Subject: [Koha-patches] [PATCH] Fix for Bug 5570 - item types not showing on other editions Message-ID: <1294155782-8148-1-git-send-email-oleonard@myacpl.org> The item type which shows on other editions is the biblio-level itemtype. XISBN.pm had some item-handling code, but I'm removing it because it is unused. The editions tab should now display item type only if item-level itemtypes are not enabled. --- C4/XISBN.pm | 2 -- .../opac-tmpl/prog/en/modules/opac-detail.tmpl | 11 +++-------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/C4/XISBN.pm b/C4/XISBN.pm index 4f3f488..13abf25 100644 --- a/C4/XISBN.pm +++ b/C4/XISBN.pm @@ -20,7 +20,6 @@ package C4::XISBN; use XML::Simple; #use LWP::Simple; use C4::Biblio; -use C4::Items; use C4::Koha; use C4::External::Syndetics qw(get_syndetics_editions); use LWP::UserAgent; @@ -72,7 +71,6 @@ sub _get_biblio_from_xisbn { if ($xbib_data->{biblionumber}) { $xbiblio = GetBiblioData($xbib_data->{biblionumber}); $xbiblio->{normalized_isbn} = GetNormalizedISBN($xbiblio->{isbn}); - $xbiblio->{items} = GetItemsByBiblioitemnumber($xbib_data->{biblionumber}); } return ($xbiblio); } diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl index 81fbfc8..83f4174 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl @@ -167,10 +167,10 @@ YAHOO.util.Event.onContentReady("furtherm", function () { - Year : + Year: " alt="" title="" /> - Item type : + Item type: @@ -716,17 +716,12 @@ YAHOO.util.Event.onContentReady("furtherm", function () { No cover image available -"> by © +"> by ©

() ,

- - - .gif" title="" alt="" /> - barcode: - --> -- 1.7.3 From nengard at bywatersolutions.com Tue Jan 4 18:47:29 2011 From: nengard at bywatersolutions.com (Nicole Engard) Date: Tue, 4 Jan 2011 12:47:29 -0500 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 5570 - item types not showing on other editions Message-ID: <1294163250-2916-1-git-send-email-nengard@bywatersolutions.com> From: Owen Leonard The item type which shows on other editions is the biblio-level itemtype. XISBN.pm had some item-handling code, but I'm removing it because it is unused. The editions tab should now display item type only if item-level itemtypes are not enabled. Signed-off-by: Nicole Engard --- C4/XISBN.pm | 2 -- .../opac-tmpl/prog/en/modules/opac-detail.tmpl | 11 +++-------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/C4/XISBN.pm b/C4/XISBN.pm index 4f3f488..13abf25 100644 --- a/C4/XISBN.pm +++ b/C4/XISBN.pm @@ -20,7 +20,6 @@ package C4::XISBN; use XML::Simple; #use LWP::Simple; use C4::Biblio; -use C4::Items; use C4::Koha; use C4::External::Syndetics qw(get_syndetics_editions); use LWP::UserAgent; @@ -72,7 +71,6 @@ sub _get_biblio_from_xisbn { if ($xbib_data->{biblionumber}) { $xbiblio = GetBiblioData($xbib_data->{biblionumber}); $xbiblio->{normalized_isbn} = GetNormalizedISBN($xbiblio->{isbn}); - $xbiblio->{items} = GetItemsByBiblioitemnumber($xbib_data->{biblionumber}); } return ($xbiblio); } diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl index 81fbfc8..83f4174 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl @@ -167,10 +167,10 @@ YAHOO.util.Event.onContentReady("furtherm", function () { - Year : + Year: " alt="" title="" /> - Item type : + Item type: @@ -716,17 +716,12 @@ YAHOO.util.Event.onContentReady("furtherm", function () { No cover image available -"> by © +"> by ©

() ,

- - - .gif" title="" alt="" /> - barcode: - --> -- 1.5.6.5 From nengard at bywatersolutions.com Tue Jan 4 20:31:46 2011 From: nengard at bywatersolutions.com (Nicole Engard) Date: Tue, 4 Jan 2011 14:31:46 -0500 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 3918 - Add to order lists inconsistent Message-ID: <1294169506-3151-1-git-send-email-nengard@bywatersolutions.com> From: Owen Leonard - Added new include to contain add to basket options - Minor markup corrections Signed-off-by: Nicole Engard --- .../en/includes/acquisitions-add-to-basket.inc | 14 ++++++++++++++ .../prog/en/modules/acqui/basket.tmpl | 15 +-------------- .../prog/en/modules/acqui/neworderbiblio.tmpl | 19 +++---------------- 3 files changed, 18 insertions(+), 30 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc new file mode 100644 index 0000000..7eae563 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc @@ -0,0 +1,14 @@ +
+ Add Order To Basket +
+ " /> + " /> + +
+
\ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl index 9079b6d..aaa7462 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl @@ -288,20 +288,7 @@
-
- Add Order To Basket -
- " /> - " /> - -
-
+ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl index 9437185..76102d1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl @@ -19,8 +19,8 @@ - results found - + results found +

No results found

@@ -77,20 +77,7 @@ -

- Add To Order -
- " /> - " /> - -
-
+ -- 1.5.6.5 From nengard at bywatersolutions.com Tue Jan 4 20:38:44 2011 From: nengard at bywatersolutions.com (Nicole Engard) Date: Tue, 4 Jan 2011 14:38:44 -0500 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] bug 5497: make all library fields available to circ receipt/slips Message-ID: <1294169924-3234-1-git-send-email-nengard@bywatersolutions.com> From: Galen Charlton This allows the receipt template to be more readily customized to include the library's address, phone number, email address, etc. Signed-off-by: Galen Charlton Signed-off-by: Nicole Engard --- members/moremember.pl | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/members/moremember.pl b/members/moremember.pl index aa8165b..605e278 100755 --- a/members/moremember.pl +++ b/members/moremember.pl @@ -222,8 +222,7 @@ if ( C4::Context->preference("IndependantBranches") ) { $samebranch = 1; } my $branchdetail = GetBranchDetail( $data->{'branchcode'}); -$data->{'branchname'} = $branchdetail->{branchname}; - +@{$data}{keys %$branchdetail} = values %$branchdetail; # merge in all branch columns my ( $total, $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber ); my $lib1 = &GetSortDetails( "Bsort1", $data->{'sort1'} ); -- 1.5.6.5 From chrisc at catalyst.net.nz Tue Jan 4 20:55:09 2011 From: chrisc at catalyst.net.nz (Chris Cormack) Date: Wed, 5 Jan 2011 08:55:09 +1300 Subject: [Koha-patches] [paul.poulain@biblibre.com: Re: [PATCH] [SIGNED-OFF] bug 5419: make reason checkouts blocked stand out] Message-ID: <20110104195509.GI27877@rorohiko> Hi All I will get Chris to work on this, not having the span split things, as he is currently rewriting the translation tool for template toolkit. Chris ----- Forwarded message from Paul Poulain ----- Date: Thu, 30 Dec 2010 18:02:38 +0100 From: Paul Poulain To: koha-patches at lists.koha-community.org Subject: Re: [Koha-patches] [PATCH] [SIGNED-OFF] bug 5419: make reason checkouts blocked stand out User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.13) Gecko/20101208 Thunderbird/3.1.7 Le 30/12/2010 17:57, Owen Leonard a ?crit : > - Checkouts are blocked because fine balance is over the limit. > + Checkouts are BLOCKED because fine balance is OVER THE LIMIT. Hi Owen, Such a syntax results in 4 strings in translator : checkouts are / BLOCKED / because fine balance is / OVER THE LIMIT The result is that you may get a translation that the librarian can't understand. Isn't it possible to have the whole sentence in 1 html tag ? Other option maybe: improve the translator tool to avoid splitting on ? would it be possible ? -- Paul POULAIN http://www.biblibre.com Expert en Logiciels Libres pour l'info-doc Tel : (33) 4 91 81 35 08 _______________________________________________ Koha-patches mailing list Koha-patches at lists.koha-community.org http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/ ----- End forwarded message ----- -- Chris Cormack Catalyst IT Ltd. +64 4 803 2238 PO Box 11-053, Manners St, Wellington 6142, New Zealand -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 198 bytes Desc: Digital signature URL: From oleonard at myacpl.org Tue Jan 4 22:08:22 2011 From: oleonard at myacpl.org (Owen Leonard) Date: Tue, 4 Jan 2011 16:08:22 -0500 Subject: [Koha-patches] [PATCH] Fix for Bug 5571 - tags as bulleted list too long Message-ID: <1294175302-9769-1-git-send-email-oleonard@myacpl.org> --- koha-tmpl/opac-tmpl/prog/en/css/opac.css | 5 +++-- .../opac-tmpl/prog/en/modules/opac-detail.tmpl | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css index 68cc572..4c7d6ad 100644 --- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css @@ -595,6 +595,8 @@ input.deleteshelf:active { text-decoration: none; } +#tagslist li { display : inline; } + #placehold input.submit:hover, #tagsel_span input.submit:hover { color: #990033; @@ -2003,5 +2005,4 @@ div.ft { #plainmarc table { border: 0; margin: .7em 0 0 0; font-family: monospace; font-size: 95%; } #plainmarc th { background-color : #FFF; border: 0; white-space: nowrap; text-align:left; vertical-align: top; padding: 2px; } -#plainmarc td { border: 0; padding : 2px; vertical-align: top; } - +#plainmarc td { border: 0; padding : 2px; vertical-align: top; } \ No newline at end of file diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl index 81fbfc8..4285698 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl @@ -231,8 +231,8 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
Tags from this library: -
    -
  • &q="> ()
    • + Tags from this library:
    No tags from this library for this title.
    -- 1.7.3 From paul.poulain at biblibre.com Tue Jan 4 22:48:21 2011 From: paul.poulain at biblibre.com (Paul Poulain) Date: Tue, 04 Jan 2011 22:48:21 +0100 Subject: [Koha-patches] pull request for bug 5574 Message-ID: <4D2395A5.8090904@biblibre.com> The following changes since commit 718473bdd2f156544e7f254fa7adce2890c51e2a: Merge remote branch 'colin/QA/bug_4506' into new/enh/bug_4506 (2010-12-14 21:07:15 +1300) are available in the git repository at: git://git.biblibre.com/koha_biblibre.git remotes/origin/3.4/BibLibre-cataloguing-recommited Paul Poulain (18): Order cancelling improvement : delete attached items & biblio Fixes leading zeroes in Add Mulpiple Copies NormalizeString POD Fixing and variable renaming C4/Items.pm changes & improvements MT4586: Use zebra instead of mysql for publisher and collectiontitle searches don't discard $3 when building a record (UNIMARC specific) MT4004 : additem.pl Some Status were not defaulted to the correct value Status 0 was lost because test was done on value and not on the fact that a value was defined or not. when value is 0 then it was not used as default value for fix permission of moveitem = edit_items needed update some unimarc plugins addbiblio: removing dead code and managing new permissions unimarc plugin 210c bis to fixup MT3915: rebuild_zebra changes because deleted biblios would stick in zebra indexes missing french permission to deal with edit_items MT #2991 (Feature) Batch biblio modifications MT #4931 add the ability to choose home or holding branch in stocktaking MT1059 Follow-up : Fix merge reference selection presentation Add link to Fast cataloguing in case the scanned barcode don't exist in circulation adding some copyright BibLibre statements C4/Acquisition.pm | 3 + C4/Barcodes.pm | 9 +- C4/Biblio.pm | 182 +++++++- C4/Charset.pm | 31 +- C4/Items.pm | 73 +++- C4/Search.pm | 3 +- cataloguing/addbiblio.pl | 3 +- cataloguing/additem.pl | 472 +++++++++++--------- cataloguing/moveitem.pl | 2 +- cataloguing/value_builder/unimarc_field_010.pl | 3 +- cataloguing/value_builder/unimarc_field_210c.pl | 217 +++++----- .../value_builder/unimarc_field_210c_bis.pl | 109 +++++ cataloguing/value_builder/unimarc_field_225a.pl | 2 +- cataloguing/ysearchzebra.pl | 52 +++ .../mysql/fr-FR/1-Obligatoire/userpermissions.sql | 1 + koha-tmpl/intranet-tmpl/prog/en/js/basket.js | 6 + .../prog/en/modules/basket/basket.tmpl | 5 + .../prog/en/modules/cataloguing/addbiblio.tmpl | 44 +- .../prog/en/modules/cataloguing/additem.tmpl | 1 + .../prog/en/modules/cataloguing/merge.tmpl | 4 +- .../value_builder/unimarc_field_210c_bis.tmpl | 73 +++ .../prog/en/modules/cataloguing/z3950_search.tmpl | 2 +- .../prog/en/modules/circ/circulation.tmpl | 1 + .../prog/en/modules/tools/batchedit.tmpl | 231 ++++++++++ .../prog/en/modules/tools/inventory.tmpl | 6 + misc/migration_tools/rebuild_zebra.pl | 27 +- tools/batchedit.pl | 222 +++++++++ tools/inventory.pl | 4 +- 28 files changed, 1357 insertions(+), 431 deletions(-) create mode 100755 cataloguing/value_builder/unimarc_field_210c_bis.pl create mode 100644 cataloguing/ysearchzebra.pl create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c_bis.tmpl create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchedit.tmpl create mode 100755 tools/batchedit.pl -- Paul POULAIN http://www.biblibre.com Expert en Logiciels Libres pour l'info-doc Tel : (33) 4 91 81 35 08 From paul.poulain at biblibre.com Tue Jan 4 22:58:18 2011 From: paul.poulain at biblibre.com (Paul Poulain) Date: Tue, 04 Jan 2011 22:58:18 +0100 Subject: [Koha-patches] Request to pull for bug 5575 Message-ID: <4D2397FA.1070701@biblibre.com> The following changes since commit 718473bdd2f156544e7f254fa7adce2890c51e2a: Merge remote branch 'colin/QA/bug_4506' into new/enh/bug_4506 (2010-12-14 21:07:15 +1300) are available in the git repository at: git://git.biblibre.com/koha_biblibre.git remotes/origin/3.4/BibLibre-memb-circ-upd-recommited Paul Poulain (59): MT1874 adding note and manager_id fields to accountlines MT4588: Adds coins informations to intranet MT2285 + Perf enhancement : C4/SQLHelper.pm When No ccodes, then moredetail show error 500 MT3138 : Adding permissions on viewlog MT3531: Intranet cart is emptied when session is closed (MT3625) Fix column order in issue history updating some references from koha.org to koha-community.org MT4095 add exact matching filter for categorycode and branchcode fields in search members's result MT1416 Fix borrower address display in intranet The display of borrower adresses composed of streetnumber, streettype and address was broken. MT3828 fixing filters on result page for patrons search During a search for a patron with filters selected, on the result page the filters disappeared, this patch fixes the bug MT2690 fix members-home MT1874 adding note and manager_id fields to accountlines MT2263 Change debarring system MT3747: Shows member relatives (guaranteeds) in issues lists MT 4096 Fix gurantor pop-up closing for adults displaying 2nd email if there is one MT3137 : Adding jquery.tablesorter and jquery.tablesorter.pager support for readingrec.pl MT #4584 Add duplicate support for borrowers : adding the link on the toolbar MT 2285 : enhancement for patronSearch MT 2263 Change debarring system Now when a user is debarred, you set a end date, and can put a comment. If an overdue generate a debar, the debar date is set to 9999-12-31. adding display_checkout field in extended attributes types MT2894 Adds a download link for big error reports to import_borrowers MT3113 : Showing cards should use marcflavour MT4588: Adds coins to intranet Adds coins also in search result list MT2631 adds sysprefs for MARC or ISBD display in OPAC MT4316 AdvancedSearchContent new feature (OPACAdvancedSearchContent) intranet stylesheet changing shelf to list MT3138 : Adding permissions on viewlog+change in display adding a class to index " /> - +
    - - - - - - - - @@ -254,35 +243,105 @@ $(function() { - - - - +
     Item TypeTitleAuthorYearLocation
    "> - "> "> + + " title="View details for this title"> + + " title="View details for this title"> + " title="View details for this title"> + + + No title + by " title="Search for works by this author" class="author"> +   + + Publication: + + + . + , + + + Holdings: + , + + ()., + + This record has no items. + + + + +
    + Tags: + + + + +
    " method="post" action="/cgi-bin/koha/opac-tags.pl"> + + " id="newtag" maxlength="100" /> + " type="submit" value="Add" /> +
    + _status" class="tagstatus" style="display:none;"> + Tag status here. + + Log in to add tags. + + + +
    + + + +Actions: + + + + + ">Place Hold + + + ">Place Hold + + + + + + + " onclick="Dopop('opac-addbybiblionumber.pl?biblionumber='); return false;">Save to another list + + + '); return false;">Add to Cartnocart + + + + ">
    _status" class="tagstatus results_summary" style="display:none">Tag status here.
    		 - - - - - - - -

    - , - - () - -

    - This record has no items. -     		+ "> + .01.TZZZZZZZ.jpg" alt="" class="thumbnail" />No cover image available + + + /SC.GIF&client=&type=xw10&upc=&oclc=" alt="" class="thumbnail" /> + + /SC.GIF&client=&type=xw10&upc=&oclc=" alt="" class="thumbnail" /> + +
    " class="" id="gbs-thumbnail">
    No cover image available +     + ">See Baker & Taylor" />No cover image available +
    +
    +
    This List is empty. You can add to your lists from the results of any search!
    @@ -342,14 +401,14 @@ $(function() {

    Lists

    @@ -363,12 +422,10 @@ $(function() { - - @@ -379,9 +436,7 @@ $(function() { - - +
    List Name ContentsSort by Type  
    &sortfield="> item(s)AuthorYearTitle - itemitemsEmpty Private Public @@ -411,6 +466,7 @@ $(function() {
    +
    No Private Lists. @@ -433,12 +489,10 @@ $(function() {
    Log in to create new Lists.
    - - @@ -448,9 +502,7 @@ $(function() { - - +
    List Name ContentsSort by Type 
    &sortfield="> item(s)AuthorYearTitle - itemitem(s) Private Public @@ -478,6 +530,7 @@ $(function() {
    +
    No Public Lists. diff --git a/koha-tmpl/opac-tmpl/prog/images/download.png b/koha-tmpl/opac-tmpl/prog/images/download.png index bf1394d0c3a442ff33170c608aabe262ce0851c5..0d5bcb89a59037437ffceaa95099057b805c46b3 100644 GIT binary patch delta 345 zcmey!w32y3WPL?|Pl&6cfBn~A{}lb}mL9yT6xgJjFtKj-_OIVAzWDT4Ewr_6*7o0j z|7*weKKk(I{kMO52@^xAm+UzI%pq^i|NsA=fBLH((-%^+C<*cl2AV|- zVA!`xPXef?+0(@_q~camKzMj~Kmfxe2F4={M|=(`2q`o;L`<5^>cPY!(7dZ>kImve zJj<;d7z|gOKK1dWr}ybq%q#){)7)E}V?ttOgA^Jhu84|8R{j(fy~@bc(dZi*8p_nM zlYyzj(bZLwBXr7Cps1rmXRN2E=Y&Wekn$^6mb5HsP;qErWTOV delta 289 zcmV++0p9+p1MvcoS$}mxhTQ4)A5DBHSc*MtoF!F- z-0Ao3_WgL4v`%-S?)LuO>Gq<(+xz|h=<@t8VwFB at o9OcWBT<3%`u^|s{vuI=VTGwC zRfXd4{Pp(GD_o5sPk$?1j From: Owen Leonard Signed-off-by: Nicole Engard --- koha-tmpl/opac-tmpl/prog/en/css/opac.css | 5 +++-- .../opac-tmpl/prog/en/modules/opac-detail.tmpl | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css index 68cc572..4c7d6ad 100644 --- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css @@ -595,6 +595,8 @@ input.deleteshelf:active { text-decoration: none; } +#tagslist li { display : inline; } + #placehold input.submit:hover, #tagsel_span input.submit:hover { color: #990033; @@ -2003,5 +2005,4 @@ div.ft { #plainmarc table { border: 0; margin: .7em 0 0 0; font-family: monospace; font-size: 95%; } #plainmarc th { background-color : #FFF; border: 0; white-space: nowrap; text-align:left; vertical-align: top; padding: 2px; } -#plainmarc td { border: 0; padding : 2px; vertical-align: top; } - +#plainmarc td { border: 0; padding : 2px; vertical-align: top; } \ No newline at end of file diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl index 81fbfc8..4285698 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl @@ -231,8 +231,8 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
    Tags from this library: -
      -
    • &q="> ()
      • + Tags from this library:
      No tags from this library for this title.
      -- 1.5.6.5 From f.demians at tamil.fr Wed Jan 5 11:45:52 2011 From: f.demians at tamil.fr (=?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=) Date: Wed, 5 Jan 2011 11:45:52 +0100 Subject: [Koha-patches] [PATCH] Bug 3212 Force leader 9 position to 'a' for new biblios Message-ID: <1294224352-19031-1-git-send-email-f.demians@tamil.fr> When Creating a new biblio record, if the cataloguer doesn't use the leader plugin, a biblio record can be saved with a leader not containing a 'a' in 9 position. If the biblio contains UTF-8 characters, its decoding can fail. This issue applies to MARC-21 not UNIMARC. --- C4/Biblio.pm | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/C4/Biblio.pm b/C4/Biblio.pm index c3a3094..881085e 100644 --- a/C4/Biblio.pm +++ b/C4/Biblio.pm @@ -1901,8 +1901,13 @@ sub TransformHtmlToMarc { if ( $tag < 10 ) { # no code for theses fields # in MARC editor, 000 contains the leader. if ( $tag eq '000' ) { - $record->leader( $cgi->param( $params->[ $j + 1 ] ) ) if length( $cgi->param( $params->[ $j + 1 ] ) ) == 24; - + # Force a fake leader even if not provided to avoid crashing + # during decoding MARC record containing UTF-8 characters + $record->leader( + length( $cgi->param($params->[$j+1]) ) == 24 + ? $cgi->param( $params->[ $j + 1 ] ) + : ' nam a22 4500' + ; # between 001 and 009 (included) } elsif ( $cgi->param( $params->[ $j + 1 ] ) ne '' ) { $newfield = MARC::Field->new( $tag, $cgi->param( $params->[ $j + 1 ] ), ); -- 1.7.3.2 From oleonard at myacpl.org Wed Jan 5 15:51:33 2011 From: oleonard at myacpl.org (Owen Leonard) Date: Wed, 5 Jan 2011 09:51:33 -0500 Subject: [Koha-patches] [PATCH] [REVISED] Fix for Bug 3347 - Inconsistencies with tables in opac-shelves.tmpl Message-ID: <1294239094-11246-1-git-send-email-oleonard@myacpl.org> Changes to list contents view to make it consistent with search results My intention is to make the OPAC more consistent in the way it displays lists of items, whether it be in search results, lists, etc. This patch adds data to the list contents output and reformats it to that end. The other significant change is the removal of jQuery table sorting. Since list contents are both sorted and paginated on the server side. Adding a client-side sort to one page of many doesn't make sense. Other changes include: - Change "Your lists" to "Your private lists" - Remove "sort by" column because it seems unnecessary - Adding logic to control display of count (item or items rather than item(s) - Styling pagination bar and placing at the bottom of the page, consistent with other instances of pagination navigation --- C4/VirtualShelves.pm | 3 +- C4/VirtualShelves/Page.pm | 34 +++- koha-tmpl/opac-tmpl/prog/en/css/opac.css | 55 ++---- .../opac-tmpl/prog/en/modules/opac-shelves.tmpl | 190 +++++++++++++------- koha-tmpl/opac-tmpl/prog/images/download.png | Bin 369 -> 425 bytes 5 files changed, 171 insertions(+), 111 deletions(-) diff --git a/C4/VirtualShelves.pm b/C4/VirtualShelves.pm index 61dbacc..77ae394 100644 --- a/C4/VirtualShelves.pm +++ b/C4/VirtualShelves.pm @@ -125,6 +125,7 @@ sub GetShelves ($$$$) { $firstname, $category, $sortfield, $count ) = $sth2->fetchrow ) { $shelflist{$shelfnumber}->{'shelfname'} = $shelfname; $shelflist{$shelfnumber}->{'count'} = $count; + if($count eq 1){ $shelflist{$shelfnumber}->{'single'} = 1; } $shelflist{$shelfnumber}->{'sortfield'} = $sortfield; $shelflist{$shelfnumber}->{'category'} = $category; $shelflist{$shelfnumber}->{'owner'} = $owner; @@ -265,7 +266,7 @@ sub GetShelfContents ($;$$$) { } my $query = " SELECT vc.biblionumber, vc.shelfnumber, vc.dateadded, itemtypes.*, - biblio.*, biblioitems.itemtype, biblioitems.publicationyear + biblio.*, biblioitems.itemtype, biblioitems.publicationyear, biblioitems.publishercode, biblioitems.place, biblioitems.size, biblioitems.pages FROM virtualshelfcontents vc LEFT JOIN biblio ON vc.biblionumber = biblio.biblionumber LEFT JOIN biblioitems ON biblio.biblionumber = biblioitems.biblionumber diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm index 80d8f3c..d6d0f7f 100644 --- a/C4/VirtualShelves/Page.pm +++ b/C4/VirtualShelves/Page.pm @@ -31,6 +31,7 @@ use C4::Auth qw/get_session/; use C4::Members; use C4::Output; use C4::Dates qw/format_date/; +use C4::Tags qw(get_tags); use Exporter; use Data::Dumper; use C4::Csv; @@ -61,6 +62,7 @@ sub shelfpage ($$$$$) { my $itemoff = ( $query->param('itemoff') ? $query->param('itemoff') : 1 ); my $displaymode = ( $query->param('display') ? $query->param('display') : 'publicshelves' ); my ( $shelflimit, $shelfoffset, $shelveslimit, $shelvesoffset ); + my $marcflavour = C4::Context->preference("marcflavour"); # FIXME: These limits should not be hardcoded... $shelflimit = 20; # Limits number of items returned for a given query @@ -177,19 +179,20 @@ sub shelfpage ($$$$$) { # explicitly fetch this shelf my ($shelfnumber2,$shelfname,$owner,$category,$sorton) = GetShelf($shelfnumber); + $template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') ); + if (C4::Context->preference('TagsEnabled')) { + $template->param(TagsEnabled => 1); + foreach (qw(TagsShowOnList TagsInputOnList)) { + C4::Context->preference($_) and $template->param($_ => 1); + } + } #check that the user can view the shelf if ( ShelfPossibleAction( $loggedinuser, $shelfnumber, 'view' ) ) { my $items; my $authorsort; my $yearsort; - my $sortfield; - if ( $query->param('sortfield')) { - $sortfield = $query->param('sortfield'); - } elsif ($sorton) { - $sortfield = $sorton; - } else { - $sortfield = 'title'; - } + my $tag_quantity; + my $sortfield = ( $query->param('sortfield') ? $query->param('sortfield') : 'title' ); if ( $sortfield eq 'author' ) { $authorsort = 'author'; } @@ -208,11 +211,22 @@ sub shelfpage ($$$$$) { $this_item->{'imageurl'} = getitemtypeinfo( $this_item->{'itemtype'} )->{'imageurl'}; $this_item->{'coins'} = GetCOinSBiblio( $this_item->{'biblionumber'} ); $this_item->{'subtitle'} = GetRecordValue('subtitle', $record, GetFrameworkCode($this_item->{'biblionumber'})); - + $this_item->{'normalized_upc'} = GetNormalizedUPC( $record,$marcflavour); + $this_item->{'normalized_ean'} = GetNormalizedEAN( $record,$marcflavour); + $this_item->{'normalized_oclc'} = GetNormalizedOCLCNumber($record,$marcflavour); + $this_item->{'normalized_isbn'} = GetNormalizedISBN(undef,$record,$marcflavour); # Getting items infos for location display my @items_infos = &GetItemsInfo( $this_item->{'biblionumber'}, $type ); + $this_item->{'itemsissued'} = CountItemsIssued( $this_item->{'biblionumber'} ); $this_item->{'ITEM_RESULTS'} = \@items_infos; + if (C4::Context->preference('TagsEnabled') and $tag_quantity = C4::Context->preference('TagsShowOnList')) { + $this_item->{'TagLoop'} = get_tags({ + biblionumber=>$this_item->{'biblionumber'}, approved=>1, 'sort'=>'-weight', + limit=>$tag_quantity + }); + } + } push @paramsloop, { display => 'privateshelves' } if $category == 1; $showadd = 1; @@ -265,7 +279,7 @@ sub shelfpage ($$$$$) { if ( my $count = scalar @$contents ) { unless ( scalar grep { /^CONFIRM-$number$/ } $query->param() ) { if ( defined $shelflist->{$number} ) { - push( @paramsloop, { need_confirm => $shelflist->{$number}->{shelfname}, count => $count } ); + push( @paramsloop, { need_confirm => $shelflist->{$number}->{shelfname}, count => $count, single => ($count eq 1 ? 1:0) } ); $shelflist->{$number}->{confirm} = $number; } else { push( @paramsloop, { need_confirm => $privshelflist->{$number}->{shelfname}, count => $count } ); diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css index 4c7d6ad..afd3ddb 100644 --- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css @@ -443,6 +443,14 @@ a .term { /* toolbar buttons */ +#toolbar { +background-color:#EEEEEE; +border:1px solid #E8E8E8; +margin : .5em 0; +padding:3px 3px 5px 5px; +vertical-align:middle; +} + #toolbar a, #toolbar input { white-space : nowrap; @@ -1093,38 +1101,9 @@ td.resultscontrol img { line-height : 1.8em; text-align: center; } -a:link.current { - background-color: transparent; - color: #3366CC; - font-weight: bold; - padding: 1px 5px 1px 5px; - text-decoration: none; -} -a:visited.current { - background-color: transparent; - color: #3366CC; - font-weight: bold; - padding: 1px 5px 1px 5px; - text-decoration: none; -} - -a:hover.current { - background-color: #CCFF00; - color: #CC3333; - font-weight: bold; - padding: 1px 5px 1px 5px; - text-decoration: none; -} - -a:active.current { - background-color: #99CC00; - color: #FFFF99; - font-weight: bold; - padding: 1px 5px 1px 5px; - text-decoration: none; -} -.current { +.current, +.currentPage { background-color: #FFFFFF; color: #3366CC; font-weight: bold; @@ -1132,7 +1111,8 @@ a:active.current { text-decoration: none; } -a:link.nav { +a:link.nav, +div.pages a:link { background-color: #EEE; border: 1px solid #CCCC99; color: #3366CC; @@ -1141,7 +1121,8 @@ a:link.nav { text-decoration: none; } -a:visited.nav { +a:visited.nav, +div.pages a:visited { background-color: #EEE; border: 1px solid #CCCC99; color: #3366CC; @@ -1150,7 +1131,8 @@ a:visited.nav { text-decoration: none; } -a:hover.nav { +a:hover.nav, +div.pages a:hover { background-color: #FFFFCC; border: 1px solid #CCCC99; color: #CC3333; @@ -1159,7 +1141,8 @@ a:hover.nav { text-decoration: none; } -a:active.nav { +a:active.nav, +div.pages a:active { background-color: #FFFFCC; border: 1px solid #CCCC99; color: #D25500; @@ -2005,4 +1988,4 @@ div.ft { #plainmarc table { border: 0; margin: .7em 0 0 0; font-family: monospace; font-size: 95%; } #plainmarc th { background-color : #FFF; border: 0; white-space: nowrap; text-align:left; vertical-align: top; padding: 2px; } -#plainmarc td { border: 0; padding : 2px; vertical-align: top; } \ No newline at end of file +#plainmarc td { border: 0; padding : 2px; vertical-align: top; } diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl index 7013a1c..3c04429 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl @@ -6,12 +6,7 @@ var MSG_NO_TAG_SPECIFIED = _("No tag was specified."); var MSG_REMOVE_FROM_LIST = _("Are you sure you want to remove these items from the list?"); var MSG_CONFIRM_DELETE_LIST = _("Are you sure you want to delete this list?"); -$.tablesorter.addParser({ - id: 'articles', - is: function(s) {return false; }, - format: function(s) { return s.toLowerCase().replace(/^(the|an|a) /,''); }, - type: 'text' -}); + function holdSelections() { var checkedBoxes = $(":checkbox:checked"); @@ -69,26 +64,17 @@ function tagAdded() { } $(function() { + $(".addtocart").show(); $("span.clearall").html(""+_('Clear All')+"<\/a>|"); $("span.checkall").html(""+_('Select All')+"<\/a>"); $("a.print").show(); + $("#placehold").html(""+_('Place Hold')+"<\/a>"); $("a.hold").click(function(){ holdSelections(); return false; }); - $("#listcontents").tablesorter({ - widgets : ['zebra'], - - sortList: [[2,0]], - - sortList: [[3,1]], - - sortList: [[1,0]], - - headers: { 0: { sorter: false },1:{sorter: 'articles'} - } - }); + $("#CheckAll").click(function(){ $(".checkboxed").checkCheckboxes(); return false; @@ -97,17 +83,38 @@ $(function() { $(".checkboxed").unCheckCheckboxes(); return false; }); + $("#addtags").click(function(){ tagSelected(); return false; }); $("#addtags").html(""+_("Tag")+"<\/a> |"); + + $(".tagbutton").click(KOHA.Tags.add_tag_button); + + + $("#tagsel_tag").click(function(){ + tagSelected(); + return false; + }); + $("#tagsel_cancel").click(function(){ + tagCanceled(); + return false; + }); $("#tagsel_button").click(function(){ tagAdded(); return false; }); - + + $("#tagsel_tag").click(function(){ + window.location = "/cgi-bin/koha/opac-user.pl"; + return false; + }); + + + + KOHA.Google.GetCoverFromIsbn(); }); function Check(f) { var _alertString=""; @@ -148,7 +155,7 @@ $(function() {
      The list is not empty. -
      It has entries. +
      It has entryentries.
      Use the "Confirm" button below to confirm deletion.
      @@ -176,7 +183,6 @@ $(function() {
      -

      Lists /../images/caret.gif" width="16" height="16" alt=">" border="0" />

      @@ -223,16 +229,8 @@ $(function() { " /> - +
      - - - - - - - - @@ -250,35 +248,105 @@ $(function() { - - - - +
       Item TypeTitleAuthorYearLocation
      "> - "> "> + + " title="View details for this title"> + + " title="View details for this title"> + " title="View details for this title"> + + + No title + by " title="Search for works by this author" class="author"> +   + + Publication: + + + . + , + + + Holdings: + , + + ()., + + This record has no items. + + + + +
      + Tags: + + + + +
      " method="post" action="/cgi-bin/koha/opac-tags.pl"> + + " id="newtag" maxlength="100" /> + " type="submit" value="Add" /> +
      + _status" class="tagstatus" style="display:none;"> + Tag status here. + + Log in to add tags. + + + +
      + + + +Actions: + + + + + ">Place Hold + + + ">Place Hold + + + + + + + " onclick="Dopop('opac-addbybiblionumber.pl?biblionumber='); return false;">Save to another list + + + '); return false;">Add to Cartnocart + + + + ">
      _status" class="tagstatus results_summary" style="display:none">Tag status here.
      		 - - - - - - - -

      - , - - () - -

      - This record has no items. -       		+ "> + .01.TZZZZZZZ.jpg" alt="" class="thumbnail" />No cover image available + + + /SC.GIF&client=&type=xw10&upc=&oclc=" alt="" class="thumbnail" /> + + /SC.GIF&client=&type=xw10&upc=&oclc=" alt="" class="thumbnail" /> + +
      " class="" id="gbs-thumbnail">
      No cover image available +       + ">See Baker & Taylor" />No cover image available +
      +
      +
      This List is empty. You can add to your lists from the results of any search!
      @@ -338,14 +406,14 @@ $(function() {

      Lists

      @@ -359,12 +427,10 @@ $(function() { - - @@ -375,9 +441,7 @@ $(function() { - - +
      List Name ContentsSort by Type  
      &sortfield="> item(s)AuthorYearTitle - itemitemsEmpty Private Public @@ -407,6 +471,7 @@ $(function() {
      +
      No Private Lists. @@ -429,12 +494,10 @@ $(function() {
      Log in to create new Lists.
      - - @@ -444,9 +507,7 @@ $(function() { - - +
      List Name ContentsSort by Type 
      &sortfield="> item(s)AuthorYearTitle - itemitem(s) Private Public @@ -474,6 +535,7 @@ $(function() {
      +
      No Public Lists. diff --git a/koha-tmpl/opac-tmpl/prog/images/download.png b/koha-tmpl/opac-tmpl/prog/images/download.png index bf1394d0c3a442ff33170c608aabe262ce0851c5..0d5bcb89a59037437ffceaa95099057b805c46b3 100644 GIT binary patch delta 345 zcmey!w32y3WPL?|Pl&6cfBn~A{}lb}mL9yT6xgJjFtKj-_OIVAzWDT4Ewr_6*7o0j z|7*weKKk(I{kMO52@^xAm+UzI%pq^i|NsA=fBLH((-%^+C<*cl2AV|- zVA!`xPXef?+0(@_q~camKzMj~Kmfxe2F4={M|=(`2q`o;L`<5^>cPY!(7dZ>kImve zJj<;d7z|gOKK1dWr}ybq%q#){)7)E}V?ttOgA^Jhu84|8R{j(fy~@bc(dZi*8p_nM zlYyzj(bZLwBXr7Cps1rmXRN2E=Y&Wekn$^6mb5HsP;qErWTOV delta 289 zcmV++0p9+p1MvcoS$}mxhTQ4)A5DBHSc*MtoF!F- z-0Ao3_WgL4v`%-S?)LuO>Gq<(+xz|h=<@t8VwFB at o9OcWBT<3%`u^|s{vuI=VTGwC zRfXd4{Pp(GD_o5sPk$?1j This patch adds javascript which pulls the values from the chosen row of data and populates the last row's form with that data. Some changes have been made to the markup to better accommodate this. Possibly missing is some kind of visual feedback to the user that the edit action is taking place in a different row from where they clicked. Comments are especially welcomed on this aspect of the interaction. --- .../prog/en/modules/admin/smart-rules.tmpl | 42 +++++++++++++------- 1 files changed, 27 insertions(+), 15 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tmpl index 43ad653..0337e72 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tmpl @@ -9,6 +9,16 @@ $(document).ready(function() { $('#branch').change(function() { $('#selectlibrary').submit(); }); + $(".editrule").click(function(){ + $(this).parent().parent().find("td").each(function (i) { + itm = $(this).text(); + itm = itm.replace(/^\s*|\s*$/g,''); + $("#default-circulation-rules tr:last td:eq("+i+") input").val(itm); + $("#default-circulation-rules tr:last td:eq("+i+") select").val(itm); + $("#default-circulation-rules tr:last td:last input").val(_("Save")); + }); + return false; + }); }); //]]> @@ -57,11 +67,12 @@ $(document).ready(function() {
      " /> -
      +
      - + "/> +
      @@ -74,7 +85,7 @@ $(document).ready(function() { - + @@ -108,6 +119,7 @@ $(document).ready(function() { + @@ -115,7 +127,7 @@ $(document).ready(function() { - - - - - - - - - - + + + + + + + + + +
      Patron Category Item TypeRenewals Allowed (count) Holds Allowed (count) Rental Discount (%)  
      Edit &categorycode=&branch=">Delete
      - @@ -123,23 +135,23 @@ $(document).ready(function() { - "/>
      -- 1.7.3 From oleonard at myacpl.org Wed Jan 5 16:20:05 2011 From: oleonard at myacpl.org (Owen Leonard) Date: Wed, 5 Jan 2011 10:20:05 -0500 Subject: [Koha-patches] [PATCH] Fix for Bug 4950 - checkbox should be removed when can't place a hold Message-ID: <1294240805-2862-1-git-send-email-oleonard@myacpl.org> - Hiding form controls for titles which can't be placed on hold - Highlighting hold blocked message for better visibility - Showing table of blocked holds even if none can be placed on hold: hiding the table hides the messages explaining why titles can't be placed on hold - Removing an unused line from the script which was leaving errors in the error log - Consolidating error messages into one box which were displaying in two. - Correcting link to unused opac-userdetails.pl --- koha-tmpl/opac-tmpl/prog/en/css/opac.css | 5 +- .../opac-tmpl/prog/en/modules/opac-reserve.tmpl | 366 ++++++++++---------- opac/opac-reserve.pl | 10 +- 3 files changed, 188 insertions(+), 193 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css index 4c7d6ad..4e12660 100644 --- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css @@ -1425,6 +1425,7 @@ div#changelanguage{ color : #666; font-size : 85%; padding : 1em; + margin-top : 2em; } div#changelanguage a { @@ -2005,4 +2006,6 @@ div.ft { #plainmarc table { border: 0; margin: .7em 0 0 0; font-family: monospace; font-size: 95%; } #plainmarc th { background-color : #FFF; border: 0; white-space: nowrap; text-align:left; vertical-align: top; padding: 2px; } -#plainmarc td { border: 0; padding : 2px; vertical-align: top; } \ No newline at end of file +#plainmarc td { border: 0; padding : 2px; vertical-align: top; } +div.bibmessage { background-color : #ffffb0; border-radius : 5px; padding : 3px; margin : 2px; } + diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl index 52ff4cd..b496e81 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl @@ -160,27 +160,23 @@
      - - + -
      - Sorry, you cannot place holds because the library doesn't have up-to-date contact information on file. -
      -
      Please contact your librarian, or use the online update form to submit current information (Please note: there may be a delay in restoring your account if you submit online) +
      +

      Sorry, you cannot place holds because the library doesn't have up-to-date contact information on file.

      +

      Please contact your librarian, or use the online update form to submit current information (Please note: there may be a delay in restoring your account if you submit online)

      -
      - Sorry, you cannot place holds because your library card has been marked as lost or stolen. -
      -
      If this is an error, please take your card to the circulation desk at your local library and the error will be corrected. +
      +

      Sorry, you cannot place holds because your library card has been marked as lost or stolen.

      +

      If this is an error, please take your card to the circulation desk at your local library and the error will be corrected.

      -
      - Sorry, you cannot place holds because your account has been frozen. -
      -
      Usually the reason for freezing an account is old overdues or damage fees. If your account page shows your account to be clear, please consult a librarian. +
      +

      Sorry, you cannot place holds because your account has been frozen.

      +

      Usually the reason for freezing an account is old overdues or damage fees. If your account page shows your account to be clear, please consult a librarian.

      @@ -211,18 +207,18 @@
      ERROR: Internal error: incomplete hold request.
      + -
      Sorry, none of these items can be placed on hold. -
      - +
      Sorry, none of these items can be placed on hold. +
      + - -

      Confirm holds for: - - () - -

      +

      Confirm holds for: + + () + +

      @@ -232,8 +228,8 @@
      - - + + @@ -251,12 +247,12 @@ - + - - + + - - - - - - + + + + - + - - - - - + + + + + - + - + "> @@ -521,18 +512,17 @@
      Hold
      Hold Title Item Type Pickup Location
      Title
      + "/> "> @@ -269,175 +265,170 @@ - - "/> - "> - - " - name="" disabled="disabled" - id="" - value="any" /> - - +   + "> + , by + + +
      You have already requested this title.
      - - -
      No available items.
      -
      This title cannot be requested.
      + +
      No available items.
      + +
      This title cannot be requested.
      + + + + +       		- "> - , by - - - " alt="" /> - - - out of + " alt="" /> + + out of - " id="reserve_date_" size="10"> - - + " id="reserve_date_" size="10"> + + - " id="expiration_date_" size="10" readonly="readonly" /> - /lib/calendar/cal.gif" alt="Show Calendar" border="0" id="CalendarExpirationDate_" style="cursor: pointer;" /> - -

      - ').value='';return false;">Clear Date

      -       		+ " id="expiration_date_" size="10" readonly="readonly" /> + /lib/calendar/cal.gif" alt="Show Calendar" border="0" id="CalendarExpirationDate_" style="cursor: pointer;" /> + +

      + ').value='';return false;">Clear Date

      +       		- - + +
      +
      - - - + + - + +
      - -
      diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl index 699179b..fca1e0b 100755 --- a/opac/opac-reserve.pl +++ b/opac/opac-reserve.pl @@ -289,6 +289,7 @@ my $notforloan_label_of = get_notforloan_label_of(); my $biblioLoop = []; my $numBibsAvailable = 0; my $itemdata_enumchron = 0; +my $anyholdable; my $itemLevelTypes = C4::Context->preference('item-level_itypes'); $template->param('item-level_itypes' => $itemLevelTypes); @@ -336,8 +337,6 @@ foreach my $biblioNum (@biblionumbers) { } } - $biblioLoopIter{itemTypeDescription} = $itemTypes->{$biblioData->{itemtype}}{description}; - $biblioLoopIter{itemLoop} = []; my $numCopiesAvailable = 0; foreach my $itemInfo (@{$biblioData->{itemInfos}}) { @@ -455,19 +454,22 @@ foreach my $biblioNum (@biblionumbers) { $numBibsAvailable++; $biblioLoopIter{bib_available} = 1; $biblioLoopIter{holdable} = 1; + $anyholdable = 1; } if ($biblioLoopIter{already_reserved}) { $biblioLoopIter{holdable} = undef; + $anyholdable = undef; } if(not CanBookBeReserved($borrowernumber,$biblioNum)){ $biblioLoopIter{holdable} = undef; + $anyholdable = undef; } push @$biblioLoop, \%biblioLoopIter; } -if ( $numBibsAvailable == 0 ) { - $template->param( none_available => 1, message => 1 ); +if ( $numBibsAvailable == 0 || !$anyholdable) { + $template->param( none_available => 1 ); } my $itemTableColspan = 5; -- 1.7.3 From oleonard at myacpl.org Wed Jan 5 16:24:14 2011 From: oleonard at myacpl.org (Owen Leonard) Date: Wed, 5 Jan 2011 10:24:14 -0500 Subject: [Koha-patches] [PATCH] Fix for Bug 4984, Invalid XHTML in staff client search results Message-ID: <1294241054-3104-1-git-send-email-oleonard@myacpl.org> --- .../intranet-tmpl/prog/en/includes/facets.inc | 6 +++--- .../prog/en/includes/page-numbers.inc | 6 +++--- .../prog/en/modules/catalogue/results.tmpl | 19 ++++++++++--------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc index c306c89..95d912d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc @@ -3,7 +3,7 @@

      Refine your search

        -
      • Availability +
      • Availability
      • (related searches: )
        • @@ -17,8 +17,8 @@ Series Libraries diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc index e7e6d0e..a9b8575 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc @@ -1,7 +1,7 @@
        - &offset=&sort_by="><< Previous - &offset=&sort_by="> + &offset=&sort_by="><< Previous + &offset=&sort_by="> - &offset=&sort_by=">Next >> + &offset=&sort_by=">Next >>
        diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl index 36b1fb7..669a949 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl @@ -321,10 +321,10 @@ function GetZ3950Terms(){ - -
        -
        + +
        +
        @@ -356,10 +356,11 @@ function GetZ3950Terms(){ -
        + +
        @@ -386,7 +387,7 @@ function GetZ3950Terms(){ "> - http://images.amazon.com/images/P/.01.TZZZZZZZ.jpghttp://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif" alt="image" class="thumbnail" /> + http://images.amazon.com/images/P/.01.TZZZZZZZ.jpghttp://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif" alt="" class="thumbnail" /> @@ -441,7 +442,7 @@ function GetZ3950Terms(){

        - " /> + " alt="" />

        @@ -469,7 +470,7 @@ function GetZ3950Terms(){
          -
        • " title="" />
        • +
        • " title="" alt="" />
        • [">] @@ -483,7 +484,7 @@ function GetZ3950Terms(){
        • -
        • " title="" /> +
        • " title="" alt="" />
        • @@ -500,7 +501,7 @@ function GetZ3950Terms(){
        • -
        • " title="" /> +
        • " title="" alt="" />
        • -- 1.7.3 From oleonard at myacpl.org Wed Jan 5 16:28:59 2011 From: oleonard at myacpl.org (Owen Leonard) Date: Wed, 5 Jan 2011 10:28:59 -0500 Subject: [Koha-patches] [PATCH] Fix for Bug 5006 - Invalid XHTML in record matching rules template Message-ID: <1294241339-3347-1-git-send-email-oleonard@myacpl.org> - Rework JavaScript clone routines to use jQuery, to take label "for" into account, to handle incrementing label, and to properly place cloned blocks at the bottom of the group - Rework JavaScript delete routines to use jQuery, to take block label numbers into account, and to show the "add" link if you have deleted the last block. - Correcting markup which nests
          inside
          - Ensuring labels' "for" attribute matches input IDs - Adding "required" style to required fields --- .../intranet-tmpl/prog/en/css/staff-global.css | 1 + .../prog/en/modules/admin/matching-rules.tmpl | 273 ++++++++++---------- 2 files changed, 135 insertions(+), 139 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css index 9cc5ba0..b6d439d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -1919,3 +1919,4 @@ ul.budget_hierarchy li:first-child:after { padding : 1em; margin : 1em 0; } +fieldset.rows+h3 {clear:both;padding-top:.5em;} diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tmpl index bfa2ed9..d0b9a20 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tmpl @@ -20,75 +20,91 @@ var maxMatchPoint = ; var maxMatchCheck = ; function InsertMatchpoint(loc, index) { - var original= document.getElementById(index); - var clone = original.cloneNode(true); - clone.style.display = 'block'; + var original= $("#"+index); + var clone = original.clone(); + clone.show(); // update IDs and form names maxMatchPoint++; - clone.setAttribute('id', 'mp_' + maxMatchPoint); - var divs = clone.getElementsByTagName('div'); - for (var i = 0; i < divs.length; i++) { - var s = divs[i].getAttribute('id'); + clone.attr('id', 'mp_' + maxMatchPoint); + $("span.counter",clone).html(maxMatchPoint); + $("label",clone).each(function(){ + var s = $(this).attr("for"); if (s.match(/mp_num/)) { - divs[i].setAttribute('id', s.replace(/mp_num/, 'mp_' + maxMatchPoint)); + $(this).attr("for",s.replace(/mp_num/, 'mp_' + maxMatchPoint)); } - } - var inputs = clone.getElementsByTagName('input'); - for (var i = 0; i < inputs.length; i++) { - var s = inputs[i].getAttribute('id'); + }); + + $("div",clone).each(function(){ + var s = $(this).attr("id"); if (s.match(/mp_num/)) { - inputs[i].setAttribute('id', s); - inputs[i].setAttribute('id', s.replace(/mp_num/, 'mp_' + maxMatchPoint)); + $(this).attr("id",s.replace(/mp_num/, 'mp_' + maxMatchPoint)); } - var s = inputs[i].getAttribute('name'); - if (s.match(/mp_num/)) { - inputs[i].setAttribute('name', s.replace(/mp_num/, 'mp_' + maxMatchPoint)); + }); + $("input",clone).each(function(){ + var s = $(this).attr("id"); + if(s.match(/mp_num/)){ + $(this).attr("id",s.replace(/mp_num/, 'mp_' + maxMatchPoint)); } - } - loc.parentNode.parentNode.insertBefore(clone, loc.nextSibling); + var s = $(this).attr("name"); + if(s.match(/mp_num/)){ + $(this).attr("name",s.replace(/mp_num/, 'mp_' + maxMatchPoint)); + } + }); + $("#match_points").append(clone); } function InsertMatchcheck(loc, index) { - var original= document.getElementById(index); - var clone = original.cloneNode(true); - clone.style.display = 'block'; + var original= $("#"+index); + var clone = original.clone(); + clone.show(); // update IDs and form names maxMatchCheck++; - clone.setAttribute('id', 'mc_' + maxMatchCheck); - var divs = clone.getElementsByTagName('div'); - for (var i = 0; i < divs.length; i++) { - var s = divs[i].getAttribute('id'); + clone.attr('id', 'mc_' + maxMatchCheck); + $("span.counter",clone).html(maxMatchCheck); + $("label",clone).each(function(){ + var s = $(this).attr("for"); if (s.match(/mc_num/)) { - divs[i].setAttribute('id', s.replace(/mc_num/, 'mc_' + maxMatchCheck)); + $(this).attr("for",s.replace(/mc_num/, 'mc_' + maxMatchCheck)); } - } - var inputs = clone.getElementsByTagName('input'); - for (var i = 0; i < inputs.length; i++) { - var s = inputs[i].getAttribute('id'); + }); + + $("div",clone).each(function(){ + var s = $(this).attr("id"); if (s.match(/mc_num/)) { - inputs[i].setAttribute('id', s); - inputs[i].setAttribute('id', s.replace(/mc_num/, 'mc_' + maxMatchCheck)); + $(this).attr("id",s.replace(/mc_num/, 'mc_' + maxMatchCheck)); } - var s = inputs[i].getAttribute('name'); - if (s.match(/mc_num/)) { - inputs[i].setAttribute('name', s.replace(/mc_num/, 'mc_' + maxMatchCheck)); + }); + $("input",clone).each(function(){ + var s = $(this).attr("id"); + if(s.match(/mc_num/)){ + $(this).attr("id",s.replace(/mc_num/, 'mc_' + maxMatchCheck)); } - } - loc.parentNode.parentNode.insertBefore(clone, loc.nextSibling); + var s = $(this).attr("name"); + if(s.match(/mc_num/)){ + $(this).attr("name",s.replace(/mc_num/, 'mc_' + maxMatchCheck)); + } + }); + $("#match_checks").append(clone); } function DeleteMatchpoint(loc) { - var parentdiv = loc.parentNode.parentNode.parentNode; - parentdiv.parentNode.removeChild(parentdiv); + $(loc).parent().parent().parent().remove(); + if($(".matchgroup",$("#match_points")).length == 0){ + maxMatchPoint = 0; + $("#addMatchPoint").show(); + } } function DeleteMatchcheck(loc) { - var parentdiv = loc.parentNode.parentNode.parentNode; - parentdiv.parentNode.removeChild(parentdiv); + $(loc).parent().parent().parent().remove(); + if($(".matchgroup",$("#match_checks")).length == 0){ + maxMatchCheck = 0; + $("#addMatchCheck").show(); + } } function DoCancel(f) { @@ -145,7 +161,11 @@ function CheckRuleForm(f) { //]]> @@ -188,27 +208,31 @@ function CheckRuleForm(f) { " /> - - + + Required
          • -
        • +
        • " /> + value="" /> Required
          • -
        • +
        • " /> + value="" /> Required
          • -
          - Match points Add matchpoint + +
          +

          Match points

          + +

          Add match point

          + -
          "> +
          " class="matchgroup">
          - Remove this matchpoint + Match Point | ', 'mp_template'); return false;">Add match point | Remove this match point
          1. @@ -224,9 +248,10 @@ function CheckRuleForm(f) { value="" maxlength="5" />
            2. +
          -
          _c_"> -
          +
          _c_"> + Matchpoint components
          1. @@ -256,29 +281,28 @@ function CheckRuleForm(f) { value="" size="5" maxlength="5" />
            2. - -
            _c__n_"> -
          2. - + +
          3. _c__n_"> + _c__n___norm" name="mp__c__n__norm" value="" size="20" maxlength="50" />
            4. -
            - +
          -
          - +
          +
          +
          -
        + -
        +
        - Remove this matchpoint + Match Point 1 | Add match point | Remove this match point
        1. @@ -289,8 +313,9 @@ function CheckRuleForm(f) {
          2. -
          -
          +
        +
        + Matchpoint components
        1. @@ -308,32 +333,31 @@ function CheckRuleForm(f) {
          2. -
          -
        2. +
          4. -
        -
        +
        + +
        - + -
        - -
        - Required match checks Add match check + +
        +

        Required match checks

        + +

        Add match check

        + -
        "> -
        - Remove this match check +
        "> + Match check ', 'mc_template'); return false;">Add match check | Remove this match check _id" name="mc__id" value="1" /> -
          -
          _src_c_"> -
          +
          _src_c_"> Source (incoming) record check field
          1. @@ -365,23 +389,19 @@ function CheckRuleForm(f) { size="5" maxlength="5" />
            2. -
            _src_c__n_"> -
          2. +
          3. _src_c__n_"> _src_c__n__norm" name="mc__src_c__n__norm" value="" size="20" maxlength="50" />
            4. -
          -
          -
          _tgt_c_"> -
          +
          _tgt_c_"> Target (database) record check field
          1. @@ -413,32 +433,25 @@ function CheckRuleForm(f) { size="5" maxlength="5" />
            2. -
            _tgt_c__n_"> -
          2. +
          3. _tgt_c__n_"> _tgt_c__n__norm" name="mc__tgt_c__n__norm" value="" size="20" maxlength="50" />
            4. -
          -
          -
        -
        -
        +
        - Remove this match check + Match check 1 | Add match check | Remove this match check -
          -
          -
          +
          Source (incoming) record check field
          1. @@ -457,17 +470,14 @@ function CheckRuleForm(f) {
            2. -
            -
          2. +
            4. -
          -
          -
          -
          + +
          Target (database) record check field
          1. @@ -486,17 +496,14 @@ function CheckRuleForm(f) {
            2. -
            -
          2. +
            4. -
          -
          -
        +
        @@ -576,9 +583,9 @@ function CheckRuleForm(f) { -
        -
        - +
        +
      -
    - -  page(s) : - /prog/img/first.png" class="first"/> - /prog/img/prev.png" class="prev"/> +
    +  page(s) : + /prog/img/first.png" class="first" alt="" /> + /prog/img/prev.png" class="prev" alt="" /> - /prog/img/next.png" class="next"/> - /prog/img/last.png" class="last"/> + /prog/img/next.png" class="next" alt="" /> + /prog/img/last.png" class="last" alt="" /> , entries/page : - +
    + @@ -65,11 +69,17 @@ + - + + + + + + + - @@ -82,7 +92,7 @@ - - - - - - +
    Date n? Means of payment  Print
    Total due
    - &accountno=&accountlineid=">Reverse + &accountno=&accountlineid=">Reverse   @@ -98,12 +108,7 @@
    Total due
    -- 1.7.3 From oleonard at myacpl.org Thu Jan 20 20:36:39 2011 From: oleonard at myacpl.org (Owen Leonard) Date: Thu, 20 Jan 2011 14:36:39 -0500 Subject: [Koha-patches] [PATCH] [bug_5575] Restoring an important CSS property Message-ID: <1295552199-30474-1-git-send-email-oleonard@myacpl.org> Removing "float left" from fieldset.rows label breaks the layout of all entry forms. Was it removed because it conflicted with another CSS change? --- .../intranet-tmpl/prog/en/css/staff-global.css | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css index cfa2c5f..cf09cd5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -575,7 +575,8 @@ fieldset.rows legend { font-size : 110%; } -fieldset.rows label, fieldset.rows span.label { +fieldset.rows label, fieldset.rows span.label { + float: left; font-weight : bold; width: 6em; margin-right: 1em; -- 1.7.3 From joseph.zachariah.sim at gmail.com Thu Jan 20 21:18:50 2011 From: joseph.zachariah.sim at gmail.com (Zach Sim) Date: Fri, 21 Jan 2011 09:18:50 +1300 Subject: [Koha-patches] [PATCH] Bug 5327 - Output_JSONStream.t Message-ID: -------------- next part -------------- A non-text attachment was scrubbed... Name: 0001-Added-unit-tests-to-Output_JSONStream.t.patch Type: text/x-patch Size: 1263 bytes Desc: not available URL: From jcamins at cpbibliography.com Thu Jan 20 22:38:10 2011 From: jcamins at cpbibliography.com (Jared Camins-Esakov) Date: Thu, 20 Jan 2011 16:38:10 -0500 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 5551 - allow shelf browser filters to be changed Message-ID: Attached please find the signed-off patch for bug 5551. It works great. Regards, Jared -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: 0001-Bug-5551-allow-shelf-browser-filters-to-be-changed.patch Type: text/x-patch Size: 25203 bytes Desc: not available URL: From joseph.zachariah.sim at gmail.com Thu Jan 20 22:50:04 2011 From: joseph.zachariah.sim at gmail.com (Zach Sim) Date: Fri, 21 Jan 2011 10:50:04 +1300 Subject: [Koha-patches] [PATCH] Bug 5327 - Output_JSONStream.t Message-ID: -------------- next part -------------- A non-text attachment was scrubbed... Name: 0001-Added-more-unit-tests-to-check-when-JSONStream-shoul.patch Type: text/x-patch Size: 1046 bytes Desc: not available URL: From katrin.fischer at bsz-bw.de Fri Jan 21 13:33:38 2011 From: katrin.fischer at bsz-bw.de (Katrin Fischer) Date: Fri, 21 Jan 2011 12:33:38 -0000 Subject: [Koha-patches] [PATCH] Bug 5646: Translated sql files break messaging Message-ID: <1292276866-1577-1-git-send-email-katrin.fischer@bsz-bw.de> --- .../optional/sample_notices_message_attributes.sql | 11 +++++------ .../sample_notices_message_attributes.sql | 10 +++++----- .../optional/sample_notices_message_attributes.sql | 4 ++-- .../optional/sample_notices_message_attributes.sql | 4 ++-- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/installer/data/mysql/de-DE/optional/sample_notices_message_attributes.sql b/installer/data/mysql/de-DE/optional/sample_notices_message_attributes.sql index b019a3d..627b617 100644 --- a/installer/data/mysql/de-DE/optional/sample_notices_message_attributes.sql +++ b/installer/data/mysql/de-DE/optional/sample_notices_message_attributes.sql @@ -1,9 +1,8 @@ insert into `message_attributes` (`message_attribute_id`, message_name, `takes_days`) values -(1, 'F?lligkeitsbenachrichtigung', 0), -(2, 'Erinnerungsbenachrichtigung', 1), -(4, 'Vormerkbenachrichtigung', 0), -(5, 'R?ckgabequittung', 0), -(6, 'Ausleihquittung', 0); - +(1, 'Item DUE', 0), +(2, 'Advance Notice', 1), +(4, 'Hold Filled', 0), +(5, 'Item Check-in', 0), +(6, 'Item Checkout', 0); \ No newline at end of file diff --git a/installer/data/mysql/it-IT/necessari/sample_notices_message_attributes.sql b/installer/data/mysql/it-IT/necessari/sample_notices_message_attributes.sql index aec38b5..231af9c 100644 --- a/installer/data/mysql/it-IT/necessari/sample_notices_message_attributes.sql +++ b/installer/data/mysql/it-IT/necessari/sample_notices_message_attributes.sql @@ -3,10 +3,10 @@ SET FOREIGN_KEY_CHECKS=0; insert into `message_attributes` (`message_attribute_id`, message_name, `takes_days`) values -(1, 'Copia scaduta', 0), -(2, 'Avviso preventivo', 1), -(4, 'Prenotazione compilata', 0), -(5, 'Check In', 0), -(6, 'Check Out', 0); +(1, 'Item DUE', 0), +(2, 'Advance Notice', 1), +(4, 'Hold Filled', 0), +(5, 'Item Check-in', 0), +(6, 'Item Checkout', 0); SET FOREIGN_KEY_CHECKS=1; diff --git a/installer/data/mysql/ru-RU/optional/sample_notices_message_attributes.sql b/installer/data/mysql/ru-RU/optional/sample_notices_message_attributes.sql index 8ec1d69..7cf9a7a 100644 --- a/installer/data/mysql/ru-RU/optional/sample_notices_message_attributes.sql +++ b/installer/data/mysql/ru-RU/optional/sample_notices_message_attributes.sql @@ -3,8 +3,8 @@ truncate message_attributes; insert into `message_attributes` (`message_attribute_id`, message_name, `takes_days`) values -(1, '??????? ?????????', 0), -(2, '??????????????? ???????????', 1), +(1, 'Item DUE', 0), +(2, 'Advance Notice', 1), (4, 'Hold Filled', 0), (5, 'Item Check-in', 0), (6, 'Item Checkout', 0); diff --git a/installer/data/mysql/uk-UA/optional/sample_notices_message_attributes.sql b/installer/data/mysql/uk-UA/optional/sample_notices_message_attributes.sql index fabdc00..dd12938 100644 --- a/installer/data/mysql/uk-UA/optional/sample_notices_message_attributes.sql +++ b/installer/data/mysql/uk-UA/optional/sample_notices_message_attributes.sql @@ -3,8 +3,8 @@ truncate message_attributes; insert into `message_attributes` (`message_attribute_id`, `message_name`, `takes_days`) values -(1, '??????? ???????????' , 0), -(2, '????????? ????????????', 1), +(1, 'Item DUE' , 0), +(2, 'Advance Notice' , 1), (4, 'Hold Filled' , 0), (5, 'Item Check-in' , 0), (6, 'Item Checkout' , 0); -- 1.6.3.3 From nengard at gmail.com Fri Jan 21 14:38:35 2011 From: nengard at gmail.com (Nicole Engard) Date: Fri, 21 Jan 2011 08:38:35 -0500 Subject: [Koha-patches] [PATCH] Bug 5646: Translated sql files break messaging In-Reply-To: <1292276866-1577-1-git-send-email-katrin.fischer@bsz-bw.de> References: <1292276866-1577-1-git-send-email-katrin.fischer@bsz-bw.de> Message-ID: Why do you have 'DUE' in all caps? You have the opportunity here to correct that to lower case :) Nicole On Mon, Dec 13, 2010 at 4:47 PM, Katrin Fischer wrote: > --- > ?.../optional/sample_notices_message_attributes.sql | ? 11 +++++------ > ?.../sample_notices_message_attributes.sql ? ? ? ? ?| ? 10 +++++----- > ?.../optional/sample_notices_message_attributes.sql | ? ?4 ++-- > ?.../optional/sample_notices_message_attributes.sql | ? ?4 ++-- > ?4 files changed, 14 insertions(+), 15 deletions(-) > > diff --git a/installer/data/mysql/de-DE/optional/sample_notices_message_attributes.sql b/installer/data/mysql/de-DE/optional/sample_notices_message_attributes.sql > index b019a3d..627b617 100644 > --- a/installer/data/mysql/de-DE/optional/sample_notices_message_attributes.sql > +++ b/installer/data/mysql/de-DE/optional/sample_notices_message_attributes.sql > @@ -1,9 +1,8 @@ > ?insert into `message_attributes` > ?(`message_attribute_id`, message_name, `takes_days`) > ?values > -(1, 'F?lligkeitsbenachrichtigung', 0), > -(2, 'Erinnerungsbenachrichtigung', 1), > -(4, 'Vormerkbenachrichtigung', 0), > -(5, 'R?ckgabequittung', 0), > -(6, 'Ausleihquittung', 0); > - > +(1, 'Item DUE', 0), > +(2, 'Advance Notice', 1), > +(4, 'Hold Filled', 0), > +(5, 'Item Check-in', 0), > +(6, 'Item Checkout', 0); > \ No newline at end of file > diff --git a/installer/data/mysql/it-IT/necessari/sample_notices_message_attributes.sql b/installer/data/mysql/it-IT/necessari/sample_notices_message_attributes.sql > index aec38b5..231af9c 100644 > --- a/installer/data/mysql/it-IT/necessari/sample_notices_message_attributes.sql > +++ b/installer/data/mysql/it-IT/necessari/sample_notices_message_attributes.sql > @@ -3,10 +3,10 @@ SET FOREIGN_KEY_CHECKS=0; > ?insert into `message_attributes` > ?(`message_attribute_id`, message_name, `takes_days`) > ?values > -(1, 'Copia scaduta', 0), > -(2, 'Avviso preventivo', 1), > -(4, 'Prenotazione compilata', 0), > -(5, 'Check In', 0), > -(6, 'Check Out', 0); > +(1, 'Item DUE', 0), > +(2, 'Advance Notice', 1), > +(4, 'Hold Filled', 0), > +(5, 'Item Check-in', 0), > +(6, 'Item Checkout', 0); > > ?SET FOREIGN_KEY_CHECKS=1; > diff --git a/installer/data/mysql/ru-RU/optional/sample_notices_message_attributes.sql b/installer/data/mysql/ru-RU/optional/sample_notices_message_attributes.sql > index 8ec1d69..7cf9a7a 100644 > --- a/installer/data/mysql/ru-RU/optional/sample_notices_message_attributes.sql > +++ b/installer/data/mysql/ru-RU/optional/sample_notices_message_attributes.sql > @@ -3,8 +3,8 @@ truncate message_attributes; > ?insert into `message_attributes` > ?(`message_attribute_id`, message_name, `takes_days`) > ?values > -(1, '??????? ?????????', ? ? ? ? ? 0), > -(2, '??????????????? ???????????', 1), > +(1, 'Item DUE', ? ? ? ? ? ? ? ? ? ?0), > +(2, 'Advance Notice', ? ? ? ? ? ? ?1), > ?(4, 'Hold Filled', ? ? ? ? ? ? ? ? 0), > ?(5, 'Item Check-in', ? ? ? ? ? ? ? 0), > ?(6, 'Item Checkout', ? ? ? ? ? ? ? 0); > diff --git a/installer/data/mysql/uk-UA/optional/sample_notices_message_attributes.sql b/installer/data/mysql/uk-UA/optional/sample_notices_message_attributes.sql > index fabdc00..dd12938 100644 > --- a/installer/data/mysql/uk-UA/optional/sample_notices_message_attributes.sql > +++ b/installer/data/mysql/uk-UA/optional/sample_notices_message_attributes.sql > @@ -3,8 +3,8 @@ truncate message_attributes; > ?insert into `message_attributes` > ?(`message_attribute_id`, `message_name`, `takes_days`) > ?values > -(1, '??????? ???????????' ? , 0), > -(2, '????????? ????????????', 1), > +(1, 'Item DUE' ? ? ? ? ? ? ?, 0), > +(2, 'Advance Notice' ? ? ? ?, 1), > ?(4, 'Hold Filled' ? ? ? ? ? , 0), > ?(5, 'Item Check-in' ? ? ? ? , 0), > ?(6, 'Item Checkout' ? ? ? ? , 0); > -- > 1.6.3.3 > > > _______________________________________________ > Koha-patches mailing list > Koha-patches at lists.koha-community.org > http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches > website : http://www.koha-community.org/ > git : http://git.koha-community.org/ > bugs : http://bugs.koha-community.org/ From ian.walls at bywatersolutions.com Fri Jan 21 23:11:51 2011 From: ian.walls at bywatersolutions.com (Ian Walls) Date: Fri, 21 Jan 2011 17:11:51 -0500 Subject: [Koha-patches] [PATCH] Bug 4289: OpacPublic prevents login into OPAC Message-ID: <1295647911-24514-1-git-send-email-ian.walls@bywatersolutions.com> If OpacPublic is set to Public, opac-user.pl does not ask for authentication, and takes the patron to a null OPAC summary page. --- opac/opac-user.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/opac/opac-user.pl b/opac/opac-user.pl index e1e50cf..634b77a 100755 --- a/opac/opac-user.pl +++ b/opac/opac-user.pl @@ -47,7 +47,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( template_name => "opac-user.tmpl", query => $query, type => "opac", - authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ), + authnotrequired => 0, flagsrequired => { borrow => 1 }, debug => 1, } -- 1.5.6.5 From serhijdubyk at gmail.com Fri Jan 21 23:14:38 2011 From: serhijdubyk at gmail.com (=?UTF-8?q?Serhij=20Dubyk=20=7B=D0=A1=D0=B5=D1=80=D0=B3=D1=96=D0=B9=20=D0=94=D1=83=D0=B1=D0=B8=D0=BA=7D?=) Date: Sat, 22 Jan 2011 00:14:38 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Many changes for Ukrainian and Russian sql: * update (and translate) many sql-tables * reformatting unimarc-tables, split to local and general fields/subfields * global chande to use 995 subfields for items (952 now in obsolete) * other updates, needed for 3.0.x > 3.2.x Message-ID: <1295648078-12188-1-git-send-email-serhijdubyk@gmail.com> Signed-off-by: Serhij Dubyk {?????? ?????} --- .../authorised_values_[CCODE].sql | 4 +- .../authorised_values_[COUNTRY].sql | 254 +++- .../authorised_values_[DAMAGED].sql | 2 +- .../authorised_values/authorised_values_[LANG].sql | 946 ++++---- .../authorised_values/authorised_values_[LOC].sql | 29 +- .../authorised_values/authorised_values_[LOST].sql | 18 +- .../authorised_values_[RESTRICTED].sql | 6 +- .../authorised_values_[SUGGEST].sql | 11 +- .../authorised_values_[WITHDRAWN].sql | 4 +- .../authorised_values_[rusmarc856].sql | 7 +- .../data/mysql/ru-RU/mandatory/class_sources.sql | 92 +- .../ru-RU/mandatory/message_transport_types.sql | 4 +- .../ru-RU/mandatory/permissions_and_user_flags.sql | 65 +- .../data/mysql/ru-RU/mandatory/subtag_registry.sql | 30 +- ...m_preferences_full_optimal_for_install_only.sql | 3 + ...ystem_preferences_only_translation_updating.sql | 667 ------ ...ystem_preferences_only_translation_updating.txt | 1 - .../mandatory/unimarc_bibliographic_[DEFAULT].sql | 1763 --------------- .../mandatory/unimarc_bibliographic_[DEFAULT].txt | 1 - .../data/mysql/ru-RU/optional/example_branches.sql | 115 +- .../mysql/ru-RU/optional/library_item_types.sql | 64 +- .../mysql/ru-RU/optional/patron_categories.sql | 63 +- .../data/mysql/ru-RU/optional/print_labels.sql | 28 - .../data/mysql/ru-RU/optional/print_labels.txt | 8 - .../data/mysql/ru-RU/optional/sample_currency.sql | 12 +- .../optional/sample_notices_message_attributes.sql | 1 + .../optional/sample_notices_message_transports.sql | 2 + .../authorised_values_[COUNTRY].sql | 710 ++---- .../authorised_values_[DAMAGED].sql | 2 +- .../authorised_values/authorised_values_[LANG].sql | 1344 ++++------- .../authorised_values/authorised_values_[LOC].sql | 10 +- .../authorised_values/authorised_values_[LOST].sql | 17 +- .../authorised_values_[RESTRICTED].sql | 6 +- .../authorised_values_[WITHDRAWN].sql | 4 +- .../data/mysql/uk-UA/mandatory/class_sources.sql | 132 +- .../uk-UA/mandatory/message_transport_types.sql | 4 +- .../uk-UA/mandatory/permissions_and_user_flags.sql | 62 +- .../data/mysql/uk-UA/mandatory/subtag_registry.sql | 30 +- ...m_preferences_full_optimal_for_install_only.sql | 3 + ...ystem_preferences_only_translation_updating.sql | 667 ------ ...ystem_preferences_only_translation_updating.txt | 1 - .../mandatory/unimarc_authorities_[DEFAULT].sql | 768 ------- .../mandatory/unimarc_authorities_[DEFAULT].txt | 1 - .../mandatory/unimarc_bibliographic_[DEFAULT].sql | 2368 -------------------- .../mandatory/unimarc_bibliographic_[DEFAULT].txt | 1 - .../unimarc/optional/biblio_framework_codes.sql | 35 - .../unimarc/optional/biblio_framework_codes.txt | 1 - .../optional/unimarc_bibliographic_[AN].sql | 1173 ---------- .../optional/unimarc_bibliographic_[AN].txt | 1 - .../optional/unimarc_bibliographic_[AUD].sql | 968 -------- .../optional/unimarc_bibliographic_[AUD].txt | 1 - .../optional/unimarc_bibliographic_[BOOK].sql | 1161 ---------- .../optional/unimarc_bibliographic_[BOOK].txt | 1 - .../optional/unimarc_bibliographic_[EL].sql | 952 -------- .../optional/unimarc_bibliographic_[EL].txt | 1 - .../optional/unimarc_bibliographic_[MIN].sql | 803 ------- .../optional/unimarc_bibliographic_[MIN].txt | 1 - .../optional/unimarc_bibliographic_[NOTE].sql | 1305 ----------- .../optional/unimarc_bibliographic_[NOTE].txt | 1 - .../optional/unimarc_bibliographic_[PER].sql | 967 -------- .../optional/unimarc_bibliographic_[PER].txt | 1 - .../optional/unimarc_bibliographic_[TECH].sql | 1892 ---------------- .../optional/unimarc_bibliographic_[TECH].txt | 1 - .../data/mysql/uk-UA/optional/example_branches.sql | 114 +- .../mysql/uk-UA/optional/library_item_types.sql | 155 +- .../mysql/uk-UA/optional/patron_categories.sql | 66 +- .../data/mysql/uk-UA/optional/print_labels.sql | 31 - .../data/mysql/uk-UA/optional/print_labels.txt | 7 - .../data/mysql/uk-UA/optional/sample_currency.sql | 12 +- .../optional/sample_notices_message_attributes.sql | 1 + .../optional/sample_notices_message_transports.sql | 2 + 71 files changed, 2179 insertions(+), 17804 deletions(-) delete mode 100644 installer/data/mysql/ru-RU/mandatory/system_preferences_only_translation_updating.sql delete mode 100644 installer/data/mysql/ru-RU/mandatory/system_preferences_only_translation_updating.txt delete mode 100644 installer/data/mysql/ru-RU/marcflavour/unimarc/mandatory/unimarc_bibliographic_[DEFAULT].sql delete mode 100644 installer/data/mysql/ru-RU/marcflavour/unimarc/mandatory/unimarc_bibliographic_[DEFAULT].txt delete mode 100644 installer/data/mysql/ru-RU/optional/print_labels.sql delete mode 100644 installer/data/mysql/ru-RU/optional/print_labels.txt delete mode 100644 installer/data/mysql/uk-UA/mandatory/system_preferences_only_translation_updating.sql delete mode 100644 installer/data/mysql/uk-UA/mandatory/system_preferences_only_translation_updating.txt delete mode 100644 installer/data/mysql/uk-UA/marcflavour/unimarc/mandatory/unimarc_authorities_[DEFAULT].sql delete mode 100644 installer/data/mysql/uk-UA/marcflavour/unimarc/mandatory/unimarc_authorities_[DEFAULT].txt delete mode 100644 installer/data/mysql/uk-UA/marcflavour/unimarc/mandatory/unimarc_bibliographic_[DEFAULT].sql delete mode 100644 installer/data/mysql/uk-UA/marcflavour/unimarc/mandatory/unimarc_bibliographic_[DEFAULT].txt delete mode 100644 installer/data/mysql/uk-UA/marcflavour/unimarc/optional/biblio_framework_codes.sql delete mode 100644 installer/data/mysql/uk-UA/marcflavour/unimarc/optional/biblio_framework_codes.txt delete mode 100644 installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_[AN].sql delete mode 100644 installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_[AN].txt delete mode 100644 installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_[AUD].sql delete mode 100644 installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_[AUD].txt delete mode 100644 installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_[BOOK].sql delete mode 100644 installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_[BOOK].txt delete mode 100644 installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_[EL].sql delete mode 100644 installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_[EL].txt delete mode 100644 installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_[MIN].sql delete mode 100644 installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_[MIN].txt delete mode 100644 installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_[NOTE].sql delete mode 100644 installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_[NOTE].txt delete mode 100644 installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_[PER].sql delete mode 100644 installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_[PER].txt delete mode 100644 installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_[TECH].sql delete mode 100644 installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_[TECH].txt delete mode 100644 installer/data/mysql/uk-UA/optional/print_labels.sql delete mode 100644 installer/data/mysql/uk-UA/optional/print_labels.txt diff --git a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[CCODE].sql b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[CCODE].sql index 618a168..cd6c118 100644 --- a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[CCODE].sql +++ b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[CCODE].sql @@ -1,6 +1,6 @@ DELETE FROM authorised_values WHERE category='CCODE'; -INSERT INTO `authorised_values` (category, authorised_value, lib, imageurl) VALUES +INSERT INTO authorised_values (category, authorised_value, lib, imageurl) VALUES ('CCODE','FIC', '?????????????? ??????????', NULL), ('CCODE','REF', '??????????' , NULL), -('CCODE','NFIC','??????? ??????????' , NULL); \ No newline at end of file +('CCODE','NFIC','??????? ??????????' , NULL); diff --git a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[COUNTRY].sql b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[COUNTRY].sql index ce5729f..540309f 100644 --- a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[COUNTRY].sql +++ b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[COUNTRY].sql @@ -1,2 +1,252 @@ -INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`, `imageurl`) VALUES (LAST_INSERT_ID( ) + 0,'COUNTRY','RU','?????','NULL'); -INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`, `imageurl`) VALUES (LAST_INSERT_ID( ) + 1,'COUNTRY','UA','???????','NULL'); +DELETE FROM authorised_values WHERE category='COUNTRY'; + +-- ??? ?????-2 = ???????? ?????? (??????? ???????? ?? ??????? ?????) + +INSERT INTO authorised_values (category, authorised_value, lib, imageurl) VALUES +('COUNTRY','RU',' ?????','NULL'), +('COUNTRY','UA',' ???????','NULL'), +('COUNTRY','SU',' ???? ????????? ???????????????? ????????? (????) (?????????? ?? ???????? 1992 ????)','NULL'), +('COUNTRY','AU','?????????','NULL'), +('COUNTRY','AT','???????','NULL'), +('COUNTRY','AZ','???????????','NULL'), +('COUNTRY','AX','????????? ???????','NULL'), +('COUNTRY','AL','???????','NULL'), +('COUNTRY','DZ','?????','NULL'), +('COUNTRY','UM','??????? ????? ??????? (???)','NULL'), +('COUNTRY','VI','???????????? ?????????? ???????','NULL'), +('COUNTRY','AS','???????????? ?????','NULL'), +('COUNTRY','AI','???????','NULL'), +('COUNTRY','AO','??????','NULL'), +('COUNTRY','AD','???????','NULL'), +('COUNTRY','AQ','??????????','NULL'), +('COUNTRY','AG','??????? ? ???????','NULL'), +('COUNTRY','AR','?????????','NULL'), +('COUNTRY','AM','???????','NULL'), +('COUNTRY','AW','?????','NULL'), +('COUNTRY','AF','??????????','NULL'), +('COUNTRY','BS','????????? ???????, ??????','NULL'), +('COUNTRY','BD','?????????','NULL'), +('COUNTRY','BB','????????','NULL'), +('COUNTRY','BH','???????','NULL'), +('COUNTRY','BZ','?????','NULL'), +('COUNTRY','BY','??????????','NULL'), +('COUNTRY','BE','???????','NULL'), +('COUNTRY','BJ','?????','NULL'), +('COUNTRY','BM','?????????? ???????, ???????','NULL'), +('COUNTRY','BG','????????','NULL'), +('COUNTRY','BO','???????','NULL'), +('COUNTRY','BA','?????? ? ???????????','NULL'), +('COUNTRY','BW','????????','NULL'), +('COUNTRY','BR','????????','NULL'), +('COUNTRY','IO','?????????? ?????????? ? ????????? ??????','NULL'), +('COUNTRY','VG','?????????? ?????????? ???????','NULL'), +('COUNTRY','BN','??????','NULL'), +('COUNTRY','BF','??????? ????','NULL'), +('COUNTRY','BI','???????','NULL'), +('COUNTRY','BT','?????','NULL'), +('COUNTRY','VU','???????','NULL'), +('COUNTRY','VA','???????','NULL'), +('COUNTRY','GB','??????????????','NULL'), +('COUNTRY','HU','???????','NULL'), +('COUNTRY','VE','?????????','NULL'), +('COUNTRY','TL','????????? ?????','NULL'), +('COUNTRY','VN','???????','NULL'), +('COUNTRY','GA','?????','NULL'), +('COUNTRY','HT','?????????? ?????','NULL'), +('COUNTRY','GY','??????','NULL'), +('COUNTRY','GM','??????','NULL'), +('COUNTRY','GH','????','NULL'), +('COUNTRY','GP','?????????','NULL'), +('COUNTRY','GT','?????????','NULL'), +('COUNTRY','GN','??????','NULL'), +('COUNTRY','GW','??????-?????','NULL'), +('COUNTRY','DE','????????','NULL'), +('COUNTRY','GI','?????????','NULL'), +('COUNTRY','HN','????????','NULL'), +('COUNTRY','HK','???????','NULL'), +('COUNTRY','GD','???????','NULL'), +('COUNTRY','GL','?????????? (???????????????? ???????)','NULL'), +('COUNTRY','GR','??????','NULL'), +('COUNTRY','GE','??????','NULL'), +('COUNTRY','GU','????','NULL'), +('COUNTRY','DK','?????','NULL'), +('COUNTRY','CD','??????????????? ?????????? ?????','NULL'), +('COUNTRY','DJ','???????','NULL'), +('COUNTRY','DM','????????','NULL'), +('COUNTRY','DO','????????????? ??????????','NULL'), +('COUNTRY','EU','??????????? ???? (??)','NULL'), +('COUNTRY','EG','??????','NULL'), +('COUNTRY','ZM','??????','NULL'), +('COUNTRY','EH','???????? ??????','NULL'), +('COUNTRY','ZW','????????','NULL'), +('COUNTRY','IL','???????','NULL'), +('COUNTRY','IN','?????','NULL'), +('COUNTRY','ID','?????????','NULL'), +('COUNTRY','JO','????????','NULL'), +('COUNTRY','IQ','????','NULL'), +('COUNTRY','IR','????','NULL'), +('COUNTRY','IE','????????','NULL'), +('COUNTRY','IS','????????','NULL'), +('COUNTRY','ES','???????','NULL'), +('COUNTRY','IT','??????','NULL'), +('COUNTRY','YE','?????','NULL'), +('COUNTRY','KP','????????? ???????-??????????????? ?????????? (????)','NULL'), +('COUNTRY','CV','????-?????','NULL'), +('COUNTRY','KZ','?????????','NULL'), +('COUNTRY','KY','????????? ???????','NULL'), +('COUNTRY','KH','????????','NULL'), +('COUNTRY','CM','???????','NULL'), +('COUNTRY','CA','??????','NULL'), +('COUNTRY','QA','?????','NULL'), +('COUNTRY','KE','?????','NULL'), +('COUNTRY','CY','?????????? ????','NULL'), +('COUNTRY','KG','????????','NULL'), +('COUNTRY','KI','????????','NULL'), +('COUNTRY','CN','????????? ???????? ?????????? (???)','NULL'), +('COUNTRY','CC','????????? ???????','NULL'), +('COUNTRY','CO','????????','NULL'), +('COUNTRY','KM','??????','NULL'), +('COUNTRY','CR','?????-????','NULL'), +('COUNTRY','CI','???-???????','NULL'), +('COUNTRY','CU','????','NULL'), +('COUNTRY','KW','??????','NULL'), +('COUNTRY','LA','????','NULL'), +('COUNTRY','LV','??????','NULL'), +('COUNTRY','LS','??????','NULL'), +('COUNTRY','LR','???????','NULL'), +('COUNTRY','LB','?????','NULL'), +('COUNTRY','LY','?????','NULL'), +('COUNTRY','LT','?????','NULL'), +('COUNTRY','LI','???????????','NULL'), +('COUNTRY','LU','??????????','NULL'), +('COUNTRY','MU','????????','NULL'), +('COUNTRY','MR','??????????','NULL'), +('COUNTRY','MG','??????????','NULL'), +('COUNTRY','YT','???????','NULL'), +('COUNTRY','MO','?????','NULL'), +('COUNTRY','MK','?????????? ?????????','NULL'), +('COUNTRY','MW','??????','NULL'), +('COUNTRY','MY','????????','NULL'), +('COUNTRY','ML','????','NULL'), +('COUNTRY','MV','????????','NULL'), +('COUNTRY','MT','??????','NULL'), +('COUNTRY','MA','???????','NULL'), +('COUNTRY','MQ','?????????','NULL'), +('COUNTRY','MH','?????????? ???????','NULL'), +('COUNTRY','MX','???????','NULL'), +('COUNTRY','MZ','????????','NULL'), +('COUNTRY','MD','????????','NULL'), +('COUNTRY','MC','??????','NULL'), +('COUNTRY','MN','????????','NULL'), +('COUNTRY','MS','??????????','NULL'), +('COUNTRY','MM','??????','NULL'), +('COUNTRY','NA','???????','NULL'), +('COUNTRY','NR','?????','NULL'), +('COUNTRY','NP','?????','NULL'), +('COUNTRY','NE','?????','NULL'), +('COUNTRY','NG','???????','NULL'), +('COUNTRY','AN','????????????? ?????????? ???????','NULL'), +('COUNTRY','NL','??????????','NULL'), +('COUNTRY','NI','?????????','NULL'), +('COUNTRY','NU','????','NULL'), +('COUNTRY','NC','????? ?????????','NULL'), +('COUNTRY','NZ','????? ????????','NULL'), +('COUNTRY','NO','????????','NULL'), +('COUNTRY','AE','???????????? ???????? ??????? (???)','NULL'), +('COUNTRY','OM','????','NULL'), +('COUNTRY','CX','?????? ????????? (?????????)','NULL'), +('COUNTRY','CK','??????? ????','NULL'), +('COUNTRY','HM','???? ? ??????????','NULL'), +('COUNTRY','PK','????????','NULL'), +('COUNTRY','PW','?????','NULL'), +('COUNTRY','PS','??????????? ?????????','NULL'), +('COUNTRY','PA','??????','NULL'), +('COUNTRY','PG','????? ? ????? ??????','NULL'), +('COUNTRY','PY','????????','NULL'), +('COUNTRY','PE','????','NULL'), +('COUNTRY','PN','??????? ???????','NULL'), +('COUNTRY','PL','??????','NULL'), +('COUNTRY','PT','??????????','NULL'), +('COUNTRY','PR','??????-????','NULL'), +('COUNTRY','CG','?????????? ?????','NULL'), +('COUNTRY','RE','???????','NULL'), +('COUNTRY','RU','??????','NULL'), +('COUNTRY','RW','??????','NULL'), +('COUNTRY','RO','???????','NULL'), +('COUNTRY','US','??????????? ????? ??????? (???)','NULL'), +('COUNTRY','SV','?????????','NULL'), +('COUNTRY','WS','?????','NULL'), +('COUNTRY','SM','???-??????','NULL'), +('COUNTRY','ST','???-???? ? ????????','NULL'), +('COUNTRY','SA','?????????? ??????','NULL'), +('COUNTRY','SZ','?????????','NULL'), +('COUNTRY','SJ','?????????? ? ??-?????','NULL'), +('COUNTRY','MP','???????? ?????????? ???????','NULL'), +('COUNTRY','SC','??????????? ???????','NULL'), +('COUNTRY','SN','???????','NULL'), +('COUNTRY','VC','????-??????? ? ?????????','NULL'), +('COUNTRY','KN','????-???? ? ?????','NULL'), +('COUNTRY','LC','????-?????','NULL'), +('COUNTRY','PM','???-???? ? ???????','NULL'), +('COUNTRY','RS','??????','NULL'), +('COUNTRY','CS','?????? ? ?????????? (?????????? ?? ???????? 2006 ????)','NULL'), +('COUNTRY','SG','????????','NULL'), +('COUNTRY','SY','?????','NULL'), +('COUNTRY','SK','????????','NULL'), +('COUNTRY','SI','????????','NULL'), +('COUNTRY','SB','?????????? ???????','NULL'), +('COUNTRY','SO','??????','NULL'), +('COUNTRY','SD','?????','NULL'), +('COUNTRY','SR','???????','NULL'), +('COUNTRY','SL','??????-?????','NULL'), +('COUNTRY','SU','???? ????????? ???????????????? ????????? (????) (?????????? ?? ???????? 1992 ????)','NULL'), +('COUNTRY','TJ','???????????','NULL'), +('COUNTRY','TH','???????','NULL'), +('COUNTRY','TW','????????? ??????????','NULL'), +('COUNTRY','TZ','????????','NULL'), +('COUNTRY','TG','????','NULL'), +('COUNTRY','TK','???????','NULL'), +('COUNTRY','TO','?????','NULL'), +('COUNTRY','TT','???????? ? ??????','NULL'), +('COUNTRY','TV','??????','NULL'), +('COUNTRY','TN','?????','NULL'), +('COUNTRY','TM','?????????','NULL'), +('COUNTRY','TR','??????','NULL'), +('COUNTRY','UG','??????','NULL'), +('COUNTRY','UZ','??????????','NULL'), +('COUNTRY','UA','???????','NULL'), +('COUNTRY','UY','???????','NULL'), +('COUNTRY','FO','????????? ???????','NULL'), +('COUNTRY','FM','???????????? ?????','NULL'), +('COUNTRY','FJ','?????','NULL'), +('COUNTRY','PH','?????????','NULL'), +('COUNTRY','FI','?????????','NULL'), +('COUNTRY','FK','???????????? ???????','NULL'), +('COUNTRY','FR','???????','NULL'), +('COUNTRY','GF','??????????? ??????','NULL'), +('COUNTRY','PF','??????????? ?????????','NULL'), +('COUNTRY','TF','??????????? ????? ? ?????????????? ??????????','NULL'), +('COUNTRY','HR','????????','NULL'), +('COUNTRY','CF','????????????????????? ?????????? (???)','NULL'), +('COUNTRY','TD','???','NULL'), +('COUNTRY','ME','??????????','NULL'), +('COUNTRY','CZ','?????','NULL'), +('COUNTRY','CL','????','NULL'), +('COUNTRY','CH','?????????','NULL'), +('COUNTRY','SE','??????','NULL'), +('COUNTRY','LK','???-?????','NULL'), +('COUNTRY','EC','???????','NULL'), +('COUNTRY','GQ','?????????????? ??????','NULL'), +('COUNTRY','ER','???????','NULL'), +('COUNTRY','EE','???????','NULL'), +('COUNTRY','ET','???????','NULL'), +('COUNTRY','ZA','????-??????????? ?????????? (???)','NULL'), +('COUNTRY','KR','?????????? ?????','NULL'), +('COUNTRY','GS','????? ??????? ? ????? ?????????? ???????','NULL'), +('COUNTRY','JM','??????','NULL'), +('COUNTRY','JP','??????','NULL'), +('COUNTRY','BV','?????? ????','NULL'), +('COUNTRY','NF','?????? ???????','NULL'), +('COUNTRY','SH','?????? ?????? ?????','NULL'), +('COUNTRY','TC','????? ? ??????','NULL'), +('COUNTRY','WF','?????? ? ?????? ?','NULL'); \ No newline at end of file diff --git a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[DAMAGED].sql b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[DAMAGED].sql index 8bccb69..9f5b19c 100644 --- a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[DAMAGED].sql +++ b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[DAMAGED].sql @@ -1,6 +1,6 @@ DELETE FROM authorised_values WHERE category='DAMAGED'; INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES -('DAMAGED','0',''), +('DAMAGED','0','??? ???????????'), ('DAMAGED','1','??????????'); diff --git a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[LANG].sql b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[LANG].sql index aa63366..36ebb1e 100644 --- a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[LANG].sql +++ b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[LANG].sql @@ -1,474 +1,476 @@ DELETE FROM authorised_values WHERE category='LANG'; -INSERT INTO `authorised_values` (category, authorised_value, lib, imageurl) VALUES -('LANG', 'eng', ' ??????????', NULL), -('LANG', 'rus', ' ???????', NULL), -('LANG', 'ukr', ' ??????????', NULL), -('LANG', 'und', ' ????????????????????', NULL), -('LANG', 'aba', '??????????', NULL), -('LANG', 'abk', '?????????', NULL), -('LANG', 'awa', '??????', NULL), -('LANG', 'ava', '????????', NULL), -('LANG', 'ave', '???????????', NULL), -('LANG', 'map', '??????????????? (??????)', NULL), -('LANG', 'ada', '???????', NULL), -('LANG', 'ady', '??????????', NULL), -('LANG', 'aze', '???????????????', NULL), -('LANG', 'aym', '??????', NULL), -('LANG', 'aka', '????', NULL), -('LANG', 'akk', '?????????', NULL), -('LANG', 'alb', '?????????', NULL), - ('LANG', 'sqi', '?????????', NULL), -('LANG', 'alg', '???????????? ?????', NULL), -('LANG', 'ale', '?????????', NULL), -('LANG', 'tut', '????????? (??????)', NULL), -('LANG', 'alt', '?????????', NULL), -('LANG', 'amh', '????????? (????????)', NULL), -('LANG', 'eng', '??????????', NULL), -('LANG', 'cpe', '?????-?????????? ? ??????? (??????)', NULL), -('LANG', 'apw', '???????? ?????', NULL), -('LANG', 'ara', '????????', NULL), -('LANG', 'arw', '??????????', NULL), -('LANG', 'arc', '??????????', NULL), -('LANG', 'arp', '???????', NULL), -('LANG', 'am', '???????????', NULL), -('LANG', 'ami', '?????????', NULL), - ('LANG', 'hye', '?????????', NULL), -('LANG', 'asm', '?????????', NULL), -('LANG', 'ass', '???????????', NULL), -('LANG', 'ath', '?????????? ?????', NULL), -('LANG', 'aar', '????', NULL), -('LANG', 'afa', '??????????? (??????)', NULL), -('LANG', 'afr', '?????????', NULL), -('LANG', 'afh', '????????', NULL), -('LANG', 'akh', '?????????', NULL), -('LANG', 'nah', '?????????', NULL), -('LANG', 'ace', '????????', NULL), -('LANG', 'ach', '?????', NULL), -('LANG', 'ban', '?????????', NULL), -('LANG', 'bat', '?????????? (??????)', NULL), -('LANG', 'bam', '??????', NULL), -('LANG', 'bai', '???????? ?????', NULL), -('LANG', 'bad', '?????', NULL), -('LANG', 'bnt', '????? (??????)', NULL), -('LANG', 'bas', '????', NULL), -('LANG', 'baq', '????????', NULL), - ('LANG', 'eus', '????????', NULL), -('LANG', 'bak', '??????????', NULL), -('LANG', 'bej', '?????', NULL), -('LANG', 'bel', '???????????', NULL), -('LANG', 'bai', '??????????', NULL), -('LANG', 'bem', '?????', NULL), -('LANG', 'ben', '???????????', NULL), -('LANG', 'her', '?????????? (??????)', NULL), -('LANG', 'bik', '??????????', NULL), -('LANG', 'bin', '????', NULL), -('LANG', 'bur', '??????????', NULL), - ('LANG', 'mya', '??????????', NULL), -('LANG', 'bis', '???????', NULL), -('LANG', 'bih', '??????', NULL), -('LANG', 'bul', '??????????', NULL), -('LANG', 'bra', '?????', NULL), -('LANG', 'bre', '??????????', NULL), -('LANG', 'bug', '?????????', NULL), -('LANG', 'bua', '?????????', NULL), -('LANG', 'bho', '?????????', NULL), -('LANG', 'vai', '???', NULL), -('LANG', 'wak', '????????? ?????', NULL), -('LANG', 'cym', '?????????? (????????)', NULL), - ('LANG', 'wel', '?????????? (????????)', NULL), -('LANG', 'war', '?????', NULL), -('LANG', 'was', '????', NULL), -('LANG', 'hun', '??????????', NULL), -('LANG', 'ven', '?????', NULL), -('LANG', 'vep', '????????', NULL), -('LANG', 'wal', '??????', NULL), -('LANG', 'vol', '???????', NULL), -('LANG', 'wol', '?????', NULL), -('LANG', 'vie', '???????????', NULL), -('LANG', 'gaa', '??', NULL), -('LANG', 'haw', '?????????', NULL), -('LANG', 'gag', '??????????', NULL), -('LANG', 'gay', '????', NULL), -('LANG', 'gig', '???????????', NULL), -('LANG', 'lug', '?????', NULL), -('LANG', 'her', '??????', NULL), -('LANG', 'gem', '?????????? (??????)', NULL), -('LANG', 'gez', '????', NULL), -('LANG', 'gil', '????????????', NULL), -('LANG', 'gon', '?????', NULL), -('LANG', 'got', '???????', NULL), -('LANG', 'gib', '?????', NULL), -('LANG', 'ell', '????????? (?????????????)', NULL), - ('LANG', 'gre', '????????? (?????????????)', NULL), -('LANG', 'geo', '??????????', NULL), - ('LANG', 'kat', '??????????', NULL), -('LANG', 'gm', '???????', NULL), -('LANG', 'guj', '?????????', NULL), -('LANG', 'gae', '???????? (?????????, ???????????)', NULL), - ('LANG', 'gdh', '???????? (?????????, ???????????)', NULL), -('LANG', 'dak', '??????', NULL), -('LANG', 'dag', '??????????', NULL), -('LANG', 'dan', '???????', NULL), -('LANG', 'del', '???????????', NULL), -('LANG', 'dzo', '?????-?? (??????)', NULL), -('LANG', 'div', '?????? (???????????)', NULL), -('LANG', 'din', '?????', NULL), -('LANG', 'dyu', '????? (?????)', NULL), -('LANG', 'doi', '?????', NULL), -('LANG', 'dra', '???????????? (??????)', NULL), -('LANG', 'grc', '???????????????', NULL), -('LANG', 'egy', '????????????????', NULL), -('LANG', 'rua', '?????????????', NULL), -('LANG', 'dua', '?????', NULL), -('LANG', 'dun', '??????????', NULL), -('LANG', 'jrb', '????????-????????', NULL), -('LANG', 'jpr', '????????-??????????', NULL), -('LANG', 'zen', '?????????', NULL), -('LANG', 'zul', '????', NULL), -('LANG', 'zun', '?????', NULL), -('LANG', 'iba', '????????', NULL), -('LANG', 'heb', '?????', NULL), -('LANG', 'ibo', '????', NULL), -('LANG', 'ijo', '????', NULL), -('LANG', 'yid', '????', NULL), -('LANG', 'ilo', '?????', NULL), -('LANG', 'ing', '?????????', NULL), -('LANG', 'inc', '????????? (??????)', NULL), -('LANG', 'inc', '??????????????? (??????)', NULL), -('LANG', 'ind', '?????????????', NULL), -('LANG', 'ina', '???????????', NULL), -('LANG', 'ile', '???????????', NULL), -('LANG', 'iku', '?????????', NULL), -('LANG', 'ipk', '???????', NULL), -('LANG', 'ira', '???????? (??????)', NULL), -('LANG', 'gai', '??????????', NULL), - ('LANG', 'iri', '??????????', NULL), -('LANG', 'iro', '?????????? ?????', NULL), -('LANG', 'art', '????????????? (??????)', NULL), -('LANG', 'ice', '??????????', NULL), - ('LANG', 'isi', '??????????', NULL), -('LANG', 'esl', '?????????', NULL), - ('LANG', 'spa', '?????????', NULL), -('LANG', 'ita', '???????????', NULL), -('LANG', 'ite', '????????????', NULL), -('LANG', 'yor', '??????', NULL), -('LANG', 'kad', '?????????-??????????', NULL), -('LANG', 'kab', '??????????', NULL), -('LANG', 'kaw', '????', NULL), -('LANG', 'cau', '?????????? (??????)', NULL), -('LANG', 'cad', '?????', NULL), -('LANG', 'kaz', '?????????', NULL), -('LANG', 'kan', '???????', NULL), -('LANG', 'kal', '?????????', NULL), -('LANG', 'kam', '?????', NULL), -('LANG', 'kau', '??????', NULL), -('LANG', 'kai', '??????????', NULL), -('LANG', 'kaa', '??????????????', NULL), -('LANG', 'kah', '?????????-??????????', NULL), -('LANG', 'kae', '??????????', NULL), -('LANG', 'kar', '?????????', NULL), -('LANG', 'car', '?????', NULL), -('LANG', 'cat', '???????????', NULL), -('LANG', 'kae', '?????????', NULL), -('LANG', 'kas', '???????', NULL), -('LANG', 'eel', '????????? (??????)', NULL), -('LANG', 'que', '?????', NULL), -('LANG', 'kik', '??????', NULL), -('LANG', 'kua', '???????', NULL), -('LANG', 'kin', '???????????', NULL), -('LANG', 'kyr', '?????????? (??????????)', NULL), -('LANG', 'chi', '?????????', NULL), - ('LANG', 'zho', '?????????', NULL), -('LANG', 'khi', '?????????? (??????)', NULL), -('LANG', 'kom', '???? (?????????)', NULL), -('LANG', 'koi', '????-?????????', NULL), -('LANG', 'kon', '?????', NULL), -('LANG', 'kok', '???????', NULL), -('LANG', 'cop', '????????', NULL), -('LANG', 'kor', '?????????', NULL), -('LANG', 'cor', '????????', NULL), -('LANG', 'cos', '????????????', NULL), -('LANG', 'koy', '?????????', NULL), -('LANG', 'xho', '????', NULL), -('LANG', 'kpe', '??????', NULL), -('LANG', 'crp', '?????????? ? ??????? (??????)', NULL), -('LANG', 'cre', '???', NULL), -('LANG', 'mus', '????', NULL), -('LANG', 'kro', '???', NULL), -('LANG', 'tut', '???????-?????????', NULL), -('LANG', 'kum', '?????????', NULL), -('LANG', 'kur', '????????', NULL), -('LANG', 'kru', '?????', NULL), -('LANG', 'kus', '??????', NULL), -('LANG', 'kut', '???????', NULL), -('LANG', 'cus', '????????? (??????)', NULL), -('LANG', 'kha', '?????', NULL), -('LANG', 'khm', '?????????', NULL), -('LANG', 'lad', '??????', NULL), -('LANG', 'lak', '???????', NULL), -('LANG', 'lam', '?????', NULL), -('LANG', 'lao', '????????', NULL), -('LANG', 'lat', '?????????', NULL), -('LANG', 'lav', '?????????', NULL), -('LANG', 'lah', '??????', NULL), -('LANG', 'lez', '??????????', NULL), -('LANG', 'lin', '???????', NULL), -('LANG', 'lit', '?????????', NULL), -('LANG', 'loz', '????', NULL), -('LANG', 'lub', '????-???????', NULL), -('LANG', 'wen', '???????? ?????', NULL), -('LANG', 'lui', '????????', NULL), -('LANG', 'lun', '?????', NULL), -('LANG', 'luo', '??? (????? ? ????????', NULL), -('LANG', 'ltz', '??????????????', NULL), -('LANG', 'mag', '??????', NULL), -('LANG', 'mad', '?????????', NULL), -('LANG', 'mai', '????????', NULL), -('LANG', 'myn', '???? ?????', NULL), -('LANG', 'mak', '????????????', NULL), -('LANG', 'mac', '???????????', NULL), - ('LANG', 'mke', '???????????', NULL), -('LANG', 'mig', '?????????????', NULL), -('LANG', 'may', '?????????', NULL), - ('LANG', 'msa', '?????????', NULL), -('LANG', 'mai', '????????', NULL), -('LANG', 'mit', '???????????', NULL), -('LANG', 'man', '????????', NULL), -('LANG', 'mni', '???????????', NULL), -('LANG', 'mno', '?????? ?????', NULL), -('LANG', 'vog', '?????????? (??????????)', NULL), -('LANG', 'mao', '?????', NULL), - ('LANG', 'mri', '?????', NULL), -('LANG', 'mar', '???????', NULL), -('LANG', 'mwr', '???????', NULL), -('LANG', 'chm', '????????? (???????????)', NULL), -('LANG', 'mah', '???????????', NULL), -('LANG', 'mas', '?????', NULL), -('LANG', 'men', '?????', NULL), -('LANG', 'mic', '??????', NULL), -('LANG', 'min', '???????????', NULL), -('LANG', 'mos', '????', NULL), -('LANG', 'mok', '?????????? (?????-??????????)', NULL), -('LANG', 'mol', '??????????', NULL), -('LANG', 'lol', '?????', NULL), -('LANG', 'mon', '???????????', NULL), -('LANG', 'mkh', '???????????? (??????)', NULL), -('LANG', 'moh', '??????', NULL), -('LANG', 'mun', '????? ?????', NULL), -('LANG', 'max', '????????', NULL), -('LANG', 'nav', '??????', NULL), -('LANG', 'gol', '????????? (?????????)', NULL), -('LANG', 'nau', '?????', NULL), -('LANG', 'nde', '??????? ????????', NULL), -('LANG', 'nbl', '??????? ?????', NULL), -('LANG', 'ndo', '??????', NULL), -('LANG', 'new', '?????????', NULL), -('LANG', 'und', '????????????????????', NULL), -('LANG', 'deu', '????????', NULL), - ('LANG', 'ger', '????????', NULL), -('LANG', 'yur', '???????? (?????-??????????)', NULL), -('LANG', 'nep', '??????????', NULL), -('LANG', 'nzi', '?????', NULL), -('LANG', 'giy', '???????? (????????)', NULL), -('LANG', 'nic', '?????-???????????? (??????)', NULL), -('LANG', 'dut', '????????????? (???????????)', NULL), - ('LANG', 'ndi', '????????????? (???????????)', NULL), -('LANG', 'dum', '????????????? ?????????????', NULL), -('LANG', 'ssa', '????-????????? (??????)', NULL), -('LANG', 'niu', '????', NULL), -('LANG', 'nog', '?????????', NULL), -('LANG', 'nor', '??????????', NULL), -('LANG', 'nub', '????????? ?????', NULL), -('LANG', 'nyo', '?????', NULL), -('LANG', 'nym', '????????', NULL), -('LANG', 'nya', '???????', NULL), -('LANG', 'nyn', '????????', NULL), -('LANG', 'nno', '??????? (??????????????)', NULL), -('LANG', 'oji', '???????', NULL), -('LANG', 'oci', '??????????? (????????)', NULL), -('LANG', 'ori', '????', NULL), -('LANG', 'orm', '?????', NULL), -('LANG', 'osa', '??????', NULL), -('LANG', 'oss', '??????????', NULL), -('LANG', 'oto', '??????????? ?????', NULL), -('LANG', 'pau', '?????', NULL), -('LANG', 'pli', '????', NULL), -('LANG', 'pam', '????????', NULL), -('LANG', 'pag', '??????????', NULL), -('LANG', 'pan', '????????', NULL), -('LANG', 'paa', '?????????-????????????? (??????)', NULL), -('LANG', 'pap', '??????????', NULL), -('LANG', 'fas', '??????????', NULL), - ('LANG', 'per', '??????????', NULL), -('LANG', 'pal', '????????????', NULL), -('LANG', 'pol', '????????', NULL), -('LANG', 'pon', '??????', NULL), -('LANG', 'cpp', '??????????????????? ? ??????? (??????)', NULL), -('LANG', 'por', '?????????????', NULL), -('LANG', 'pra', '???????? ?????', NULL), -('LANG', 'pus', '?????', NULL), -('LANG', 'raj', '???????????', NULL), -('LANG', 'mul', '?????? ????? ?????', NULL), -('LANG', 'rar', '?????????', NULL), -('LANG', 'roh', '?????????????', NULL), -('LANG', 'roa', '????????? (??????)', NULL), -('LANG', 'ron', '?????????', NULL), - ('LANG', 'rum', '?????????', NULL), -('LANG', 'run', '?????', NULL), -('LANG', 'rus', '???????', NULL), -('LANG', 'smi', '???????? ?????', NULL), -('LANG', 'sal', '????????? ?????', NULL), -('LANG', 'sam', '????????????? ??????????', NULL), -('LANG', 'smo', '??????????', NULL), -('LANG', 'sag', '?????', NULL), -('LANG', 'sad', '???????', NULL), -('LANG', 'san', '????????', NULL), -('LANG', 'zap', '???????????', NULL), -('LANG', 'srd', '??????????', NULL), -('LANG', 'ssw', '?????', NULL), -('LANG', 'ceb', '???????', NULL), -('LANG', 'nai', '???????? ??????? ???????? (??????)', NULL), -('LANG', 'sel', '???????????', NULL), -('LANG', 'sem', '????????? (??????)', NULL), -('LANG', 'scr', '?????????????????', NULL), -('LANG', 'sit', '?????', NULL), -('LANG', 'sid', '??????', NULL), -('LANG', 'bla', '???????', NULL), -('LANG', 'sin', '???????????', NULL), -('LANG', 'snd', '??????', NULL), -('LANG', 'sit', '????????????? (??????)', NULL), -('LANG', 'syr', '?????????', NULL), -('LANG', 'sio', '??? ?????', NULL), -('LANG', 'sla', '?????????? (??????)', NULL), -('LANG', 'slk', '?????????', NULL), - ('LANG', 'slo', '?????????', NULL), -('LANG', 'siv', '??????????', NULL), -('LANG', 'mis', '????????? (??????)', NULL), -('LANG', 'sog', '??????????', NULL), -('LANG', 'som', '??????', NULL), -('LANG', 'son', '??????', NULL), -('LANG', 'nso', '???? ????????', NULL), -('LANG', 'sot', '???? ?????', NULL), -('LANG', 'enm', '????????????????', NULL), -('LANG', 'gmh', '????????????????????', NULL), -('LANG', 'mga', '????????????????', NULL), -('LANG', 'frm', '?????????????????', NULL), -('LANG', 'ang', '???????????????', NULL), -('LANG', 'goh', '???????????????????', NULL), -('LANG', 'sga', '???????????????', NULL), -('LANG', 'non', '??????????????? (?????????????)', NULL), -('LANG', 'peo', '???????????????', NULL), -('LANG', 'pro', '???????????????????', NULL), -('LANG', 'ota', '?????????????', NULL), -('LANG', 'fro', '????????????????', NULL), -('LANG', 'swa', '???????', NULL), -('LANG', 'suk', '??????', NULL), -('LANG', 'sun', '??????????', NULL), -('LANG', 'sus', '????', NULL), -('LANG', 'tab', '?????????????', NULL), -('LANG', 'tgl', '???????', NULL), -('LANG', 'tgk', '??????????', NULL), -('LANG', 'tha', '???', NULL), -('LANG', 'tah', '??????????', NULL), -('LANG', 'tal', '?????????', NULL), -('LANG', 'tmh', '???????', NULL), -('LANG', 'tam', '??????????', NULL), -('LANG', 'tat', '?????????', NULL), -('LANG', 'tai', '???????', NULL), -('LANG', 'twi', '???', NULL), -('LANG', 'tel', '??????', NULL), -('LANG', 'tern', '?????', NULL), -('LANG', 'ter', '??????', NULL), -('LANG', 'bod', '?????????', NULL), - ('LANG', 'tib', '?????????', NULL), -('LANG', 'tiv', '????', NULL), -('LANG', 'tig', '?????', NULL), -('LANG', 'tir', '????????', NULL), -('LANG', 'tli', '???????', NULL), -('LANG', 'tog', '????? (?????)', NULL), -('LANG', 'ton', '????? (????? ??????????)', NULL), -('LANG', 'tru', '????', NULL), -('LANG', 'tsn', '??????', NULL), -('LANG', 'tso', '??????', NULL), -('LANG', 'tyv', '?????????', NULL), -('LANG', 'tum', '???????', NULL), -('LANG', 'tur', '????????', NULL), -('LANG', 'tuk', '???????????', NULL), -('LANG', 'uga', '??????????', NULL), -('LANG', 'vot', '?????????? (????????)', NULL), -('LANG', 'ude', '??????????', NULL), -('LANG', 'uzb', '?????????', NULL), -('LANG', 'uig', '?????????', NULL), -('LANG', 'ukr', '??????????', NULL), -('LANG', 'ulc', '????????', NULL), -('LANG', 'umb', '???????', NULL), -('LANG', 'urd', '????', NULL), -('LANG', 'fan', '????', NULL), -('LANG', 'fat', '?????', NULL), -('LANG', 'fao', '?????????', NULL), -('LANG', 'fij', '?????', NULL), -('LANG', 'phn', '???????????', NULL), -('LANG', 'flu', '?????-???????? (??????)', NULL), -('LANG', 'fin', '???????', NULL), -('LANG', 'fon', '???', NULL), -('LANG', 'cpf', '??????-?????????? ? ??????? (??????)', NULL), -('LANG', 'fra', '???????????', NULL), - ('LANG', 'fre', '???????????', NULL), -('LANG', 'fry', '????????', NULL), -('LANG', 'ful', '?????', NULL), -('LANG', 'hai', '?????', NULL), -('LANG', 'khk', '?????????', NULL), -('LANG', 'ost', '?????????? (????????)', NULL), -('LANG', 'hau', '?????', NULL), -('LANG', 'hil', '??????????', NULL), -('LANG', 'him', '????????', NULL), -('LANG', 'hin', '?????', NULL), -('LANG', 'hmo', '????????', NULL), -('LANG', 'kho', '?????????', NULL), -('LANG', 'hup', '????', NULL), -('LANG', 'tsa', '?????????', NULL), -('LANG', 'cai', '??????????? ??????? ???????? (??????)', NULL), -('LANG', 'chu', '????????-?????????? (???????????????)', NULL), -('LANG', 'tsi', '???????', NULL), -('LANG', 'rom', '?????????', NULL), -('LANG', 'chg', '???????????', NULL), -('LANG', 'cha', '???????', NULL), -('LANG', 'chy', '??????', NULL), -('LANG', 'chr', '??????', NULL), -('LANG', 'che', '?????????', NULL), -('LANG', 'ces', '???????', NULL), - ('LANG', 'cze', '???????', NULL), -('LANG', 'zha', '??????', NULL), -('LANG', 'chb', '?????', NULL), -('LANG', 'chn', '????? ??????', NULL), -('LANG', 'cho', '??????', NULL), -('LANG', 'chv', '?????????', NULL), -('LANG', 'chk', '?????????', NULL), -('LANG', 'shn', '???????', NULL), -('LANG', 'sve', '????????', NULL), - ('LANG', 'swe', '????????', NULL), -('LANG', 'sna', '????', NULL), -('LANG', 'sho', '???????', NULL), -('LANG', 'shu', '??????????', NULL), -('LANG', 'sux', '?????????', NULL), -('LANG', 'ewe', '???', NULL), -('LANG', 'eve', '??????????? (??????????)', NULL), -('LANG', 'lau', '???????? (?????????)', NULL), -('LANG', 'ewo', '??????', NULL), -('LANG', 'eka', '???????', NULL), -('LANG', 'elx', '????????', NULL), -('LANG', 'erz', '????????? (??????????)', NULL), -('LANG', 'esk', '??????????? (??????)', NULL), -('LANG', 'kal', '??????????? (????????????)', NULL), -('LANG', 'epo', '?????????', NULL), -('LANG', 'est', '?????????', NULL), -('LANG', 'efi', '????', NULL), -('LANG', 'sai', '????? ??????? ???????? (??????)', NULL), -('LANG', 'yuk', '??????????', NULL), -('LANG', 'jav', '????????', NULL), - ('LANG', 'jaw', '????????', NULL), -('LANG', 'sah', '????????', NULL), -('LANG', 'yao', '??', NULL), -('LANG', 'yap', '??', NULL), -('LANG', 'jpn', '????????', NULL); +-- ???? ISO 639-2 ?????-3 + +INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES +('LANG', 'rus', ' ???????'), +('LANG', 'ukr', ' ??????????'), +('LANG', 'eng', ' ??????????'), +('LANG', 'und', ' ????????????????????'), +('LANG', 'aba', '??????????'), +('LANG', 'abk', '?????????'), +('LANG', 'awa', '??????'), +('LANG', 'ava', '????????'), +('LANG', 'ave', '???????????'), +('LANG', 'map', '??????????????? (??????)'), +('LANG', 'ada', '???????'), +('LANG', 'ady', '??????????'), +('LANG', 'aze', '???????????????'), +('LANG', 'aym', '??????'), +('LANG', 'aka', '????'), +('LANG', 'akk', '?????????'), +('LANG', 'alb', '?????????'), +('LANG', 'sqi', '?????????'), +('LANG', 'alg', '???????????? ?????'), +('LANG', 'ale', '?????????'), +('LANG', 'tut', '????????? (??????)'), +('LANG', 'alt', '?????????'), +('LANG', 'amh', '????????? (????????)'), +('LANG', 'eng', '??????????'), +('LANG', 'cpe', '?????-?????????? ? ??????? (??????)'), +('LANG', 'apw', '???????? ?????'), +('LANG', 'ara', '????????'), +('LANG', 'arw', '??????????'), +('LANG', 'arc', '??????????'), +('LANG', 'arp', '???????'), +('LANG', 'am', '???????????'), +('LANG', 'ami', '?????????'), +('LANG', 'hye', '?????????'), +('LANG', 'asm', '?????????'), +('LANG', 'ass', '???????????'), +('LANG', 'ath', '?????????? ?????'), +('LANG', 'aar', '????'), +('LANG', 'afa', '??????????? (??????)'), +('LANG', 'afr', '?????????'), +('LANG', 'afh', '????????'), +('LANG', 'akh', '?????????'), +('LANG', 'nah', '?????????'), +('LANG', 'ace', '????????'), +('LANG', 'ach', '?????'), +('LANG', 'ban', '?????????'), +('LANG', 'bat', '?????????? (??????)'), +('LANG', 'bam', '??????'), +('LANG', 'bai', '???????? ?????'), +('LANG', 'bad', '?????'), +('LANG', 'bnt', '????? (??????)'), +('LANG', 'bas', '????'), +('LANG', 'baq', '????????'), + ('LANG', 'eus', '????????'), +('LANG', 'bak', '??????????'), +('LANG', 'bej', '?????'), +('LANG', 'bel', '???????????'), +('LANG', 'bai', '??????????'), +('LANG', 'bem', '?????'), +('LANG', 'ben', '???????????'), +('LANG', 'her', '?????????? (??????)'), +('LANG', 'bik', '??????????'), +('LANG', 'bin', '????'), +('LANG', 'bur', '??????????'), + ('LANG', 'mya', '??????????'), +('LANG', 'bis', '???????'), +('LANG', 'bih', '??????'), +('LANG', 'bul', '??????????'), +('LANG', 'bra', '?????'), +('LANG', 'bre', '??????????'), +('LANG', 'bug', '?????????'), +('LANG', 'bua', '?????????'), +('LANG', 'bho', '?????????'), +('LANG', 'vai', '???'), +('LANG', 'wak', '????????? ?????'), +('LANG', 'cym', '?????????? (????????)'), + ('LANG', 'wel', '?????????? (????????)'), +('LANG', 'war', '?????'), +('LANG', 'was', '????'), +('LANG', 'hun', '??????????'), +('LANG', 'ven', '?????'), +('LANG', 'vep', '????????'), +('LANG', 'wal', '??????'), +('LANG', 'vol', '???????'), +('LANG', 'wol', '?????'), +('LANG', 'vie', '???????????'), +('LANG', 'gaa', '??'), +('LANG', 'haw', '?????????'), +('LANG', 'gag', '??????????'), +('LANG', 'gay', '????'), +('LANG', 'gig', '???????????'), +('LANG', 'lug', '?????'), +('LANG', 'her', '??????'), +('LANG', 'gem', '?????????? (??????)'), +('LANG', 'gez', '????'), +('LANG', 'gil', '????????????'), +('LANG', 'gon', '?????'), +('LANG', 'got', '???????'), +('LANG', 'gib', '?????'), +('LANG', 'ell', '????????? (?????????????)'), + ('LANG', 'gre', '????????? (?????????????)'), +('LANG', 'geo', '??????????'), + ('LANG', 'kat', '??????????'), +('LANG', 'gm', '???????'), +('LANG', 'guj', '?????????'), +('LANG', 'gae', '???????? (?????????, ???????????)'), + ('LANG', 'gdh', '???????? (?????????, ???????????)'), +('LANG', 'dak', '??????'), +('LANG', 'dag', '??????????'), +('LANG', 'dan', '???????'), +('LANG', 'del', '???????????'), +('LANG', 'dzo', '?????-?? (??????)'), +('LANG', 'div', '?????? (???????????)'), +('LANG', 'din', '?????'), +('LANG', 'dyu', '????? (?????)'), +('LANG', 'doi', '?????'), +('LANG', 'dra', '???????????? (??????)'), +('LANG', 'grc', '???????????????'), +('LANG', 'egy', '????????????????'), +('LANG', 'rua', '?????????????'), +('LANG', 'dua', '?????'), +('LANG', 'dun', '??????????'), +('LANG', 'jrb', '????????-????????'), +('LANG', 'jpr', '????????-??????????'), +('LANG', 'zen', '?????????'), +('LANG', 'zul', '????'), +('LANG', 'zun', '?????'), +('LANG', 'iba', '????????'), +('LANG', 'heb', '?????'), +('LANG', 'ibo', '????'), +('LANG', 'ijo', '????'), +('LANG', 'yid', '????'), +('LANG', 'ilo', '?????'), +('LANG', 'ing', '?????????'), +('LANG', 'inc', '????????? (??????)'), +('LANG', 'inc', '??????????????? (??????)'), +('LANG', 'ind', '?????????????'), +('LANG', 'ina', '???????????'), +('LANG', 'ile', '???????????'), +('LANG', 'iku', '?????????'), +('LANG', 'ipk', '???????'), +('LANG', 'ira', '???????? (??????)'), +('LANG', 'gai', '??????????'), + ('LANG', 'iri', '??????????'), +('LANG', 'iro', '?????????? ?????'), +('LANG', 'art', '????????????? (??????)'), +('LANG', 'ice', '??????????'), + ('LANG', 'isi', '??????????'), +('LANG', 'esl', '?????????'), + ('LANG', 'spa', '?????????'), +('LANG', 'ita', '???????????'), +('LANG', 'ite', '????????????'), +('LANG', 'yor', '??????'), +('LANG', 'kad', '?????????-??????????'), +('LANG', 'kab', '??????????'), +('LANG', 'kaw', '????'), +('LANG', 'cau', '?????????? (??????)'), +('LANG', 'cad', '?????'), +('LANG', 'kaz', '?????????'), +('LANG', 'kan', '???????'), +('LANG', 'kal', '?????????'), +('LANG', 'kam', '?????'), +('LANG', 'kau', '??????'), +('LANG', 'kai', '??????????'), +('LANG', 'kaa', '??????????????'), +('LANG', 'kah', '?????????-??????????'), +('LANG', 'kae', '??????????'), +('LANG', 'kar', '?????????'), +('LANG', 'car', '?????'), +('LANG', 'cat', '???????????'), +('LANG', 'kae', '?????????'), +('LANG', 'kas', '???????'), +('LANG', 'eel', '????????? (??????)'), +('LANG', 'que', '?????'), +('LANG', 'kik', '??????'), +('LANG', 'kua', '???????'), +('LANG', 'kin', '???????????'), +('LANG', 'kyr', '?????????? (??????????)'), +('LANG', 'chi', '?????????'), + ('LANG', 'zho', '?????????'), +('LANG', 'khi', '?????????? (??????)'), +('LANG', 'kom', '???? (?????????)'), +('LANG', 'koi', '????-?????????'), +('LANG', 'kon', '?????'), +('LANG', 'kok', '???????'), +('LANG', 'cop', '????????'), +('LANG', 'kor', '?????????'), +('LANG', 'cor', '????????'), +('LANG', 'cos', '????????????'), +('LANG', 'koy', '?????????'), +('LANG', 'xho', '????'), +('LANG', 'kpe', '??????'), +('LANG', 'crp', '?????????? ? ??????? (??????)'), +('LANG', 'cre', '???'), +('LANG', 'mus', '????'), +('LANG', 'kro', '???'), +('LANG', 'tut', '???????-?????????'), +('LANG', 'kum', '?????????'), +('LANG', 'kur', '????????'), +('LANG', 'kru', '?????'), +('LANG', 'kus', '??????'), +('LANG', 'kut', '???????'), +('LANG', 'cus', '????????? (??????)'), +('LANG', 'kha', '?????'), +('LANG', 'khm', '?????????'), +('LANG', 'lad', '??????'), +('LANG', 'lak', '???????'), +('LANG', 'lam', '?????'), +('LANG', 'lao', '????????'), +('LANG', 'lat', '?????????'), +('LANG', 'lav', '?????????'), +('LANG', 'lah', '??????'), +('LANG', 'lez', '??????????'), +('LANG', 'lin', '???????'), +('LANG', 'lit', '?????????'), +('LANG', 'loz', '????'), +('LANG', 'lub', '????-???????'), +('LANG', 'wen', '???????? ?????'), +('LANG', 'lui', '????????'), +('LANG', 'lun', '?????'), +('LANG', 'luo', '??? (????? ? ????????'), +('LANG', 'ltz', '??????????????'), +('LANG', 'mag', '??????'), +('LANG', 'mad', '?????????'), +('LANG', 'mai', '????????'), +('LANG', 'myn', '???? ?????'), +('LANG', 'mak', '????????????'), +('LANG', 'mac', '???????????'), + ('LANG', 'mke', '???????????'), +('LANG', 'mig', '?????????????'), +('LANG', 'may', '?????????'), + ('LANG', 'msa', '?????????'), +('LANG', 'mai', '????????'), +('LANG', 'mit', '???????????'), +('LANG', 'man', '????????'), +('LANG', 'mni', '???????????'), +('LANG', 'mno', '?????? ?????'), +('LANG', 'vog', '?????????? (??????????)'), +('LANG', 'mao', '?????'), + ('LANG', 'mri', '?????'), +('LANG', 'mar', '???????'), +('LANG', 'mwr', '???????'), +('LANG', 'chm', '????????? (???????????)'), +('LANG', 'mah', '???????????'), +('LANG', 'mas', '?????'), +('LANG', 'men', '?????'), +('LANG', 'mic', '??????'), +('LANG', 'min', '???????????'), +('LANG', 'mos', '????'), +('LANG', 'mok', '?????????? (?????-??????????)'), +('LANG', 'mol', '??????????'), +('LANG', 'lol', '?????'), +('LANG', 'mon', '???????????'), +('LANG', 'mkh', '???????????? (??????)'), +('LANG', 'moh', '??????'), +('LANG', 'mun', '????? ?????'), +('LANG', 'max', '????????'), +('LANG', 'nav', '??????'), +('LANG', 'gol', '????????? (?????????)'), +('LANG', 'nau', '?????'), +('LANG', 'nde', '??????? ????????'), +('LANG', 'nbl', '??????? ?????'), +('LANG', 'ndo', '??????'), +('LANG', 'new', '?????????'), +('LANG', 'und', '????????????????????'), +('LANG', 'deu', '????????'), + ('LANG', 'ger', '????????'), +('LANG', 'yur', '???????? (?????-??????????)'), +('LANG', 'nep', '??????????'), +('LANG', 'nzi', '?????'), +('LANG', 'giy', '???????? (????????)'), +('LANG', 'nic', '?????-???????????? (??????)'), +('LANG', 'dut', '????????????? (???????????)'), + ('LANG', 'ndi', '????????????? (???????????)'), +('LANG', 'dum', '????????????? ?????????????'), +('LANG', 'ssa', '????-????????? (??????)'), +('LANG', 'niu', '????'), +('LANG', 'nog', '?????????'), +('LANG', 'nor', '??????????'), +('LANG', 'nub', '????????? ?????'), +('LANG', 'nyo', '?????'), +('LANG', 'nym', '????????'), +('LANG', 'nya', '???????'), +('LANG', 'nyn', '????????'), +('LANG', 'nno', '??????? (??????????????)'), +('LANG', 'oji', '???????'), +('LANG', 'oci', '??????????? (????????)'), +('LANG', 'ori', '????'), +('LANG', 'orm', '?????'), +('LANG', 'osa', '??????'), +('LANG', 'oss', '??????????'), +('LANG', 'oto', '??????????? ?????'), +('LANG', 'pau', '?????'), +('LANG', 'pli', '????'), +('LANG', 'pam', '????????'), +('LANG', 'pag', '??????????'), +('LANG', 'pan', '????????'), +('LANG', 'paa', '?????????-????????????? (??????)'), +('LANG', 'pap', '??????????'), +('LANG', 'fas', '??????????'), + ('LANG', 'per', '??????????'), +('LANG', 'pal', '????????????'), +('LANG', 'pol', '????????'), +('LANG', 'pon', '??????'), +('LANG', 'cpp', '??????????????????? ? ??????? (??????)'), +('LANG', 'por', '?????????????'), +('LANG', 'pra', '???????? ?????'), +('LANG', 'pus', '?????'), +('LANG', 'raj', '???????????'), +('LANG', 'mul', '?????? ????? ?????'), +('LANG', 'rar', '?????????'), +('LANG', 'roh', '?????????????'), +('LANG', 'roa', '????????? (??????)'), +('LANG', 'ron', '?????????'), + ('LANG', 'rum', '?????????'), +('LANG', 'run', '?????'), +('LANG', 'rus', '???????'), +('LANG', 'smi', '???????? ?????'), +('LANG', 'sal', '????????? ?????'), +('LANG', 'sam', '????????????? ??????????'), +('LANG', 'smo', '??????????'), +('LANG', 'sag', '?????'), +('LANG', 'sad', '???????'), +('LANG', 'san', '????????'), +('LANG', 'zap', '???????????'), +('LANG', 'srd', '??????????'), +('LANG', 'ssw', '?????'), +('LANG', 'ceb', '???????'), +('LANG', 'nai', '???????? ??????? ???????? (??????)'), +('LANG', 'sel', '???????????'), +('LANG', 'sem', '????????? (??????)'), +('LANG', 'scr', '?????????????????'), +('LANG', 'sit', '?????'), +('LANG', 'sid', '??????'), +('LANG', 'bla', '???????'), +('LANG', 'sin', '???????????'), +('LANG', 'snd', '??????'), +('LANG', 'sit', '????????????? (??????)'), +('LANG', 'syr', '?????????'), +('LANG', 'sio', '??? ?????'), +('LANG', 'sla', '?????????? (??????)'), +('LANG', 'slk', '?????????'), + ('LANG', 'slo', '?????????'), +('LANG', 'siv', '??????????'), +('LANG', 'mis', '????????? (??????)'), +('LANG', 'sog', '??????????'), +('LANG', 'som', '??????'), +('LANG', 'son', '??????'), +('LANG', 'nso', '???? ????????'), +('LANG', 'sot', '???? ?????'), +('LANG', 'enm', '????????????????'), +('LANG', 'gmh', '????????????????????'), +('LANG', 'mga', '????????????????'), +('LANG', 'frm', '?????????????????'), +('LANG', 'ang', '???????????????'), +('LANG', 'goh', '???????????????????'), +('LANG', 'sga', '???????????????'), +('LANG', 'non', '??????????????? (?????????????)'), +('LANG', 'peo', '???????????????'), +('LANG', 'pro', '???????????????????'), +('LANG', 'ota', '?????????????'), +('LANG', 'fro', '????????????????'), +('LANG', 'swa', '???????'), +('LANG', 'suk', '??????'), +('LANG', 'sun', '??????????'), +('LANG', 'sus', '????'), +('LANG', 'tab', '?????????????'), +('LANG', 'tgl', '???????'), +('LANG', 'tgk', '??????????'), +('LANG', 'tha', '???'), +('LANG', 'tah', '??????????'), +('LANG', 'tal', '?????????'), +('LANG', 'tmh', '???????'), +('LANG', 'tam', '??????????'), +('LANG', 'tat', '?????????'), +('LANG', 'tai', '???????'), +('LANG', 'twi', '???'), +('LANG', 'tel', '??????'), +('LANG', 'tern', '?????'), +('LANG', 'ter', '??????'), +('LANG', 'bod', '?????????'), + ('LANG', 'tib', '?????????'), +('LANG', 'tiv', '????'), +('LANG', 'tig', '?????'), +('LANG', 'tir', '????????'), +('LANG', 'tli', '???????'), +('LANG', 'tog', '????? (?????)'), +('LANG', 'ton', '????? (????? ??????????)'), +('LANG', 'tru', '????'), +('LANG', 'tsn', '??????'), +('LANG', 'tso', '??????'), +('LANG', 'tyv', '?????????'), +('LANG', 'tum', '???????'), +('LANG', 'tur', '????????'), +('LANG', 'tuk', '???????????'), +('LANG', 'uga', '??????????'), +('LANG', 'vot', '?????????? (????????)'), +('LANG', 'ude', '??????????'), +('LANG', 'uzb', '?????????'), +('LANG', 'uig', '?????????'), +('LANG', 'ukr', '??????????'), +('LANG', 'ulc', '????????'), +('LANG', 'umb', '???????'), +('LANG', 'urd', '????'), +('LANG', 'fan', '????'), +('LANG', 'fat', '?????'), +('LANG', 'fao', '?????????'), +('LANG', 'fij', '?????'), +('LANG', 'phn', '???????????'), +('LANG', 'flu', '?????-???????? (??????)'), +('LANG', 'fin', '???????'), +('LANG', 'fon', '???'), +('LANG', 'cpf', '??????-?????????? ? ??????? (??????)'), +('LANG', 'fra', '???????????'), + ('LANG', 'fre', '???????????'), +('LANG', 'fry', '????????'), +('LANG', 'ful', '?????'), +('LANG', 'hai', '?????'), +('LANG', 'khk', '?????????'), +('LANG', 'ost', '?????????? (????????)'), +('LANG', 'hau', '?????'), +('LANG', 'hil', '??????????'), +('LANG', 'him', '????????'), +('LANG', 'hin', '?????'), +('LANG', 'hmo', '????????'), +('LANG', 'kho', '?????????'), +('LANG', 'hup', '????'), +('LANG', 'tsa', '?????????'), +('LANG', 'cai', '??????????? ??????? ???????? (??????)'), +('LANG', 'chu', '????????-?????????? (???????????????)'), +('LANG', 'tsi', '???????'), +('LANG', 'rom', '?????????'), +('LANG', 'chg', '???????????'), +('LANG', 'cha', '???????'), +('LANG', 'chy', '??????'), +('LANG', 'chr', '??????'), +('LANG', 'che', '?????????'), +('LANG', 'ces', '???????'), + ('LANG', 'cze', '???????'), +('LANG', 'zha', '??????'), +('LANG', 'chb', '?????'), +('LANG', 'chn', '????? ??????'), +('LANG', 'cho', '??????'), +('LANG', 'chv', '?????????'), +('LANG', 'chk', '?????????'), +('LANG', 'shn', '???????'), +('LANG', 'sve', '????????'), + ('LANG', 'swe', '????????'), +('LANG', 'sna', '????'), +('LANG', 'sho', '???????'), +('LANG', 'shu', '??????????'), +('LANG', 'sux', '?????????'), +('LANG', 'ewe', '???'), +('LANG', 'eve', '??????????? (??????????)'), +('LANG', 'lau', '???????? (?????????)'), +('LANG', 'ewo', '??????'), +('LANG', 'eka', '???????'), +('LANG', 'elx', '????????'), +('LANG', 'erz', '????????? (??????????)'), +('LANG', 'esk', '??????????? (??????)'), +('LANG', 'kal', '??????????? (????????????)'), +('LANG', 'epo', '?????????'), +('LANG', 'est', '?????????'), +('LANG', 'efi', '????'), +('LANG', 'sai', '????? ??????? ???????? (??????)'), +('LANG', 'yuk', '??????????'), +('LANG', 'jav', '????????'), + ('LANG', 'jaw', '????????'), +('LANG', 'sah', '????????'), +('LANG', 'yao', '??'), +('LANG', 'yap', '??'), +('LANG', 'jpn', '????????'); \ No newline at end of file diff --git a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[LOC].sql b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[LOC].sql index c0450a7..67f638e 100644 --- a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[LOC].sql +++ b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[LOC].sql @@ -1,15 +1,14 @@ -INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('LOC','FIC','?????????????? ??????????'); - -INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('LOC','CHILD','??????? ???????'); - -INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('LOC','DISPLAY','?? ????????????'); - -INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('LOC','NEW','????? ??????? ??????????'); - -INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('LOC','STAFF','???? ?????????? ??????????'); - -INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('LOC','GEN','????? ?????'); - -INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('LOC','AV','?????-?????????? ?????????'); - -INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('LOC','REF','??????????'); +DELETE FROM authorised_values WHERE category='LOC'; + +INSERT INTO authorised_values (category, authorised_value, lib) VALUES +('LOC','FIC', '?????????????? ??????????'), +('LOC','SCIENCE','??????? ????'), +('LOC','CHILD', '??????? ???????'), +('LOC','DISPLAY','?? ????????????'), +('LOC','NEW', '?? ????? ????? ???????????'), +('LOC','STAFF', '???? ?????????? ??????????'), +('LOC','GEN', '????? ??????????????'), +('LOC','AV', '?????-?????????? ?????????'), +('LOC','REF', '??????????'), +('LOC','CART', '???????/??????? ? (?????????????) ???????'), +('LOC','PROC', '? ?????? ?????????'); diff --git a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[LOST].sql b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[LOST].sql index 17aff3b..c61a466 100644 --- a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[LOST].sql +++ b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[LOST].sql @@ -1,14 +1,10 @@ DELETE FROM authorised_values WHERE category='LOST'; -INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 0,'LOST','0',''); - -INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 1,'LOST','2','?????????? ????????? (????????)'); - -INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 2,'LOST','1','????????'); - -INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 3,'LOST','3','???????? ? ????????? ?? ?????????'); - -INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 4,'LOST','5','??????????? ??? ??????? ?? ??????????????'); - -INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 5,'LOST','4','??????????? ??? ??????????????'); +INSERT INTO authorised_values (category, authorised_value, lib) VALUES +('LOST','0','?? ????????'), +('LOST','1','????????'), +('LOST','2','?????????? ????????? (????????)'), +('LOST','3','???????? ? ????????? ?? ?????????'), +('LOST','5','??????????? ??? ??????? ?? ??????????????'), +('LOST','4','??????????? ??? ??????????????'); diff --git a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[RESTRICTED].sql b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[RESTRICTED].sql index e96bcef..9b05a1c 100644 --- a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[RESTRICTED].sql +++ b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[RESTRICTED].sql @@ -1,7 +1,7 @@ DELETE FROM authorised_values WHERE category='RESTRICTED'; -INSERT INTO `authorised_values` (`category`, `authorised_value`, `lib`) VALUES -('RESTRICTED','0',''), -('RESTRICTED','1','???????????? ??????'); +INSERT INTO authorised_values (category, authorised_value, lib) VALUES +('RESTRICTED','0','??? ???????????'), +('RESTRICTED','1','?????? ?????????'); diff --git a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[SUGGEST].sql b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[SUGGEST].sql index 16b77b4..b3c4c78 100644 --- a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[SUGGEST].sql +++ b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[SUGGEST].sql @@ -1,7 +1,8 @@ -INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('SUGGEST','BSELL','??????????'); +DELETE FROM authorised_values WHERE category='SUGGEST'; -INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('SUGGEST','SCD','????????? ? ????? ?????????'); +INSERT INTO authorised_values (category, authorised_value, lib) VALUES +('SUGGEST', 'BSELL', '??????????'), +('SUGGEST', 'SCD', '????????? ? ????? ?????????'), +('SUGGEST', 'LCL', '???????????? ????????? ??????'), +('SUGGEST', 'AVILL', '????????? ????? ??????????????? ?????'); -INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('SUGGEST','LCL','???????????? ????????? ??????'); - -INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('SUGGEST','AVILL','????????? ????? ??????????????? ?????'); \ No newline at end of file diff --git a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[WITHDRAWN].sql b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[WITHDRAWN].sql index e442303..ec7b915 100644 --- a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[WITHDRAWN].sql +++ b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[WITHDRAWN].sql @@ -1,7 +1,7 @@ DELETE FROM authorised_values WHERE category='WITHDRAWN'; INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES -('WITHDRAWN','0',''), -('WITHDRAWN','1','??????'); +('WITHDRAWN','0','?? ??????'), +('WITHDRAWN','1','?????? ?? ???????'); diff --git a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[rusmarc856].sql b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[rusmarc856].sql index 4951a05..ed7be5e 100644 --- a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[rusmarc856].sql +++ b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[rusmarc856].sql @@ -1,2 +1,5 @@ -INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`, `imageurl`) VALUES (LAST_INSERT_ID( ) + 0,'rusmarc856','1#','FTP','NULL'); -INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`, `imageurl`) VALUES (LAST_INSERT_ID( ) + 1,'rusmarc856','0#','??????????? ?????','NULL'); +DELETE FROM authorised_values WHERE category='rusmarc856'; + +INSERT INTO authorised_values (category, authorised_value, lib) VALUES +('rusmarc856','1#','FTP'), +('rusmarc856','0#','??????????? ?????'); diff --git a/installer/data/mysql/ru-RU/mandatory/class_sources.sql b/installer/data/mysql/ru-RU/mandatory/class_sources.sql index 9a5f43f..6721be4 100644 --- a/installer/data/mysql/ru-RU/mandatory/class_sources.sql +++ b/installer/data/mysql/ru-RU/mandatory/class_sources.sql @@ -2,16 +2,22 @@ -- Default classification sources and filing rules -- for Koha. -- +-- ?????????: +-- http://www.loc.gov/marc/sourcecode/classification/classificationsource.html +-- http://dublincore.org/usage/meetings/2001/05/marc-classification.htm +-- http://www.itsmarc.com/crsbeta/mergedProjects/relators/relators/codes_065_and_084_fields.htm -- TRUNCATE class_sort_rules; -- class sorting (filing) rules /* -INSERT INTO `class_sort_rules` (`class_sort_rule`, `description`, `sort_routine`) VALUES - ('dewey', '??????? ??????? ?????????? ??? ???', 'Dewey'), - ('lcc', '??????? ??????? ?????????? ??? ???', 'LCC'), - ('generic', '??????? ?????????? ??? ??????????? ????????????? ?????', 'Generic'); +INSERT INTO class_sort_rules +(class_sort_rule, description, sort_routine) VALUES + ('dewey', '??????? ??????? ?????????? ??? ???', 'Dewey'), + ('lcc', '??????? ??????? ?????????? ??? ???', 'LCC'), + ('generic', '??????? ?????????? ??? ??????????? ????????????? ?????', 'Generic'); */ + INSERT INTO class_sort_rules (class_sort_rule, description, sort_routine) VALUES ('dewey', '??????? ??????? ?????????? ??? ???', 'Dewey') ON DUPLICATE KEY UPDATE description='??????? ??????? ?????????? ??? ???',sort_routine='Dewey'; @@ -27,20 +33,66 @@ ON DUPLICATE KEY UPDATE description='??????? ?????????? ??? TRUNCATE class_sources; -- classification schemes or sources -INSERT INTO `class_sources` (`cn_source`, `description`, `used`, `class_sort_rule`) VALUES - ('ddc', '?????????? ????????????? ???? (???)', 1, 'dewey'), - ('lcc', '????????????? ?????????? ????????? (???)', 1, 'lcc'), - ('udc', '????????????? ?????????? ?????????????', 0, 'generic'), - ('sudocs', '????????????? SuDoc (U.S. GPO)', 0, 'generic'), - ('anscr', 'ANSCR (???????????)', 0, 'generic'), - ('rubbk', '??????? ??? ??? ??????? ????????? ? 30-?? ?????', 0, 'generic'), - ('rugasnti','?????????? ??????', 0, 'generic'), - ('rubbkd', '??????? ??? ??? ??????? ????????? ? 1 ?.', 0, 'generic'), - ('rubbkm', '??????? ??? ??? ???????? ????????? ? 1 ?.', 0, 'generic'), - ('rubbko', '??????? ??? ??? ????????? ????????? ? 4-? ?????', 0, 'generic'), - ('rubbknp', '??????????? ?????? ??? ??? ??????? ????????? ? 30-?? ?????', 0, 'generic'), - ('rubbkn', '??????? ??? ??? ??????? ????????? ? 5-?? ?????', 0, 'generic'), - ('rubbkmv', '??????? ??? ??? ???????? ??????? ?????????', 0, 'generic'), - ('rubbkk', '??????? ??? ??? ????????????? ????????? ?????????', 0, 'generic'), - ('z', '??????/??????? ????? ?????????????', 0, 'generic'); +INSERT INTO class_sources +(cn_source, description, used, class_sort_rule) VALUES + ('ddc', '?????????? ????????????? ???? (???)', 1, 'dewey'), + ('lcc', '????????????? ?????????? ????????? (???)', 1, 'lcc'), + ('udc', '????????????? ?????????? ?????????????', 0, 'generic'), + ('rubbk', '??????? ??? ??? ??????? ????????? ? 30-?? ?????', 0, 'generic'), + ('rugasnti','?????????? ??????', 0, 'generic'), + ('rubbkd', '??????? ??? ??? ??????? ????????? ? 1 ?.', 0, 'generic'), + ('rubbks', '??????? ??????? ???', 1, 'generic'), + ('rubbkm', '??????? ??? ??? ???????? ????????? ? 1 ?.', 0, 'generic'), + ('rubbko', '??????? ??? ??? ????????? ????????? ? 4-? ?????', 0, 'generic'), + ('rubbknp', '??????????? ?????? ??? ??? ??????? ????????? ? 30-?? ?????', 0, 'generic'), + ('rubbkn', '??????? ??? ??? ??????? ????????? ? 5-?? ?????', 0, 'generic'), + ('rubbkmv', '??????? ??? ??? ???????? ??????? ?????????', 0, 'generic'), + ('rubbkk', '??????? ??? ??? ????????????? ????????? ?????????', 0, 'generic'), + ('rueskl', '?????? ????? ????????????? ?????????? ??? ?????-??????? ? ????', 1, 'generic'), + ('sudocs', '????????????? SuDoc (U.S. GPO)', 0, 'generic'), + ('anscr', 'ANSCR (???????????)', 0, 'generic'), + ('farl', 'Frick: ?????????????? ????? Art Reference Library book', 0, 'generic'), + ('fcps', '?Class FC?: ???????????? ? ??????? ?????? ?? ?Class PS8000?: ???????????? ? ?????????? ??????????',0,'generic'), + ('fiaf', '?????????????? ????? ??? ?????????? ??? ?????? ?? ???????????', 0, 'generic'), + ('flarch', 'Florida State Archives arrangement and description procedures manual', 0, 'generic'), + ('gfdc', '????????? ??????? ??????? ???????????? (GFDC)', 0, 'generic'), + ('gadocs', '???????? ??????? ????? ????????', 0, 'generic'), + ('inspec', '???????????? INSPEC (??????, ???-??????: ?????????? INSPEC)', 0, 'generic'), + ('ipc', '?????????? ???????? ???????????? (http://www.wipo.int/classifications/ipc/en/)', 0, 'generic'), + ('kktb', '???????????? ???????????? ?????????????? ?????????? (?????)', 0, 'generic'), + ('kssb', '?????????????? ??????? ????????? ?????????', 0, 'generic'), + ('laclaw', 'Los Angeles County Law Library, class K-Law', 0, 'generic'), + ('loovs', '?????????????? ??????? L??vs (?????)', 0, 'generic'), + ('accs', 'Annehurst: ??????? ???????????? ?????????? ??????', 0, 'generic'), + ('acmccs', 'ACM: ??????????? ?????????????? ???????', 0, 'generic'), + ('agricola','AGRICOLA: ???? ?????????? ?????????', 0, 'generic'), + ('agrissc', 'AGRIS: ????????? ?????????', 0, 'generic'), + ('bcl', '??????????? ??????? ?????????????? ????', 0, 'generic'), + ('bcmc', '??????????? ??????? ???????? ????????????', 0, 'generic'), + ('bliss', 'Bliss bibliographic classification', 0, 'generic'), + ('blsrissc','?????????? ?????????? ? ????????? ???????????? ??? ?????????-?????????????? ??????? ? ?????',0,'generic'), + ('cacodoc', 'CODOC ? ?????????????? ????? ?????????? ??????????? ?? ???????????? ???????? ???????????', 0, 'generic'), + ('ccpgq', 'Cadre de classement des publication gouvernementales', 0, 'generic'), + ('clc', 'Zhongguo tu shu guan fen lei fa', 0, 'generic'), + ('clutscny','???????????? ?????????? ???????????? ????????????? ????????? ????? ???-????', 0, 'generic'), + ('cstud', '?????????????? ??????? ?????????? ?????????? ???????????? ????? (??????????)', 0, 'generic'), + ('mmlcc', 'Manual of map library classification and cataloguing', 0, 'generic'), + ('cutterec','??????????? ???????????? C.A. Cutter', 0, 'generic'), + ('sab', '?????????????? ??????? ????????? ????????? ?????????', 0, 'generic'), + ('usgslcs', '??????????? ???????????? ????????????? ???????????????', 0, 'generic'), + ('usnal', '??????????? ???????????????????? ??????????', 0, 'generic'), + ('usnlm', '???????????? ???????????? ?????????? ????????', 0, 'generic'), + ('vsiso', 'Vlaamse SISO [Schema voor de Indeling van de Systematische Catalogus in Open', 0, 'generic'), + ('ykl', '??????? ???????????? ???????? ????????? ?????????', 0, 'generic'), + ('moys', 'Moys classification and thesaurus for legal materials', 0, 'generic'), + ('msc', '??????????? ????????? ????????????', 0, 'generic'), + ('naics', 'North American industry classification system', 0, 'generic'), + ('nasasscg','NASA scope and subject category guide', 0, 'generic'), + ('ncsclt', '???? ????? ???????????? ??? ?????????? ?????????', 0, 'generic'), + ('nhcp', 'NH classification for photography', 0, 'generic'), + ('nicem', 'NICEM subject headings and classification system', 0, 'generic'), + ('njb', '????????? ???????????? Nippon', 0, 'generic'), + ('nlm', '???????????? ???????????? ?????????? ????????', 0, 'generic'), + ('rswk', 'Regeln f?r den Schlagwortkatalog', 0, 'generic'), + ('z', '??????/??????? ????? ?????????????', 0, 'generic'); diff --git a/installer/data/mysql/ru-RU/mandatory/message_transport_types.sql b/installer/data/mysql/ru-RU/mandatory/message_transport_types.sql index aceb0bc..4879d93 100644 --- a/installer/data/mysql/ru-RU/mandatory/message_transport_types.sql +++ b/installer/data/mysql/ru-RU/mandatory/message_transport_types.sql @@ -4,4 +4,6 @@ INSERT INTO message_transport_types (message_transport_type) values ('email'), -('sms'); +('print'), +('sms'), +('feed'); diff --git a/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql b/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql index 6f4ed1b..1508713 100644 --- a/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql +++ b/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql @@ -24,22 +24,22 @@ TRUNCATE permissions; INSERT INTO permissions (module_bit, code, description) VALUES ( 1, 'circulate_remaining_permissions', 'Remaining circulation permissions'), - ( 1, 'override_renewals', 'Override blocked renewals'), - ( 6, 'place_holds', 'Place holds for patrons'), - ( 6, 'modify_holds_priority', 'Modify holds priority'), - ( 9, 'edit_catalogue', 'Edit catalog (Modify bibliographic/holdings data)'), - ( 9, 'fast_cataloging', 'Fast cataloging'), - ( 9, 'edit_items', 'Edit Items'), - (11, 'vendors_manage', 'Manage vendors'), - (11, 'contracts_manage', 'Manage contracts'), - (11, 'period_manage', 'Manage periods'), - (11, 'budget_manage', 'Manage budgets'), - (11, 'budget_modify', 'Modify budget (can''t create lines, but can modify existing ones)'), - (11, 'planning_manage', 'Manage budget plannings'), - (11, 'order_manage', 'Manage orders & basket'), - (11, 'group_manage', 'Manage orders & basketgroups'), - (11, 'order_receive', 'Manage orders & basket'), - (11, 'budget_add_del', 'Add and delete budgets (but cant modify budgets)'), + ( 1, 'override_renewals', 'Override blocked renewals'), + ( 6, 'place_holds', '?????????? ?????????????? ??? ???????????'), + ( 6, 'modify_holds_priority', '????????? ?????????? ??????????????'), + ( 9, 'edit_catalogue', '?????? ???????? (????????? ????????????????? ? ?????????/???????????? ??????)'), + ( 9, 'fast_cataloging', '??????? ?????????????'), + ( 9, 'edit_items', '?????????????? ???????????'), + (11, 'vendors_manage', '?????????? ????????????'), + (11, 'contracts_manage', '?????????? ??????????'), + (11, 'period_manage', 'Manage periods'), + (11, 'budget_manage', '?????????? ???????'), + (11, 'budget_modify', '????????? ????? (?????? ????????? ??????, ?? ????? ???????? ????????????)'), + (11, 'planning_manage', '?????????? ???????????????? ?????'), + (11, 'order_manage', 'Manage orders & basket'), + (11, 'group_manage', 'Manage orders & basketgroups'), + (11, 'order_receive', 'Manage orders & basket'), + (11, 'budget_add_del', 'Add and delete budgets (but cant modify budgets)'), (13, 'edit_news', '????????? ???????? ??? ???????????? ???????? ? ?????????? ?????????????'), (13, 'label_creator', '???????? ???????? ??????? ? ?????????? ?? ???????? ? ? ??????? ? ?????????????'), (13, 'edit_calendar', '??????????? ????, ????? ?????????? ???????'), @@ -52,23 +52,22 @@ INSERT INTO permissions (module_bit, code, description) VALUES (13, 'manage_staged_marc', '?????????? ?????????????? ????-????????, ? ??? ????? ?????????? ? ???????? ??????'), (13, 'export_catalog', '??????????????? ????????????????? ?????????? ? ?????? ? ???????? ????????'), (13, 'import_patrons', '?????? ?????? ? ???????????'), - (13, 'delete_anonymize_patrons', '???????? ????????????? ? ??????????????? ???????? ??????????? ? ???????????? ??????? ????????? (??????? ??????? ?????? ?????????????)'), + (13, 'delete_anonymize_patrons', '???????? ????????????? ? ???????????????? ???????? ??????????? ? ???????????? ??????? ????????? (??????? ??????? ?????? ?????????????)'), (13, 'batch_upload_patron_images', '???????? ??????????? ??????????? ???????? ??? ???? ?????'), (13, 'schedule_tasks', '???????????? ????? ? ??????????'), - (13, 'items_batchmod', 'Perform batch modification of items'), - (13, 'items_batchdel', 'Perform batch deletion of items'), - (13, 'manage_csv_profiles', 'Manage CSV export profiles'), - (13, 'moderate_tags', 'Moderate patron tags'), - (13, 'rotating_collections', 'Manage rotating collections'), - (15, 'check_expiration', 'Check the expiration of a serial'), - (15, 'claim_serials', 'Claim missing serials'), - (15, 'create_subscription', 'Create a new subscription'), - (15, 'delete_subscription', 'Delete an existing subscription'), - (15, 'edit_subscription', 'Edit an existing subscription'), - (15, 'receive_serials', 'Serials receiving'), - (15, 'renew_subscription', 'Renew a subscription'), - (15, 'routing', 'Routing'), - (16, 'execute_reports', 'Execute SQL reports'), - (16, 'create_reports', 'Create SQL Reports') + (13, 'items_batchmod', '?????????? ????????? ????????? ???????????'), + (13, 'items_batchdel', '?????????? ????????? ???????? ???????????'), + (13, 'manage_csv_profiles', '?????????? ????????? ??????? ? CSV'), + (13, 'moderate_tags', '????????????? ???????????? ?????'), + (13, 'rotating_collections', '?????????? ?????????? ????????????? ??????????'), + (15, 'check_expiration', '???????? ????????? ???????? ??????????? ???????'), + (15, 'claim_serials', '????????? ?? ????????????? ?????????? ????????'), + (15, 'create_subscription', '???????? ????? ????????'), + (15, 'delete_subscription', '???????? ???????????? ????????'), + (15, 'edit_subscription', '?????????????? ???????????? ????????'), + (15, 'receive_serials', '????????? ?????????? ???????'), + (15, 'renew_subscription', '?????????? ????????'), + (15, 'routing', '?????????????'), + (16, 'execute_reports', '?????????? ??????? SQL'), + (16, 'create_reports', '???????? ??????? SQL') ; - diff --git a/installer/data/mysql/ru-RU/mandatory/subtag_registry.sql b/installer/data/mysql/ru-RU/mandatory/subtag_registry.sql index f2e0648..852805d 100644 --- a/installer/data/mysql/ru-RU/mandatory/subtag_registry.sql +++ b/installer/data/mysql/ru-RU/mandatory/subtag_registry.sql @@ -68,7 +68,7 @@ INSERT INTO language_subtag_registry( subtag, type, description, added) VALUES ( 'hy', 'language', 'Armenian','2005-10-16'); INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code) -VALUES( 'hy','hy'); +VALUES( 'hy','arm'); INSERT INTO language_descriptions(subtag, type, lang, description) VALUES ( 'hy', 'language', 'hy', 'Հայերէն'); @@ -164,7 +164,7 @@ INSERT INTO language_subtag_registry( subtag, type, description, added) VALUES ( 'en', 'language', 'English','2005-10-16' ); INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code) -VALUES( 'en','en'); +VALUES( 'en','eng'); INSERT INTO language_descriptions(subtag, type, lang, description) VALUES( 'en', 'language', 'en', 'English'); @@ -172,10 +172,13 @@ VALUES( 'en', 'language', 'en', 'English'); INSERT INTO language_descriptions(subtag, type, lang, description) VALUES( 'en', 'language', 'fr', 'Anglais'); --- English +-- Finnish INSERT INTO language_subtag_registry( subtag, type, description, added) VALUES ( 'fi', 'language', 'Finnish','2005-10-16' ); +INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code) +VALUES( 'fi','fin'); + INSERT INTO language_descriptions(subtag, type, lang, description) VALUES( 'fi', 'language', 'fi', 'suomi'); @@ -187,7 +190,7 @@ INSERT INTO language_subtag_registry( subtag, type, description, added) VALUES ( 'fr', 'language', 'French','2005-10-16' ); INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code) -VALUES( 'fr','fr'); +VALUES( 'fr','fre'); INSERT INTO language_descriptions(subtag, type, lang, description) VALUES( 'fr', 'language', 'en', 'French'); @@ -202,8 +205,8 @@ VALUES( 'fr', 'language', 'fr', 'Français'); INSERT INTO language_subtag_registry( subtag, type, description, added) VALUES ( 'lo', 'language', 'Lao','2005-10-16' ); --- INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code) --- VALUES( 'lo','nor'); ??? +INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code) +VALUES( 'lo','lao'); INSERT INTO language_descriptions(subtag, type, lang, description) VALUES( 'lo', 'language', 'lo', 'ພາສາລາວ'); @@ -312,7 +315,7 @@ INSERT INTO language_subtag_registry( subtag, type, description, added) VALUES ( 'it', 'language', 'Italian','2005-10-16' ); INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code) -VALUES( 'it','ind'); +VALUES( 'it','ita'); INSERT INTO language_descriptions(subtag, type, lang, description) VALUES( 'it', 'language', 'it', 'Italiano'); @@ -371,7 +374,7 @@ VALUES( 'la', 'language', 'en', 'Latin'); INSERT INTO language_descriptions(subtag, type, lang, description) VALUES( 'la', 'language', 'fr', 'Latin'); --- Galacian +-- Galician INSERT INTO language_subtag_registry( subtag, type, description, added) VALUES ( 'gl', 'language', 'Galician','2005-10-16' ); @@ -485,6 +488,9 @@ VALUES( 'ru', 'language', 'fr', 'Russe'); INSERT INTO language_subtag_registry( subtag, type, description, added) VALUES ( 'sr', 'language', 'Serbian','2005-10-16' ); +INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code) +VALUES( 'sr','srp'); + INSERT INTO language_descriptions(subtag, type, lang, description) VALUES( 'sr', 'language', 'sr', 'српски'); @@ -527,6 +533,9 @@ VALUES( 'sv', 'language', 'fr', 'Su?dois'); INSERT INTO language_subtag_registry( subtag, type, description, added) VALUES ( 'tet', 'language', 'Tetum','2005-10-16' ); +INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code) +VALUES( 'tet','tet'); + INSERT INTO language_descriptions(subtag, type, lang, description) VALUES( 'tet', 'language', 'tet', 'tetun'); @@ -582,10 +591,13 @@ VALUES( 'uk', 'language', 'en', 'Ukranian'); INSERT INTO language_descriptions(subtag, type, lang, description) VALUES( 'uk', 'language', 'fr', 'Ukrainien'); --- English +-- Urdu INSERT INTO language_subtag_registry( subtag, type, description, added) VALUES ( 'ur', 'language', 'Urdu','2005-10-16' ); +INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code) +VALUES( 'ur','urd'); + INSERT INTO language_descriptions(subtag, type, lang, description) VALUES( 'ur', 'language', 'en', 'Urdu'); diff --git a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql b/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql index 5d818e8..a71483c 100644 --- a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql +++ b/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql @@ -91,6 +91,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('MaxFine',9999,'Maximum fine a patron can have for a single late return','','Integer'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxoutstanding',5,'maximum amount withstanding to be able make holds','','Integer'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxreserves',50,'Define maximum number of holds a patron can place','','Integer'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxItemsInSearchResults',20,'Specify the maximum number of items to display for each result on a page of results',NULL,'free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('memberofinstitution',0,'If ON, patrons can be linked to institutions',NULL,'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('noissuescharge',5,'Define maximum amount withstanding before check outs are blocked','','Integer'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('NotifyBorrowerDeparture',30,'Define number of days before expiry where circulation is warned about patron account expiry',NULL,'Integer'); @@ -331,3 +332,5 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OverduesBlockCirc','noblock','When checking out an item should overdues block checkout, generate a confirmation dialogue, or allow checkout','noblock|confirmation|block','Choice'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('DisplayMultiPlaceHold','1','Display the ability to place multiple holds or not','','YesNo'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('IntranetUserCSS','','Add CSS to be included in the intranet in an embedded + + @@ -25,7 +28,7 @@

    Notes: Please return this item promptly as others are waiting for it.

    - " /> @@ -673,7 +671,7 @@ No patron matched 0 Holds - +
  • Guarantee checkouts
@@ -723,7 +721,7 @@ No patron matched

- +

@@ -849,10 +847,10 @@ No patron matched

Patron has nothing checked out.

- +
-

Relatives issues

+
@@ -862,7 +860,7 @@ No patron matched - + @@ -914,11 +912,8 @@ No patron matched
Branch Checked out on ChargeBorrowerGuarantee Material
- - -
- +
-- 1.7.3 From mason at kohaaloha.com Sun Jan 30 13:08:22 2011 From: mason at kohaaloha.com (Mason James) Date: Mon, 31 Jan 2011 01:08:22 +1300 Subject: [Koha-patches] [PATCH] fix incorrect libyaz-package name in apt-get-debian-lenny.sh Message-ID: <1296389302-23449-1-git-send-email-mason@kohaaloha.com> --- install_misc/apt-get-debian-lenny.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/install_misc/apt-get-debian-lenny.sh b/install_misc/apt-get-debian-lenny.sh index 015a32d..a94d47f 100755 --- a/install_misc/apt-get-debian-lenny.sh +++ b/install_misc/apt-get-debian-lenny.sh @@ -100,7 +100,7 @@ libxslt1.1 \ libxslt1-dev \ libyaml-perl \ libyaml-syck-perl \ -libyaz-dev \ +libyaz3-dev \ libyaz3 \ make \ mysql-server \ -- 1.7.1 From nengard at bywatersolutions.com Sun Jan 30 06:48:36 2011 From: nengard at bywatersolutions.com (Nicole Engard) Date: Sun, 30 Jan 2011 00:48:36 -0500 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 3881: OPAC Privacy reimplementation Message-ID: <1296366516-3342-1-git-send-email-nengard@bywatersolutions.com> From: Ian Walls Reimplements Paul Poulain's original OPAC Privacy patch, with some minor improvements and changes to wording If the library enables the OPACPrivacy system preference along with the opacreadinghistory preference, and sets an AnonymousPatron (must be a valid patron number in the database), the user will see a new tab upon login to the OPAC, My Privacy. From there, the user can: - Set their OPAC Privacy to one of three values 0 - Forever. This keeps their reading history unless they explicitly delete it; the bulk anonymiser won't touch it 1 - Default. Keep reading history until either they delete it or the library does 2 - Never. Instantly anonymises reading history upon item return - Instantly delete their reading history There is a warning and a popup to confirm. I've removed Paul's extra confirm checkbox, which seemed redundant A note of which preference the patron has selected is added to the Patorn Details page in the staff client. This is read-only. This patch also consolidates Privacy system preferences into the Privacy section of the OPAC tab. Thank you to BibLibre for the original implmentation of this patch, and Los Gatos Public Library for funding and testing the reimplementation. Signed-off-by: Nicole Engard --- C4/Auth.pm | 1 + C4/Circulation.pm | 44 ++++++++++-- C4/Members.pm | 26 +++++++ installer/data/mysql/de-DE/mandatory/sysprefs.sql | 4 +- installer/data/mysql/en/mandatory/sysprefs.sql | 4 +- .../1-Obligatoire/unimarc_standard_systemprefs.sql | 4 +- installer/data/mysql/it-IT/necessari/sysprefs.sql | 9 ++- installer/data/mysql/pl-PL/mandatory/sysprefs.sql | 4 +- ...m_preferences_full_optimal_for_install_only.sql | 4 +- ...m_preferences_full_optimal_for_install_only.sql | 5 +- installer/data/mysql/updatedatabase.pl | 10 +++ .../prog/en/modules/admin/preferences/opac.pref | 37 +++++++--- .../prog/en/modules/members/moremember.tmpl | 5 ++ koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc | 3 + .../opac-tmpl/prog/en/modules/opac-privacy.tmpl | 72 ++++++++++++++++++++ members/moremember.pl | 6 ++ opac/opac-privacy.pl | 68 ++++++++++++++++++ opac/opac-suggestions.pl | 2 +- 18 files changed, 279 insertions(+), 29 deletions(-) create mode 100644 koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tmpl create mode 100755 opac/opac-privacy.pl diff --git a/C4/Auth.pm b/C4/Auth.pm index fc4e3e2..130974e 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -418,6 +418,7 @@ sub get_template_and_user { OpacNav => "" . C4::Context->preference("OpacNav"), OpacPasswordChange => C4::Context->preference("OpacPasswordChange"), OPACPatronDetails => C4::Context->preference("OPACPatronDetails"), + OPACPrivacy => C4::Context->preference("OPACPrivacy"), OPACFinesTab => C4::Context->preference("OPACFinesTab"), OpacTopissue => C4::Context->preference("OpacTopissue"), RequestOnOpac => C4::Context->preference("RequestOnOpac"), diff --git a/C4/Circulation.pm b/C4/Circulation.pm index b741794..f7846ac 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -1516,7 +1516,7 @@ sub AddReturn { } if ($borrowernumber) { - MarkIssueReturned($borrowernumber, $item->{'itemnumber'}, $circControlBranch); + MarkIssueReturned($borrowernumber, $item->{'itemnumber'}, $circControlBranch, '', $borrower->{'privacy'}); $messages->{'WasReturned'} = 1; # FIXME is the "= 1" right? This could be the borrower hash. } @@ -1621,7 +1621,7 @@ sub AddReturn { =head2 MarkIssueReturned - MarkIssueReturned($borrowernumber, $itemnumber, $dropbox_branch, $returndate); + MarkIssueReturned($borrowernumber, $itemnumber, $dropbox_branch, $returndate, $privacy); Unconditionally marks an issue as being returned by moving the C row to C and @@ -1633,6 +1633,9 @@ it's safe to do this, i.e. last non-holiday > issuedate. if C<$returndate> is specified (in iso format), it is used as the date of the return. It is ignored when a dropbox_branch is passed in. +C<$privacy> contains the privacy parameter. If the patron has set privacy to 2, +the old_issue is immediately anonymised + Ideally, this function would be internal to C, not exported, but it is currently needed by one routine in C. @@ -1640,7 +1643,7 @@ routine in C. =cut sub MarkIssueReturned { - my ( $borrowernumber, $itemnumber, $dropbox_branch, $returndate ) = @_; + my ( $borrowernumber, $itemnumber, $dropbox_branch, $returndate, $privacy ) = @_; my $dbh = C4::Context->dbh; my $query = "UPDATE issues SET returndate="; my @bind; @@ -1664,6 +1667,16 @@ sub MarkIssueReturned { WHERE borrowernumber = ? AND itemnumber = ?"); $sth_copy->execute($borrowernumber, $itemnumber); + # anonymise patron checkout immediately if $privacy set to 2 and AnonymousPatron is set to a valid borrowernumber + if ( $privacy == 2) { + # The default of 0 does not work due to foreign key constraints + # The anonymisation will fail quietly if AnonymousPatron is not a valid entry + my $anonymouspatron = (C4::Context->preference('AnonymousPatron')) ? C4::Context->preference('AnonymousPatron') : 0; + my $sth_ano = $dbh->prepare("UPDATE old_issues SET borrowernumber=? + WHERE borrowernumber = ? + AND itemnumber = ?"); + $sth_ano->execute($anonymouspatron, $borrowernumber, $itemnumber); + } my $sth_del = $dbh->prepare("DELETE FROM issues WHERE borrowernumber = ? AND itemnumber = ?"); @@ -2417,11 +2430,14 @@ sub DeleteTransfer { =head2 AnonymiseIssueHistory - $rows = AnonymiseIssueHistory($borrowernumber,$date) + $rows = AnonymiseIssueHistory($date,$borrowernumber) This function write NULL instead of C<$borrowernumber> given on input arg into the table issues. if C<$borrowernumber> is not set, it will delete the issue history for all borrower older than C<$date>. +If c<$borrowernumber> is set, it will delete issue history for only that borrower, regardless of their opac privacy +setting (force delete). + return the number of affected rows. =cut @@ -2432,12 +2448,24 @@ sub AnonymiseIssueHistory { my $dbh = C4::Context->dbh; my $query = " UPDATE old_issues - SET borrowernumber = NULL - WHERE returndate < '".$date."' + SET borrowernumber = ? + WHERE returndate < ? AND borrowernumber IS NOT NULL "; - $query .= " AND borrowernumber = '".$borrowernumber."'" if defined $borrowernumber; - my $rows_affected = $dbh->do($query); + + # The default of 0 does not work due to foreign key constraints + # The anonymisation will fail quietly if AnonymousPatron is not a valid entry + my $anonymouspatron = (C4::Context->preference('AnonymousPatron')) ? C4::Context->preference('AnonymousPatron') : 0; + my @bind_params = ($anonymouspatron, $date); + if (defined $borrowernumber) { + $query .= " AND borrowernumber = ?"; + push @bind_params, $borrowernumber; + } else { + $query .= " AND (SELECT privacy FROM borrowers WHERE borrowers.borrowernumber=old_issues.borrowernumber) <> 0"; + } + my $sth = $dbh->prepare($query); + $sth->execute(@bind_params); + my $rows_affected = $sth->rows; ### doublecheck row count return function return $rows_affected; } diff --git a/C4/Members.pm b/C4/Members.pm index 00716cd..fafc99b 100644 --- a/C4/Members.pm +++ b/C4/Members.pm @@ -93,6 +93,7 @@ BEGIN { push @EXPORT, qw( &ModMember &changepassword + &ModPrivacy ); #Delete data @@ -2022,6 +2023,31 @@ sub DebarMember { } +=head2 ModPrivacy + +=over 4 + +my $success = ModPrivacy( $borrowernumber, $privacy ); + +Update the privacy of a patron. + +return : +true on success, false on failure + +=back + +=cut + +sub ModPrivacy { + my $borrowernumber = shift; + my $privacy = shift; + return unless defined $borrowernumber; + return unless $borrowernumber =~ /^\d+$/; + + return ModMember( borrowernumber => $borrowernumber, + privacy => $privacy ); +} + =head2 AddMessage AddMessage( $borrowernumber, $message_type, $message, $branchcode ); diff --git a/installer/data/mysql/de-DE/mandatory/sysprefs.sql b/installer/data/mysql/de-DE/mandatory/sysprefs.sql index 19f7c4d..02511d8 100644 --- a/installer/data/mysql/de-DE/mandatory/sysprefs.sql +++ b/installer/data/mysql/de-DE/mandatory/sysprefs.sql @@ -9,7 +9,8 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AmazonLocale','US','Use to set the Locale of your Amazon.com Web Services','US|CA|DE|FR|JP|UK','Choice'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AWSAccessKeyID','','See: http://aws.amazon.com','','free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AmazonAssocTag','','See: http://aws.amazon.com','','free'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AnonSuggestions',0,'Set to anonymous borrowernumber to enable Anonymous suggestions',NULL,'free'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AnonSuggestions',0,'Set to enable Anonymous suggestions to AnonymousPatron borrowernumber',NULL,'YesNo'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AnonymousPatron', '0', 'Set the identifier (borrowernumber) of the anonymous patron. Used for Suggestion and reading history privacy',NULL,''); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('Babeltheque',0,'Turn ON Babeltheque content - See babeltheque.com to subscribe to this service','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('authoritysep','--','Used to separate a list of authorities in a display. Usually --',10,'free'); @@ -79,6 +80,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacNav','Important links here.','Use HTML tags to add navigational links to the left-hand navigational bar in OPAC','70|10','Textarea'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACNoResultsFound','','Display this HTML when no results are found for a search in the OPAC','70|10','Textarea'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacPasswordChange',1,'If ON, enables patron-initiated password change in OPAC (disable it when using LDAP auth)',NULL,'YesNo'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacPrivacy', '0', 'if ON, allows patrons to define their privacy rules (reading history)',NULL,'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacreadinghistory',1,'If ON, enables display of Patron Circulation History in OPAC','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacsmallimage','','Enter a complete URL to an image to replace the default Koha logo','','free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacstylesheet','','Enter a complete URL to use an alternate layout stylesheet in OPAC','','free'); diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql index b597b02..0b75e98 100644 --- a/installer/data/mysql/en/mandatory/sysprefs.sql +++ b/installer/data/mysql/en/mandatory/sysprefs.sql @@ -9,7 +9,8 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AmazonLocale','US','Use to set the Locale of your Amazon.com Web Services','US|CA|DE|FR|JP|UK','Choice'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AWSAccessKeyID','','See: http://aws.amazon.com','','free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AmazonAssocTag','','See: http://aws.amazon.com','','free'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AnonSuggestions',0,'Set to anonymous borrowernumber to enable Anonymous suggestions',NULL,'free'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AnonSuggestions',0,'Set to enable Anonymous suggestions to AnonymousPatron borrowernumber',NULL,'YesNo'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AnonymousPatron', '0', 'Set the identifier (borrowernumber) of the anonymous patron. Used for Suggestion and reading history privacy',NULL,''); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('Babeltheque',0,'Turn ON Babeltheque content - See babeltheque.com to subscribe to this service','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('authoritysep','--','Used to separate a list of authorities in a display. Usually --',10,'free'); @@ -79,6 +80,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacNav','Important links here.','Use HTML tags to add navigational links to the left-hand navigational bar in OPAC','70|10','Textarea'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACNoResultsFound','','Display this HTML when no results are found for a search in the OPAC','70|10','Textarea'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacPasswordChange',1,'If ON, enables patron-initiated password change in OPAC (disable it when using LDAP auth)',NULL,'YesNo'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacPrivacy', '0', 'if ON, allows patrons to define their privacy rules (reading history)',NULL,'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacreadinghistory',1,'If ON, enables display of Patron Circulation History in OPAC','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacsmallimage','','Enter a complete URL to an image to replace the default Koha logo','','free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacstylesheet','','Enter a complete URL to use an alternate layout stylesheet in OPAC','','free'); diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql index b051ba3..757f255 100644 --- a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql +++ b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql @@ -10,7 +10,8 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AmazonLocale','US','Utilis? pour d?finir la localisation des web services Amazon','US|CA|DE|FR|JP|UK','Choice'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AWSAccessKeyID','','Voir : http://aws.amazon.com','','free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AmazonAssocTag', '', 'Voir : associates.amazon.com/gp/flex/associates/apply-login.html', '', ''); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AnonSuggestions', '0', 'Attribu?e au n? de l''emprunteur anonyme pour activer les suggestions anonymes. 0, pas de suggestions anonymes.', '', 'free'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AnonSuggestions',0,'Set to enable Anonymous suggestions to AnonymousPatron borrowernumber',NULL,'YesNo'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AnonymousPatron', '0', 'Set the identifier (borrowernumber) of the anonymous patron. Used for Suggestion and reading history privacy',NULL,''); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('Babeltheque',0,'Active les contenus Babelth?que - Voir babeltheque.com pour s''abonner','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('authoritysep', '--', 'Le s?parateur utilis? dans les autorit?s. Habituellement --', '10', 'free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('autoBarcode', 'OFF', 'Utilis? pour g?n?rer automatiquement les codes barre: incremental sera de la forme 1, 2, 3; annual de la forme 2007-0001, 2007-0002, hbyymmincr de la forme HB09010001 o? HB=la branche d''appartenance', 'incremental|annual|hbyymmincr|OFF', 'Choice'); @@ -91,6 +92,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacMainUserBlock','Bienvenue dans Koha...\r\n
','Bloc HTML d?fini par la biblioth?que, qui appara?t sur la page principale de l''OPAC','70|10','Textarea'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacNav', '', 'Ce param?tre contient du code HTML, qui est mis au d?but de la barre de navigation, sur la gauche, ? l''OPAC.','70|10', 'Textarea'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacPasswordChange', '1', 'Si ce param?tre est activ?, les adh?rents peuvent modifier leur mot de passe ? l''OPAC. A d?sactiver si vous utilisez l''authentification ldap', '', 'YesNo'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacPrivacy', '0', 'if ON, allows patrons to define their privacy rules (reading history)',NULL,'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacreadinghistory', '1', 'Si ce param?tre est activ?, les adh?rents peuvent consulter leur historique de lecture ? l''OPAC', '', 'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacsmallimage', '', 'Ce param?tre contient une URL. Il permet de d?finir l''image qui est affich?e en haut, ? gauche de l''OPAC', '', 'free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacstylesheet', '', 'Ce param?tre a la forme d''une URL. Il d?finit la feuille de style utilis?e ? l''OPAC. S''il est vide, vous aurez la feuille de style par d?fault de Koha', '', 'free'); diff --git a/installer/data/mysql/it-IT/necessari/sysprefs.sql b/installer/data/mysql/it-IT/necessari/sysprefs.sql index 06f279d..cc00e68 100644 --- a/installer/data/mysql/it-IT/necessari/sysprefs.sql +++ b/installer/data/mysql/it-IT/necessari/sysprefs.sql @@ -9,6 +9,7 @@ insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('advancedMARCeditor','0','','Se su ON, nel MARC editor non verranno visualizzati i campi/sottocampi delle descrizioni.','YesNo'); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('AdvancedSearchTypes','itemtypes','itemtypes|ccode','Selezionare quale set di campi comprender? la ricerca avanzata per tipo.','Choice'); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('AllowHoldsOnDamagedItems','1','','Permette l\'inserimento di richieste di prenotazione su copie danneggiate','YesNo'); +insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('AllowNotForLoanOverride','0','','Se ON, abilita il bibliotecario a poter scegliere di dare in prestito un documento normalmente escluso.','YesNo'); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('AllowOnShelfHolds','1','','Permette di inserire prenotazioni su documenti non in prestito.','YesNo'); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('AllowRenewalLimitOverride','1','','Se On, permette che i limiti ai rinnovi possano essere superati dal bibliotecario nel modulo della circolazione','YesNo'); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('AmazonAssocTag','','','See: http://aws.amazon.com','free'); @@ -17,7 +18,9 @@ insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('AmazonLocale','US','US|CA|DE|FR|JP|UK','Usalo per definire il tuo specifico Amazon.com Web Services','Choice'); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('AmazonReviews','0','','Visualizza Amazon reviews sull\'interfaccia dello staff.','YesNo'); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('AmazonSimilarItems','0','','Messa su ON attiva l\' Amazon Similar Items feature - Devi settare i valori in AWSAccessKeyID e in AmazonAssocTag per usarla','YesNo'); -insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('AnonSuggestions','0','','Imposta un utente anonimo per abilitare i suggerimenti d\'acquisto da utenti non registrati.','free'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AnonSuggestions',0,'Set to enable Anonymous suggestions to AnonymousPatron borrowernumber',NULL,'YesNo'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AnonymousPatron', '0', 'Set the identifier (borrowernumber) of the anonymous patron. Used for Suggestion and reading history privacy',NULL,''); +insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('AuthDisplayHierarchy','0','','Se ON attiva la gestione gerarchica dell\'authority. Da usare solo con thesaurus','YesNo'); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('authoritysep','--','10','Carattere usato nella visualizzazione come separatore della lista delle authority. Normalmente ? --','free'); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('autoBarcode','annual','incremental|annual|hbyymmincr|OFF','Da usare per impostare la generazione automatica dei barcode: incremental per la tipologia 1, 2, 3; annuale per 2007-0001, 2007-0002; hbyymmincr per HB08010001 dove HB sta per Home Branch (sottobiblioteca predefinita)','Choice'); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('AutoEmailOpacUser','0','','Quando viene creato un account, invia notifica via email all\'utente con i dettagli del nuovo account.','YesNo'); @@ -89,10 +92,12 @@ insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, -- insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('marcflavour','UNIMARC','MARC21|UNIMARC','Define global MARC flavor (MARC21 or UNIMARC) used for character encoding','Choice'); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('MARCOrgCode','0','','Il MARC Organization Code - http://www.loc.gov/marc/organizations/orgshome.html','free'); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('MaxFine','9999','','Multa massima che un utente potrebbe avere per un singolo ritardo.','Integer'); +insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('maxItemsInSearchResults','20','','Specifica il numero massimo di copie visualizzate nelle pagine di risultati','free'); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('maxoutstanding','5','','Definisci il numero massimo di operazioni in corso (prestiti+prenotazioni) dopo il quale si blocca la possibilit? di fare prenotazioni','Integer'); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('maxreserves','2','','Definisce il numero massimo di prenotazioni che un utente pu? effettuare.','Integer'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxItemsInSearchResults',20,'Specify the maximum number of items to display for each result on a page of results',NULL,'free'); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('memberofinstitution','0','','Se ON, gli utenti possono essere linkati alle istituzioni.','YesNo'); +insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('MergeAuthoritiesOnUpdate','1','','Se ON, aggiornando le authorities saranno automaticamente aggiornati anche i record bibliografici','YesNo'); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('minPasswordLength','3','','Specifica la lunghezza minima della password sia per l\'utente che per lo staff','free'); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('noissuescharge','5','','Definisce l?ammontare massimo di multa che un utente pu? raggiungere prima di venir sospeso dal prestito','Integer'); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('noItemTypeImages','0','','Se Attivo, disabilita le immagini relative al tipo documento','YesNo'); @@ -130,6 +135,7 @@ insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('OPACNoResultsFound','','Display this HTML when no results are found for a search in the OPAC','70|10','Textarea'); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('OPACnumSearchResults','20','','Specifica il numero massimo di risposte da visualizzare nella pagina dei risultati ','Integer'); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('OpacPasswordChange','1','','Se ON, abilita l\'utente alla modifica della password nell\'OPAC (disabiltare la funzione quando ? usato LDAP auth)','YesNo'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacPrivacy', '0', 'if ON, allows patrons to define their privacy rules (reading history)',NULL,'YesNo'); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('opacreadinghistory','1','','Se ON, si abilita la visualizzazione dello storico circolazione utente nell\'OPAC','YesNo'); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('OpacRenewalAllowed','0','','Se ON, gli utenti possono rinnovare i propri prestiti direttamente dal proprio account OPAC','YesNo'); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('OPACShelfBrowser','0','','Abilita/disabilita una ricerca per scaffale (Shelf Browser) nella pagina dettagli documento. ATTENZIONE: questa feature consuma molte risorse nelle collezioni molto grandi.','YesNo'); @@ -153,6 +159,7 @@ insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('QueryStemming','0','','Se ON, abilita le ricerche con lo stemming (uso di forme variabili)','YesNo'); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('QueryWeightFields','0','','Se ON, abilita le opzioni di ricerca per dare uno peso diverso ai vari campi. Opzione sperimentale','YesNo'); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('RandomizeHoldsQueueWeight','0','','Se ON, la coda delle prenotazione nella circolazione avr? un ordine casuale per tutte le collocazioni o solo per quelle collocazioni specificate sotto StaticHoldsQueueWeight, se impostato.','YesNo'); +insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('ReceiveBackIssues','5','','Numero di periodici precedenti da visualizzare quando si guarda il dettaglio di una sottoscrizione',''); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('RenewalPeriodBase','date_due','date_due|now','Per impostare se la data di rinnovo deve essere conteggiata a partire dalla data di scadenza del prestito o a partire dal momento in cui l?utente ne chiede il rinnovo.','Choice'); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('RenewSerialAddsSuggestion','0','','Se ON, puoi aggiungere un nuovo suggerimento durante il rinnovo di un periodico','YesNo'); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('RequestOnOpac','1','','Se ON, si abilitano gli utenti globalmente a inserire prenotazione nell\'OPAC','YesNo'); diff --git a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql index c87729c..8689c4c 100644 --- a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql +++ b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql @@ -9,7 +9,8 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AmazonLocale','US','Use to set the Locale of your Amazon.com Web Services','US|CA|DE|FR|JP|UK','Choice'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AWSAccessKeyID','','See: http://aws.amazon.com','','free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AmazonAssocTag','','See: http://aws.amazon.com','','free'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AnonSuggestions',0,'Set to anonymous borrowernumber to enable Anonymous suggestions',NULL,'free'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AnonSuggestions',0,'Set to enable Anonymous suggestions to AnonymousPatron borrowernumber',NULL,'YesNo'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AnonymousPatron', '0', 'Set the identifier (borrowernumber) of the anonymous patron. Used for Suggestion and reading history privacy',NULL,''); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('Babeltheque',0,'Turn ON Babeltheque content - See babeltheque.com to subscribe to this service','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('authoritysep','--','Used to separate a list of authorities in a display. Usually --',10,'free'); @@ -78,6 +79,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacMainUserBlock','Welcome to Koha...\r\n
','A user-defined block of HTML in the main content area of the opac main page','70|10','Textarea'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacNav','Important links here.','Use HTML tags to add navigational links to the left-hand navigational bar in OPAC','70|10','Textarea'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacPasswordChange',1,'If ON, enables patron-initiated password change in OPAC (disable it when using LDAP auth)',NULL,'YesNo'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacPrivacy', '0', 'if ON, allows patrons to define their privacy rules (reading history)',NULL,'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacreadinghistory',1,'If ON, enables display of Patron Circulation History in OPAC','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacsmallimage','','Enter a complete URL to an image to replace the default Koha logo','','free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacstylesheet','','Enter a complete URL to use an alternate layout stylesheet in OPAC','','free'); diff --git a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql b/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql index 993c6c3..c862e60 100644 --- a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql +++ b/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql @@ -24,7 +24,8 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AmazonLocale','US','Use to set the Locale of your Amazon.com Web Services','US|CA|DE|FR|JP|UK','Choice'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AWSAccessKeyID','','See: http://aws.amazon.com','','free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AmazonAssocTag','','See: http://aws.amazon.com','','free'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AnonSuggestions',0,'Set to anonymous borrowernumber to enable Anonymous suggestions',NULL,'free'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AnonSuggestions',0,'Set to enable Anonymous suggestions to AnonymousPatron borrowernumber',NULL,'YesNo'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AnonymousPatron', '0', 'Set the identifier (borrowernumber) of the anonymous patron. Used for Suggestion and reading history privacy',NULL,''); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('authoritysep','--','Used to separate a list of authorities in a display. Usually --',10,'free'); @@ -107,6 +108,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacMainUserBlock','????? ?????????? ? ???? Koha...\r\n
','A user-defined block of HTML in the main content area of the opac main page','50|20','Textarea'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacNav','????? ????? ?????? ??????.','Use HTML tags to add navigational links to the left-hand navigational bar in OPAC','70|10','Textarea'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacPasswordChange',1,'If ON, enables patron-initiated password change in OPAC (disable it when using LDAP auth)',NULL,'YesNo'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacPrivacy', '0', 'if ON, allows patrons to define their privacy rules (reading history)',NULL,'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacreadinghistory',1,'If ON, enables display of Patron Circulation History in OPAC','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacsmallimage','','Enter a complete URL to an image to replace the default Koha logo','','free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacstylesheet','','Enter a complete URL to use an alternate layout stylesheet in OPAC','','free'); diff --git a/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql b/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql index 3416b2e..82e285b 100644 --- a/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql +++ b/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql @@ -24,8 +24,8 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AmazonLocale','US','Use to set the Locale of your Amazon.com Web Services','US|CA|DE|FR|JP|UK','Choice'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AWSAccessKeyID','','See: http://aws.amazon.com','','free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AmazonAssocTag','','See: http://aws.amazon.com','','free'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AnonSuggestions',0,'Set to anonymous borrowernumber to enable Anonymous suggestions',NULL,'free'); - +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AnonSuggestions',0,'Set to enable Anonymous suggestions to AnonymousPatron borrowernumber',NULL,'YesNo'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AnonymousPatron', '0', 'Set the identifier (borrowernumber) of the anonymous patron. Used for Suggestion and reading history privacy',NULL,''); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('authoritysep','--','Used to separate a list of authorities in a display. Usually --',10,'free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('autoBarcode','incremental','Used to autogenerate a barcode: incremental will be of the form 1, 2, 3; annual of the form 2007-0001, 2007-0002; hbyymmincr of the form HB08010001 where HB=Home Branch','incremental|annual|hbyymmincr|OFF','Choice'); @@ -107,6 +107,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacMainUserBlock','??????? ? ???? Koha...\r\n
','A user-defined block of HTML in the main content area of the opac main page','50|20','Textarea'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacNav','??? ?????? ??????? ?????????.','Use HTML tags to add navigational links to the left-hand navigational bar in OPAC','70|10','Textarea'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacPasswordChange',1,'If ON, enables patron-initiated password change in OPAC (disable it when using LDAP auth)',NULL,'YesNo'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacPrivacy', '0', 'if ON, allows patrons to define their privacy rules (reading history)',NULL,'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacreadinghistory',1,'If ON, enables display of Patron Circulation History in OPAC','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacsmallimage','','Enter a complete URL to an image to replace the default Koha logo','','free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacstylesheet','','Enter a complete URL to use an alternate layout stylesheet in OPAC','','free'); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index f03f48f..2d89b02 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -3970,6 +3970,16 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion ($DBversion); } +$DBversion = '3.03.00.xxx'; +if (C4::Context->preference("Version") < TransformToNum($DBversion)) { + # reimplement OpacPrivacy system preference + $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacPrivacy', '0', 'if ON, allows patrons to define their privacy rules (reading history)',NULL,'YesNo')"); + $dbh->do("ALTER TABLE `borrowers` ADD `privacy` INTEGER NOT NULL DEFAULT 1;"); + $dbh->do("ALTER TABLE `deletedborrowers` ADD `privacy` INTEGER NOT NULL DEFAULT 1;"); + print "Upgrade to $DBversion done (OpacPrivacy reimplementation)\n"; + SetVersion($DBversion); +}; + =head1 FUNCTIONS =head2 DropAllForeignKeys($table) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref index 8707c25..3014e63 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref @@ -202,12 +202,6 @@ OPAC: no: "Don't allow" - patrons to store items in a temporary "Cart" on the OPAC. - - - pref: opacreadinghistory - choices: - yes: Allow - no: "Don't allow" - - patrons to see what books they have checked out in the past. - - - pref: OpacTopissue choices: yes: Allow @@ -245,12 +239,6 @@ OPAC: yes: Limit no: "Don't limit" - "patrons' searches to the library they are registered at." - - - - pref: AnonSuggestions - choices: - yes: Allow - no: "Don't allow" - - "patrons that aren't logged in to make purchase suggestions." # - # This system preference does not actually affect anything # - pref: OpacBrowser @@ -288,12 +276,37 @@ OPAC: - purchase suggestions from other patrons on the OPAC. Privacy: - + - pref: AnonSuggestions + choices: + yes: Allow + no: "Don't allow" + - "patrons that aren't logged in to make purchase suggestions. Suggestions are connected to the AnonymousPatron syspref" + - + - pref: opacreadinghistory + choices: + yes: Allow + no: "Don't allow" + - patrons to see what books they have checked out in the past. + - - pref: EnableOpacSearchHistory default: 0 choices: yes: Keep no: "Don't keep" - patron search history in the OPAC. + - + - pref: OPACPrivacy + default: 0 + choices: + yes: Allow + no: "Don't allow" + - patrons to choose their own privacy settings for their reading history. This requires opacreadinghistory and AnonymousPatron + - + - Use borrowernumber + - pref: AnonymousPatron + class: integer + - as the Anonymous Patron (for anonymous suggestions and reading history) + Shelf Browser: - - pref: OPACShelfBrowser diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl index 030c78a..2cdc13a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl @@ -320,6 +320,11 @@ function validate1(date) {
  • Library:
    • +
  • Privacy Pref: + Forever + Default + Never +
  • Sort field 1:
  • Sort field 2:
  • OPAC login:
    • diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc b/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc index b9e4f74..86ba2f6 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc @@ -17,6 +17,9 @@
  • my reading history
    • + +
  • my privacy
    • + diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tmpl new file mode 100644 index 0000000..92c8973 --- /dev/null +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tmpl @@ -0,0 +1,72 @@ +Koha Online Catalog › Privacy management for + + + +
    +
    + + +
    +
    +
    +

    's account l../../images/caret.gif" width="16" height="16" alt=">" border="0" /> Privacy policy

    + + +
    Your reading history has been deleted.
    + + +
    Your privacy rules have been updated
    + + +

    Privacy rule

    + +

    We take great care in protecting your privacy. On this screen, you can define how long we keep your reading history.

    +

    Your options are:

    +

    + +
      +
    • Forever: keep my reading history without limit. This is the option for users who want to keep track of what they are reading.
      • +
    • Default: keep my reading history according to local laws. This is the default option : the library will keep your reading history for the duration permitted by local laws.
      • +
    • Never: Delete my reading history immediately. This will delete all record of the item that was checked-out upon check-in.
      • +
    +

    Please note that information on any book still checked-out must be kept by the library no matter which privacy option you choose.

    +

    Please also note that the library staff can't update these values for you: it's your privacy!

    + + + +
    +

    Immediate deletion

    +
    + +

    Whatever your privacy rule you choose, you can delete all your reading history immediately by clicking here. BE CAREFUL. Once you've confirmed the deletion, no one can retrieve the list!

    + +
    + +
    +
    +
    +
    +
    +
    + + +
    +
    +
    + diff --git a/members/moremember.pl b/members/moremember.pl index 7de3fb0..ac98e1e 100755 --- a/members/moremember.pl +++ b/members/moremember.pl @@ -230,6 +230,12 @@ my $lib2 = &GetSortDetails( "Bsort2", $data->{'sort2'} ); $template->param( lib1 => $lib1 ) if ($lib1); $template->param( lib2 => $lib2 ) if ($lib2); +# Show OPAC privacy preference is system preference is set +if ( C4::Context->preference('OPACPrivacy') ) { + $template->param( OPACPrivacy => 1); + $template->param( "privacy".$data->{'privacy'} => 1); +} + # current issues # my $issue = GetPendingIssues($borrowernumber); diff --git a/opac/opac-privacy.pl b/opac/opac-privacy.pl new file mode 100755 index 0000000..ca50560 --- /dev/null +++ b/opac/opac-privacy.pl @@ -0,0 +1,68 @@ +#!/usr/bin/perl +# This script lets the users change their privacy rules +# +# copyright 2009, BibLibre, paul.poulain at biblibre.com +# +# Koha is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# Koha is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, +# Suite 330, Boston, MA 02111-1307 USA + +use strict; +use CGI; + +use C4::Auth; # checkauth, getborrowernumber. +use C4::Context; +use C4::Circulation; +use C4::Members; +use C4::Output; +use C4::Dates; + +my $query = new CGI; +my $dbh = C4::Context->dbh; + +my ( $template, $borrowernumber, $cookie ) = get_template_and_user( + { + template_name => "opac-privacy.tmpl", + query => $query, + type => "opac", + authnotrequired => 0, + flagsrequired => { borrow => 1 }, + debug => 1, + } +); + +my $op = $query->param("op"); +my $privacy = $query->param("privacy"); + +if ($op eq "update_privacy") +{ + ModPrivacy($borrowernumber,$privacy); + $template->param('privacy_updated' => 1); +} +if ($op eq "delete_record") { + # delete all reading records for items returned + # uses a hardcoded date ridiculously far in the future + AnonymiseIssueHistory('2999-12-12',$borrowernumber); + # confirm the user the deletion has been done + $template->param('deleted' => 1); +} +# get borrower privacy .... +my ( $borr ) = GetMemberDetails( $borrowernumber ); + +$template->param( 'Ask_data' => '1', + 'privacy'.$borr->{'privacy'} => 1, + 'firstname' => $borr->{'firstname'}, + 'surname' => $borr->{'surname'}, + 'privacyview' => 1, +); + +output_html_with_http_headers $query, $cookie, $template->output; diff --git a/opac/opac-suggestions.pl b/opac/opac-suggestions.pl index a2a6670..2f0dc36 100755 --- a/opac/opac-suggestions.pl +++ b/opac/opac-suggestions.pl @@ -48,7 +48,7 @@ if ( C4::Context->preference("AnonSuggestions") ) { } ); if ( !$$suggestion{suggestedby} ) { - $$suggestion{suggestedby} = C4::Context->preference("AnonSuggestions"); + $$suggestion{suggestedby} = C4::Context->preference("AnonymousPatron"); } } else { -- 1.5.6.5 From colin.campbell at ptfs-europe.com Mon Jan 31 11:14:08 2011 From: colin.campbell at ptfs-europe.com (Colin Campbell) Date: Mon, 31 Jan 2011 10:14:08 +0000 Subject: [Koha-patches] [PATCH] Bug 5665: Routing slip prints too wide for narrow printers Message-ID: <1296468848-21215-1-git-send-email-colin.campbell@ptfs-europe.com> From: Reed Wade This patch switches off some min-width styling which causes right hand of page to be clipped. Work sponsored by Opus Signed-off-by: Colin Campbell --- .../en/modules/serials/routing-preview-slip.tmpl | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tmpl index d55ec74..3180337 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tmpl @@ -4,7 +4,10 @@ + + @@ -25,7 +28,7 @@

    Notes: Please return this item promptly as others are waiting for it.

    - -
    -- 1.5.6.5 From oleonard at myacpl.org Mon Jan 31 21:45:40 2011 From: oleonard at myacpl.org (Owen Leonard) Date: Mon, 31 Jan 2011 15:45:40 -0500 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 4160: Currency conversion doesn't handle rates other than 100 Message-ID: <1296506740-8293-1-git-send-email-oleonard@myacpl.org> From: Katrin Fischer Changes data type for currency.rate to accomodate bigger currency conversion rates. FLOAT( 15, 5 ) Signed-off-by: Owen Leonard --- installer/data/mysql/kohastructure.sql | 2 +- installer/data/mysql/updatedatabase.pl | 7 +++++++ kohaversion.pl | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index 5e0c6b6..e7ad97f 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -563,7 +563,7 @@ CREATE TABLE `currency` ( `currency` varchar(10) NOT NULL default '', `symbol` varchar(5) default NULL, `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, - `rate` float(7,5) default NULL, + `rate` float(15,5) default NULL, `active` tinyint(1) default NULL, PRIMARY KEY (`currency`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 640868a..3f68b9f 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -3980,6 +3980,13 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion($DBversion); }; +$DBversion = '3.03.00.00X'; +if (C4::Context->preference("Version") < TransformToNum($DBversion)) { + $dbh->do("ALTER TABLE `currency` CHANGE `rate` `rate` FLOAT( 15, 5 ) NULL DEFAULT NULL;"); + print "Upgrade to $DBversion done (Enable currency rates >= 100)\n"; + SetVersion ($DBversion); +} + =head1 FUNCTIONS =head2 DropAllForeignKeys($table) diff --git a/kohaversion.pl b/kohaversion.pl index eedf68c..3ece202 100644 --- a/kohaversion.pl +++ b/kohaversion.pl @@ -16,7 +16,7 @@ the kohaversion is divided in 4 parts : use strict; sub kohaversion { - our $VERSION = '3.03.00.016'; + our $VERSION = '3.0X.XX.XXX'; # version needs to be set this way # so that it can be picked up by Makefile.PL # during install -- 1.7.3 From nengard at bywatersolutions.com Mon Jan 31 03:43:55 2011 From: nengard at bywatersolutions.com (Nicole Engard) Date: Sun, 30 Jan 2011 21:43:55 -0500 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 2341: items marked 'on order' not reserveable from search results Message-ID: <1296441835-5362-1-git-send-email-nengard@bywatersolutions.com> From: Ian Walls Items created as part of the acquisitions process, and assigned the temporary notforloan value of -1, cannot be placed on hold from the search results in either the OPAC or staff client (the link is missing). This patch changes the evaluation of items->notforloan from a Boolean (if $items->{notforloan}) to a comparison (if $items->{notforloan} > 0). Any notforloan status with a negative value can therefore be reserved. Signed-off-by: Nicole Engard --- C4/Search.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/C4/Search.pm b/C4/Search.pm index dd41886..a469948 100644 --- a/C4/Search.pm +++ b/C4/Search.pm @@ -1612,7 +1612,7 @@ sub searchResults { if ( $item->{wthdrawn} || $item->{itemlost} || $item->{damaged} - || $item->{notforloan} + || $item->{notforloan} > 0 || $reservestatus eq 'Waiting' || ($transfertwhen ne '')) { -- 1.5.6.5