From magnus at enger.priv.no Sat Oct 1 17:45:42 2011
From: magnus at enger.priv.no (Magnus Enger)
Date: Sat, 1 Oct 2011 17:45:42 +0200
Subject: [Koha-patches] [PATCH] Bug 6953 - Value builder for NORMARC 007
does not show further options
Message-ID: <1317483942-5566-1-git-send-email-magnus@enger.priv.no>
A previous commit introduced a missing TT control structure, but
forgot to include the trailing "\" for multiline JavaScript.
This patch simply adds the missing "\".
---
.../cataloguing/value_builder/normarc_field_007.tt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/normarc_field_007.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/normarc_field_007.tt
index cb36c85..b959357 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/normarc_field_007.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/normarc_field_007.tt
@@ -254,7 +254,7 @@ function RedrawChoices(typ){
\
[% ELSE %] \
\
- [% END %]
+ [% END %] \
[% IF ( f4a ) %] \
\
[% ELSE %] \
--
1.7.4.1
From oleonard at myacpl.org Mon Oct 3 15:32:50 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon, 3 Oct 2011 09:32:50 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 6955,
Toolbar on reading history broken
Message-ID: <1317648770-20542-1-git-send-email-oleonard@myacpl.org>
Table sorter script causes error if there is no
to sort.
JS errors cause the YUI toolbar js to abort, causing the problem
observed. When there are no results the whole table should be
omitted and a message displayed in its place.
---
.../prog/en/modules/members/readingrec.tt | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
index c61006b..ac5ee68 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
@@ -30,6 +30,7 @@
[% INCLUDE 'circ-toolbar.inc' %]
Circulation History
+[% IF ( loop_reading ) %]
@@ -93,7 +94,9 @@
[% END %]
-
+[% ELSE %]
+
This patron has no circulation history.
+[% END %]
--
1.7.3
From oleonard at myacpl.org Mon Oct 3 16:48:16 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon, 3 Oct 2011 10:48:16 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 6957,
authors disappearing when emailing lists
Message-ID: <1317653296-21377-1-git-send-email-oleonard@myacpl.org>
Standard author information wasn't even in the template markup, only
"additional author." Added standard author and improved output of
additional authors (hiding label when empty).
Also added subtitle via GetRecordValue (see bug 3550).
Also added check for and output of OPACBaseURL in order
to make OPAC links in the email clickable.
---
.../prog/en/modules/virtualshelves/sendshelf.tt | 12 +++++++-----
.../opac-tmpl/prog/en/modules/opac-sendshelf.tt | 11 +++++++----
opac/opac-sendshelf.pl | 10 ++++++++--
virtualshelves/sendshelf.pl | 10 ++++++++--
4 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt
index 5fbb31f..52f36c9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt
@@ -17,9 +17,11 @@ Reference Manager or ProCite.
[% IF ( comment ) %]
[% comment %]
[% END %]
-[% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %][% BIBLIO_RESULT.title %][% IF ( BIBLIO_RESULT.subtitle ) %] [% BIBLIO_RESULT.subtitle %][% END %][% IF ( BIBLIO_RESULT.MARCAUTHORS ) %]
-Author(s): [% FOREACH MARCAUTHOR IN BIBLIO_RESULT.MARCAUTHORS %][% FOREACH MARCAUTHOR_SUBFIELDS_LOO IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %][% MARCAUTHOR_SUBFIELDS_LOO.separator %][% MARCAUTHOR_SUBFIELDS_LOO.value %][% END %][% UNLESS ( loop.last ) %]; [% ELSE %]
-[% END %][% END %][% END %][% IF ( BIBLIO_RESULT.ISBN ) %]
+[% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %][% BIBLIO_RESULT.title %][% IF ( BIBLIO_RESULT.subtitle.size ) %] [% FOREACH subtitle IN BIBLIO_RESULT.subtitle %][% subtitle.subfield %][% END %][% END %][% IF ( BIBLIO_RESULT.author ) %]
+
+by [% BIBLIO_RESULT.author %][% END %]
+[% IF ( BIBLIO_RESULT.MARCAUTHORS.size ) %]
+Additional author(s): [% FOREACH MARCAUTHOR IN BIBLIO_RESULT.MARCAUTHORS %][% FOREACH MARCAUTHOR_SUBFIELDS_LOO IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %][% MARCAUTHOR_SUBFIELDS_LOO.separator %] [% MARCAUTHOR_SUBFIELDS_LOO.value %][% END %][% UNLESS ( loop.last ) %];[% END %][% END %][% END %][% IF ( BIBLIO_RESULT.ISBN ) %]
ISBN: [% BIBLIO_RESULT.ISBN %][% END %]
[% IF ( BIBLIO_RESULT.publishercode ) %]Published by: [% BIBLIO_RESULT.publishercode %][% END %][% IF ( BIBLIO_RESULT.publicationyear ) %] in [% END %][% BIBLIO_RESULT.publicationyear %][% IF ( BIBLIO_RESULT.pages ) %], [% END %][% BIBLIO_RESULT.pages %][% IF ( BIBLIO_RESULT.size ) %], [% END %][% BIBLIO_RESULT.size %][% IF ( BIBLIO_RESULT.collection ) %]
Collection: [% BIBLIO_RESULT.seriestitle %][% END %][% IF ( BIBLIO_RESULT.subject ) %]
@@ -31,9 +33,9 @@ Serial: [% BIBLIO_RESULT.serial %][% END %][% IF ( BIBLIO_RESULT.dewey ) %]
Dewey: [% BIBLIO_RESULT.dewey %][% END %][% IF ( BIBLIO_RESULT.classification ) %]
Classification: [% BIBLIO_RESULT.classification %][% END %][% IF ( BIBLIO_RESULT.lccn ) %]
LCCN: [% BIBLIO_RESULT.lccn %][% END %][% IF ( BIBLIO_RESULT.url ) %]
-url : [% BIBLIO_RESULT.url %][% END %]
+url : [% BIBLIO_RESULT.url %][% END %][% IF ( OPACBaseurl ) %]
In the online catalog:
-[% BIBLIO_RESULT.OPACBaseurl %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber |url %]
+ http://[% OPACBaseurl %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber |url %][% END %]
Items : [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]
[% ITEM_RESULT.branchname %] [% ITEM_RESULT.location %] [% IF ( ITEM_RESULT.itemcallnumber ) %]([% ITEM_RESULT.itemcallnumber %])[% END %] [% ITEM_RESULT.barcode %][% END %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelf.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelf.tt
index e39d450..b329cd4 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelf.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelf.tt
@@ -17,8 +17,11 @@ Reference Manager or ProCite.
[% IF ( comment ) %]
[% comment %]
[% END %]
-[% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %][% BIBLIO_RESULT.title %][% IF ( BIBLIO_RESULT.subtitle ) %] [% BIBLIO_RESULT.subtitle %][% END %][% IF ( BIBLIO_RESULT.MARCAUTHORS ) %]
-Author(s): [% FOREACH MARCAUTHOR IN BIBLIO_RESULT.MARCAUTHORS %][% FOREACH MARCAUTHOR_SUBFIELDS_LOO IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %][% MARCAUTHOR_SUBFIELDS_LOO.separator %][% MARCAUTHOR_SUBFIELDS_LOO.value %][% END %][% UNLESS ( loop.last ) %]; [% ELSE %]
+[% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %][% BIBLIO_RESULT.title %][% IF ( BIBLIO_RESULT.subtitle.size ) %] [% FOREACH subtitle IN BIBLIO_RESULT.subtitle %][% subtitle.subfield %][% END %][% END %][% IF ( BIBLIO_RESULT.author ) %]
+
+by [% BIBLIO_RESULT.author %][% END %]
+[% IF ( BIBLIO_RESULT.MARCAUTHORS.size ) %]
+Additional author(s): [% FOREACH MARCAUTHOR IN BIBLIO_RESULT.MARCAUTHORS %][% FOREACH MARCAUTHOR_SUBFIELDS_LOO IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %][% MARCAUTHOR_SUBFIELDS_LOO.separator %] [% MARCAUTHOR_SUBFIELDS_LOO.value %][% END %][% UNLESS ( loop.last ) %]; [% ELSE %]
[% END %][% END %][% END %][% IF ( BIBLIO_RESULT.ISBN ) %]
ISBN: [% BIBLIO_RESULT.ISBN %][% END %]
[% IF ( BIBLIO_RESULT.publishercode ) %]Published by: [% BIBLIO_RESULT.publishercode %][% END %][% IF ( BIBLIO_RESULT.publicationyear ) %] in [% END %][% BIBLIO_RESULT.publicationyear %][% IF ( BIBLIO_RESULT.pages ) %], [% END %][% BIBLIO_RESULT.pages %][% IF ( BIBLIO_RESULT.size ) %], [% END %][% BIBLIO_RESULT.size %][% IF ( BIBLIO_RESULT.collection ) %]
@@ -31,9 +34,9 @@ Serial: [% BIBLIO_RESULT.serial %][% END %][% IF ( BIBLIO_RESULT.dewey ) %]
Dewey: [% BIBLIO_RESULT.dewey %][% END %][% IF ( BIBLIO_RESULT.classification ) %]
Classification: [% BIBLIO_RESULT.classification %][% END %][% IF ( BIBLIO_RESULT.lccn ) %]
LCCN: [% BIBLIO_RESULT.lccn %][% END %][% IF ( BIBLIO_RESULT.url ) %]
-url : [% BIBLIO_RESULT.url %][% END %]
+url : [% BIBLIO_RESULT.url %][% END %][% IF ( OPACBaseurl ) %]
In the online catalog:
-[% BIBLIO_RESULT.OPACBaseurl %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber |url %]
+ http://[% OPACBaseurl %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber |url %][% END %]
Items : [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]
[% ITEM_RESULT.branchname %] [% ITEM_RESULT.location %] [% IF ( ITEM_RESULT.itemcallnumber ) %]([% ITEM_RESULT.itemcallnumber %])[% END %] [% ITEM_RESULT.barcode %][% END %]
diff --git a/opac/opac-sendshelf.pl b/opac/opac-sendshelf.pl
index b571e07..55abd14 100755
--- a/opac/opac-sendshelf.pl
+++ b/opac/opac-sendshelf.pl
@@ -81,12 +81,13 @@ if ( $email ) {
# retrieve biblios from shelf
foreach my $biblio (@$items) {
my $biblionumber = $biblio->{biblionumber};
-
+ my $fw = GetFrameworkCode($biblionumber);
my $dat = GetBiblioData($biblionumber);
my $record = GetMarcBiblio($biblionumber);
my $marcnotesarray = GetMarcNotes( $record, $marcflavour );
my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
+ my $subtitle = GetRecordValue('subtitle', $record, $fw);
my @items = GetItemsInfo( $biblionumber );
@@ -95,13 +96,18 @@ if ( $email ) {
$dat->{MARCAUTHORS} = $marcauthorsarray;
$dat->{'biblionumber'} = $biblionumber;
$dat->{ITEM_RESULTS} = \@items;
+ $dat->{subtitle} = $subtitle;
$iso2709 .= $record->as_usmarc();
push( @results, $dat );
}
- my $user = GetMember(borrowernumber => $borrowernumber);
+ my $user = GetMember(borrowernumber => $borrowernumber);
+
+ if (C4::Context->preference('OPACBaseURL')){
+ $template2->param( OPACBaseurl => C4::Context->preference('OPACBaseURL') );
+ }
$template2->param(
BIBLIO_RESULTS => \@results,
diff --git a/virtualshelves/sendshelf.pl b/virtualshelves/sendshelf.pl
index 16ada89..37ec545 100755
--- a/virtualshelves/sendshelf.pl
+++ b/virtualshelves/sendshelf.pl
@@ -77,13 +77,14 @@ if ( $email ) {
# retrieve biblios from shelf
foreach my $biblio (@$items) {
- my $biblionumber = $biblio->{biblionumber};
-
+ my $biblionumber = $biblio->{biblionumber};
+ my $fw = GetFrameworkCode($biblionumber);
my $dat = GetBiblioData($biblionumber);
my $record = GetMarcBiblio($biblionumber);
my $marcnotesarray = GetMarcNotes( $record, $marcflavour );
my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
+ my $subtitle = GetRecordValue('subtitle', $record, $fw);
my @items = GetItemsInfo( $biblionumber );
@@ -92,12 +93,17 @@ if ( $email ) {
$dat->{MARCAUTHORS} = $marcauthorsarray;
$dat->{'biblionumber'} = $biblionumber;
$dat->{ITEM_RESULTS} = \@items;
+ $dat->{subtitle} = $subtitle;
$iso2709 .= $record->as_usmarc();
push( @results, $dat );
}
+ if (C4::Context->preference('OPACBaseURL')){
+ $template2->param( OPACBaseurl => C4::Context->preference('OPACBaseURL') );
+ }
+
$template2->param(
BIBLIO_RESULTS => \@results,
email_sender => $email_from,
--
1.7.3
From ruth at bywatersolutions.com Mon Oct 3 17:07:40 2011
From: ruth at bywatersolutions.com (D Ruth Bavousett)
Date: Mon, 3 Oct 2011 08:07:40 -0700
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 6789: biblios with many
items can result in broken search results link
Message-ID: <1317654460-17554-1-git-send-email-ruth@bywatersolutions.com>
From: Ian Walls
This patch fixes an issue whereby biblios with many items (often > 500) would index,
but not the biblionumber itself, resulting in search results with a) inaccurate item counts
and b) no biblionumber to use in the link to the details page. This is due to Net::Z3950::ZOOM not providing
a mechanism for specifying different connection attributes; the maximumRecordSize ZOOM connection attribute,
if not specified, defaults to 1MB, which is less than the size of a MARC record with many, many 952 fields. Since
it is unlikely we can fix Net::Z3950::ZOOM in a timely fashion, this patch aims to build a workaround on the Koha end.
This patch changes EmbedItemsInMarcBiblio to use append_fields instead of insert_ordered_fields,
so the 999$c will come before the item records. It's VERY unlikely we will encounter more than 1MB of biblio-level MARC
content, as this would break the ISO-2709 standard by a large factor.
To this end, it also moves the fix_biblio_ids portion of get_corrected_marc_record out of rebuild_zebra.pl,
and makes it a part of GetMarcBiblio (right before EmbedItemsInMarcBiblio, so the 952s still come last). fix_biblio_ids
is kept as a subroutine for the deletion portion of rebuild_zebra.pl, which still uses it.
It also uses the subroutine parameter in GetMarcBiblio to do the EmbedItemsInMarcBiblio action, rather than having
rebuild_zebra.pl perform it on the itemless record returned from GetMarcBiblio. Simpler and cleaner that way.
To verify bug issue:
1. Find a biblio with over 700 items (or enough that the resulting MARCXML is greater than 1MB)
2. search for this biblio (in a search that would return multiple results, not just this title). You should get the title in
the results list
3. attempt to click the link to this biblio's details page; the biblionumber should be blank, leading to a 404
To test solution:
1. Apply patch
2. modify the biblio slightly (click the 005 for example) and save
OR manually add the biblio to zebraqueue for reindexing
3. after rebuild_zebra.pl -z -b -x runs, use the same search as above. The title should still appear.
4. click the link, and find yourself on the biblio detail page as desired
Signed-off-by: D Ruth Bavousett
---
C4/Biblio.pm | 4 ++--
misc/migration_tools/rebuild_zebra.pl | 9 ++-------
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index 915139e..6fcb022 100644
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -1070,9 +1070,9 @@ sub GetMarcBiblio {
if ($@) { warn " problem with :$biblionumber : $@ \n$marcxml"; }
return unless $record;
+ C4::Biblio::_koha_marc_update_bib_ids($record, '', $biblionumber, $biblionumber);
C4::Biblio::EmbedItemsInMarcBiblio($record, $biblionumber) if ($embeditems);
- # $record = MARC::Record::new_from_usmarc( $marc) if $marc;
return $record;
} else {
return undef;
@@ -2730,7 +2730,7 @@ sub EmbedItemsInMarcBiblio {
my $item_marc = C4::Items::GetMarcItem($biblionumber, $itemnumber);
push @item_fields, $item_marc->field($itemtag);
}
- $marc->insert_fields_ordered(@item_fields);
+ $marc->append_fields(@item_fields);
}
=head1 INTERNAL FUNCTIONS
diff --git a/misc/migration_tools/rebuild_zebra.pl b/misc/migration_tools/rebuild_zebra.pl
index dadf43f..6fa6501 100755
--- a/misc/migration_tools/rebuild_zebra.pl
+++ b/misc/migration_tools/rebuild_zebra.pl
@@ -433,10 +433,7 @@ sub get_corrected_marc_record {
if (defined $marc) {
fix_leader($marc);
- if ($record_type eq 'biblio') {
- my $succeeded = fix_biblio_ids($marc, $record_number);
- return unless $succeeded;
- } else {
+ if ($record_type eq 'authority') {
fix_authority_id($marc, $record_number);
}
if (C4::Context->preference("marcflavour") eq "UNIMARC") {
@@ -468,7 +465,7 @@ sub get_raw_marc_record {
$fetch_sth->finish();
return unless $marc;
} else {
- eval { $marc = GetMarcBiblio($record_number); };
+ eval { $marc = GetMarcBiblio($record_number, 1); };
if ($@ || !$marc) {
# here we do warn since catching an exception
# means that the bib was found but failed
@@ -477,8 +474,6 @@ sub get_raw_marc_record {
return;
}
}
- # ITEM
- C4::Biblio::EmbedItemsInMarcBiblio($marc, $record_number);
} else {
eval { $marc = GetAuthority($record_number); };
if ($@) {
--
1.7.2.5
From cfouts at liblime.com Mon Oct 3 19:50:19 2011
From: cfouts at liblime.com (Clay Fouts)
Date: Mon, 3 Oct 2011 10:50:19 -0700
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 6789: biblios with many
items can result in broken search results link
In-Reply-To: <1317654460-17554-1-git-send-email-ruth@bywatersolutions.com>
References: <1317654460-17554-1-git-send-email-ruth@bywatersolutions.com>
Message-ID:
You can avoid having to use this hack by setting and appropriately
large maximumRecordSize in C4::Context::_new_Zconn() and then specifying the
-k option for zebrasrv.
Clay
On Mon, Oct 3, 2011 at 8:07 AM, D Ruth Bavousett
wrote:
> From: Ian Walls
>
> This patch fixes an issue whereby biblios with many items (often > 500)
> would index,
> but not the biblionumber itself, resulting in search results with a)
> inaccurate item counts
> and b) no biblionumber to use in the link to the details page. This is due
> to Net::Z3950::ZOOM not providing
> a mechanism for specifying different connection attributes; the
> maximumRecordSize ZOOM connection attribute,
> if not specified, defaults to 1MB, which is less than the size of a MARC
> record with many, many 952 fields. Since
> it is unlikely we can fix Net::Z3950::ZOOM in a timely fashion, this patch
> aims to build a workaround on the Koha end.
>
> This patch changes EmbedItemsInMarcBiblio to use append_fields instead of
> insert_ordered_fields,
> so the 999$c will come before the item records. It's VERY unlikely we will
> encounter more than 1MB of biblio-level MARC
> content, as this would break the ISO-2709 standard by a large factor.
>
> To this end, it also moves the fix_biblio_ids portion of
> get_corrected_marc_record out of rebuild_zebra.pl,
> and makes it a part of GetMarcBiblio (right before EmbedItemsInMarcBiblio,
> so the 952s still come last). fix_biblio_ids
> is kept as a subroutine for the deletion portion of rebuild_zebra.pl,
> which still uses it.
>
> It also uses the subroutine parameter in GetMarcBiblio to do the
> EmbedItemsInMarcBiblio action, rather than having
> rebuild_zebra.pl perform it on the itemless record returned from
> GetMarcBiblio. Simpler and cleaner that way.
>
> To verify bug issue:
> 1. Find a biblio with over 700 items (or enough that the resulting MARCXML
> is greater than 1MB)
> 2. search for this biblio (in a search that would return multiple results,
> not just this title). You should get the title in
> the results list
> 3. attempt to click the link to this biblio's details page; the
> biblionumber should be blank, leading to a 404
>
> To test solution:
> 1. Apply patch
> 2. modify the biblio slightly (click the 005 for example) and save
> OR manually add the biblio to zebraqueue for reindexing
> 3. after rebuild_zebra.pl -z -b -x runs, use the same search as above. The
> title should still appear.
> 4. click the link, and find yourself on the biblio detail page as desired
>
> Signed-off-by: D Ruth Bavousett
> ---
> C4/Biblio.pm | 4 ++--
> misc/migration_tools/rebuild_zebra.pl | 9 ++-------
> 2 files changed, 4 insertions(+), 9 deletions(-)
>
> diff --git a/C4/Biblio.pm b/C4/Biblio.pm
> index 915139e..6fcb022 100644
> --- a/C4/Biblio.pm
> +++ b/C4/Biblio.pm
> @@ -1070,9 +1070,9 @@ sub GetMarcBiblio {
> if ($@) { warn " problem with :$biblionumber : $@ \n$marcxml"; }
> return unless $record;
>
> + C4::Biblio::_koha_marc_update_bib_ids($record, '', $biblionumber,
> $biblionumber);
> C4::Biblio::EmbedItemsInMarcBiblio($record, $biblionumber) if
> ($embeditems);
>
> - # $record = MARC::Record::new_from_usmarc( $marc) if $marc;
> return $record;
> } else {
> return undef;
> @@ -2730,7 +2730,7 @@ sub EmbedItemsInMarcBiblio {
> my $item_marc = C4::Items::GetMarcItem($biblionumber, $itemnumber);
> push @item_fields, $item_marc->field($itemtag);
> }
> - $marc->insert_fields_ordered(@item_fields);
> + $marc->append_fields(@item_fields);
> }
>
> =head1 INTERNAL FUNCTIONS
> diff --git a/misc/migration_tools/rebuild_zebra.pl b/misc/migration_tools/
> rebuild_zebra.pl
> index dadf43f..6fa6501 100755
> --- a/misc/migration_tools/rebuild_zebra.pl
> +++ b/misc/migration_tools/rebuild_zebra.pl
> @@ -433,10 +433,7 @@ sub get_corrected_marc_record {
>
> if (defined $marc) {
> fix_leader($marc);
> - if ($record_type eq 'biblio') {
> - my $succeeded = fix_biblio_ids($marc, $record_number);
> - return unless $succeeded;
> - } else {
> + if ($record_type eq 'authority') {
> fix_authority_id($marc, $record_number);
> }
> if (C4::Context->preference("marcflavour") eq "UNIMARC") {
> @@ -468,7 +465,7 @@ sub get_raw_marc_record {
> $fetch_sth->finish();
> return unless $marc;
> } else {
> - eval { $marc = GetMarcBiblio($record_number); };
> + eval { $marc = GetMarcBiblio($record_number, 1); };
> if ($@ || !$marc) {
> # here we do warn since catching an exception
> # means that the bib was found but failed
> @@ -477,8 +474,6 @@ sub get_raw_marc_record {
> return;
> }
> }
> - # ITEM
> - C4::Biblio::EmbedItemsInMarcBiblio($marc, $record_number);
> } else {
> eval { $marc = GetAuthority($record_number); };
> if ($@) {
> --
> 1.7.2.5
>
> _______________________________________________
> 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/
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL:
From nengard at bywatersolutions.com Sun Oct 2 08:12:02 2011
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Sun, 2 Oct 2011 02:12:02 -0400
Subject: [Koha-patches] [PATCH] Bug 6716 - Document Items Table
Message-ID: <1317535922-4225-1-git-send-email-nengard@bywatersolutions.com>
This patch documents the items table. Some fields were left
undocumented because I was unsure of what data was stored there:
stack - might be linked to shelving number, but need confirmation
paidfor - pretty sure this is unused, but don't want to document it that way
---
installer/data/mysql/kohastructure.sql | 76 ++++++++++++++++----------------
1 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 3a51df5..cdd7e78 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -996,46 +996,46 @@ CREATE TABLE `issuingrules` (
--
DROP TABLE IF EXISTS `items`;
-CREATE TABLE `items` (
- `itemnumber` int(11) NOT NULL auto_increment,
- `biblionumber` int(11) NOT NULL default 0,
- `biblioitemnumber` int(11) NOT NULL default 0,
- `barcode` varchar(20) default NULL,
- `dateaccessioned` date default NULL,
- `booksellerid` mediumtext default NULL,
- `homebranch` varchar(10) default NULL,
- `price` decimal(8,2) default NULL,
- `replacementprice` decimal(8,2) default NULL,
- `replacementpricedate` date default NULL,
- `datelastborrowed` date default NULL,
- `datelastseen` date default NULL,
+CREATE TABLE `items` ( -- holdings/item information
+ `itemnumber` int(11) NOT NULL auto_increment, -- primary key and unique identifier added by Koha
+ `biblionumber` int(11) NOT NULL default 0, -- foreign key from biblio table used to link this item to the right bib record
+ `biblioitemnumber` int(11) NOT NULL default 0, -- foreign key from the biblioitems table to link to item to additional information
+ `barcode` varchar(20) default NULL, -- item barcode (MARC21 952$p)
+ `dateaccessioned` date default NULL, -- date the item was acquired or added to Koha (MARC21 952$d)
+ `booksellerid` mediumtext default NULL, -- where the item was purchased (MARC21 952$e)
+ `homebranch` varchar(10) default NULL, -- foreign key from the branches table for the library that owns this item (MARC21 952$a)
+ `price` decimal(8,2) default NULL, -- purchase price (MARC21 952$g)
+ `replacementprice` decimal(8,2) default NULL, -- cost the library charges to replace the item if it has been marked lost (MARC21 952$v)
+ `replacementpricedate` date default NULL, -- the date the price is effective from (MARC21 952$w)
+ `datelastborrowed` date default NULL, -- the date the item was last checked out/issued
+ `datelastseen` date default NULL, -- the date the item was last see (usually the last time the barcode was scanned or inventory was done)
`stack` tinyint(1) default NULL,
- `notforloan` tinyint(1) NOT NULL default 0,
- `damaged` tinyint(1) NOT NULL default 0,
- `itemlost` tinyint(1) NOT NULL default 0,
- `wthdrawn` tinyint(1) NOT NULL default 0,
- `itemcallnumber` varchar(255) default NULL,
- `issues` smallint(6) default NULL,
- `renewals` smallint(6) default NULL,
- `reserves` smallint(6) default NULL,
- `restricted` tinyint(1) default NULL,
- `itemnotes` mediumtext,
- `holdingbranch` varchar(10) default NULL,
+ `notforloan` tinyint(1) NOT NULL default 0, -- authorized value defining why this item is not for loan (MARC21 952$7)
+ `damaged` tinyint(1) NOT NULL default 0, -- authorized value defining this item as damaged (MARC21 952$4)
+ `itemlost` tinyint(1) NOT NULL default 0, -- authorized value defining this item as lost (MARC21 952$1)
+ `wthdrawn` tinyint(1) NOT NULL default 0, -- authorized value defining this item as withdrawn (MARC21 952$0)
+ `itemcallnumber` varchar(255) default NULL, -- call number for this item (MARC21 952$o)
+ `issues` smallint(6) default NULL, -- number of times this item has been checked out/issued
+ `renewals` smallint(6) default NULL, -- number of times this item has been renewed
+ `reserves` smallint(6) default NULL, -- number of times this item has been placed on hold/reserved
+ `restricted` tinyint(1) default NULL, -- authorized value defining use restrictions for this item (MARC21 952$5)
+ `itemnotes` mediumtext, -- public notes on this item (MARC21 952$x)
+ `holdingbranch` varchar(10) default NULL, -- foreign key from the branches table for the library that is currently in possession item (MARC21 952$b)
`paidfor` mediumtext,
- `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
- `location` varchar(80) default NULL,
- `permanent_location` varchar(80) default NULL,
- `onloan` date default NULL,
- `cn_source` varchar(10) default NULL,
- `cn_sort` varchar(30) default NULL,
- `ccode` varchar(10) default NULL,
- `materials` varchar(10) default NULL,
- `uri` varchar(255) default NULL,
- `itype` varchar(10) default NULL,
- `more_subfields_xml` longtext default NULL,
- `enumchron` text default NULL,
- `copynumber` varchar(32) default NULL,
- `stocknumber` varchar(32) default NULL,
+ `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- date and time this item was last altered
+ `location` varchar(80) default NULL, -- authorized value for the shelving location for this item (MARC21 952$c)
+ `permanent_location` varchar(80) default NULL, -- linked to the CART and PROC temporary locations feature, stores the permanent shelving location
+ `onloan` date default NULL, -- defines if this item is currently checked out (1 for yes, 0 for no)
+ `cn_source` varchar(10) default NULL, -- classification source used on this item (MARC21 952$2)
+ `cn_sort` varchar(30) default NULL, -- normalized form of the call number (MARC21 952$o) used for sorting
+ `ccode` varchar(10) default NULL, -- authorized value for the collection code associated with this item (MARC21 952$8)
+ `materials` varchar(10) default NULL, -- materials specified (MARC21 952$3)
+ `uri` varchar(255) default NULL, -- URL for the item (MARC21 952$u)
+ `itype` varchar(10) default NULL, -- foreign key from the itemtypes table defining the type for this item (MARC21 952$y)
+ `more_subfields_xml` longtext default NULL, -- additional 952 subfields in XML format
+ `enumchron` text default NULL, -- serial enumeration/chronology for the item (MARC21 952$h)
+ `copynumber` varchar(32) default NULL, -- copy number (MARC21 952$t)
+ `stocknumber` varchar(32) default NULL, -- inventory number (MARC21 952$i)
PRIMARY KEY (`itemnumber`),
UNIQUE KEY `itembarcodeidx` (`barcode`),
KEY `itemstocknumberidx` (`stocknumber`),
--
1.7.2.3
From nengard at bywatersolutions.com Sun Oct 2 08:17:51 2011
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Sun, 2 Oct 2011 02:17:51 -0400
Subject: [Koha-patches] [PATCH] Bug 6716 Document deleteditems table
Message-ID: <1317536271-4341-1-git-send-email-nengard@bywatersolutions.com>
This patch documents the deleted items table. Some fields were left
undocumented because I was unsure of what data was stored there:
stack - might be linked to shelving number, but need confirmation
paidfor - pretty sure this is unused, but don't want to document it that way
---
installer/data/mysql/kohastructure.sql | 76 ++++++++++++++++----------------
1 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 3a51df5..d1b8c67 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -731,46 +731,46 @@ CREATE TABLE `deletedborrowers` ( -- stores data related to the patrons/borrower
DROP TABLE IF EXISTS `deleteditems`;
CREATE TABLE `deleteditems` (
- `itemnumber` int(11) NOT NULL default 0,
- `biblionumber` int(11) NOT NULL default 0,
- `biblioitemnumber` int(11) NOT NULL default 0,
- `barcode` varchar(20) default NULL,
- `dateaccessioned` date default NULL,
- `booksellerid` mediumtext default NULL,
- `homebranch` varchar(10) default NULL,
- `price` decimal(8,2) default NULL,
- `replacementprice` decimal(8,2) default NULL,
- `replacementpricedate` date default NULL,
- `datelastborrowed` date default NULL,
- `datelastseen` date default NULL,
+ `itemnumber` int(11) NOT NULL default 0, -- primary key and unique identifier added by Koha
+ `biblionumber` int(11) NOT NULL default 0, -- foreign key from biblio table used to link this item to the right bib record
+ `biblioitemnumber` int(11) NOT NULL default 0, -- foreign key from the biblioitems table to link to item to additional information
+ `barcode` varchar(20) default NULL, -- item barcode (MARC21 952$p)
+ `dateaccessioned` date default NULL, -- date the item was acquired or added to Koha (MARC21 952$d)
+ `booksellerid` mediumtext default NULL, -- where the item was purchased (MARC21 952$e)
+ `homebranch` varchar(10) default NULL, -- foreign key from the branches table for the library that owns this item (MARC21 952$a)
+ `price` decimal(8,2) default NULL, -- purchase price (MARC21 952$g)
+ `replacementprice` decimal(8,2) default NULL, -- cost the library charges to replace the item if it has been marked lost (MARC21 952$v)
+ `replacementpricedate` date default NULL, -- the date the price is effective from (MARC21 952$w)
+ `datelastborrowed` date default NULL, -- the date the item was last checked out
+ `datelastseen` date default NULL, -- the date the item was last see (usually the last time the barcode was scanned or inventory was done)
`stack` tinyint(1) default NULL,
- `notforloan` tinyint(1) NOT NULL default 0,
- `damaged` tinyint(1) NOT NULL default 0,
- `itemlost` tinyint(1) NOT NULL default 0,
- `wthdrawn` tinyint(1) NOT NULL default 0,
- `itemcallnumber` varchar(255) default NULL,
- `issues` smallint(6) default NULL,
- `renewals` smallint(6) default NULL,
- `reserves` smallint(6) default NULL,
- `restricted` tinyint(1) default NULL,
- `itemnotes` mediumtext,
- `holdingbranch` varchar(10) default NULL,
+ `notforloan` tinyint(1) NOT NULL default 0, -- authorized value defining why this item is not for loan (MARC21 952$7)
+ `damaged` tinyint(1) NOT NULL default 0, -- authorized value defining this item as damaged (MARC21 952$4)
+ `itemlost` tinyint(1) NOT NULL default 0, -- authorized value defining this item as lost (MARC21 952$1)
+ `wthdrawn` tinyint(1) NOT NULL default 0, -- authorized value defining this item as withdrawn (MARC21 952$0)
+ `itemcallnumber` varchar(255) default NULL, -- call number for this item (MARC21 952$o)
+ `issues` smallint(6) default NULL, -- number of times this item has been checked out
+ `renewals` smallint(6) default NULL, -- number of times this item has been renewed
+ `reserves` smallint(6) default NULL, -- number of times this item has been placed on hold/reserved
+ `restricted` tinyint(1) default NULL, -- authorized value defining use restrictions for this item (MARC21 952$5)
+ `itemnotes` mediumtext, -- public notes on this item (MARC21 952$x)
+ `holdingbranch` varchar(10) default NULL, -- foreign key from the branches table for the library that is currently in possession item (MARC21 952$b)
`paidfor` mediumtext,
- `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
- `location` varchar(80) default NULL,
- `permanent_location` varchar(80) default NULL,
- `onloan` date default NULL,
- `cn_source` varchar(10) default NULL,
- `cn_sort` varchar(30) default NULL,
- `ccode` varchar(10) default NULL,
- `materials` varchar(10) default NULL,
- `uri` varchar(255) default NULL,
- `itype` varchar(10) default NULL,
- `more_subfields_xml` longtext default NULL,
- `enumchron` text default NULL,
- `copynumber` varchar(32) default NULL,
- `stocknumber` varchar(32) default NULL,
- `marc` longblob,
+ `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- date and time this item was last altered
+ `location` varchar(80) default NULL, -- authorized value for the shelving location for this item (MARC21 952$c)
+ `permanent_location` varchar(80) default NULL, -- linked to the CART and PROC temporary locations feature, stores the permanent shelving location
+ `onloan` date default NULL, -- defines if this item is currently checked out (1 for yes, 0 for no)
+ `cn_source` varchar(10) default NULL, -- classification source used on this item (MARC21 952$2)
+ `cn_sort` varchar(30) default NULL, -- normalized form of the call number (MARC21 952$o) used for sorting
+ `ccode` varchar(10) default NULL, -- authorized value for the collection code associated with this item (MARC21 952$8)
+ `materials` varchar(10) default NULL, -- materials specified (MARC21 952$3)
+ `uri` varchar(255) default NULL, -- URL for the item (MARC21 952$u)
+ `itype` varchar(10) default NULL, -- foreign key from the itemtypes table defining the type for this item (MARC21 952$y)
+ `more_subfields_xml` longtext default NULL, -- additional 952 subfields in XML format
+ `enumchron` text default NULL, -- serial enumeration/chronology for the item (MARC21 952$h)
+ `copynumber` varchar(32) default NULL, -- copy number (MARC21 952$t)
+ `stocknumber` varchar(32) default NULL, -- inventory number (MARC21 952$i)
+ `marc` longblob, -- unused in Koha
PRIMARY KEY (`itemnumber`),
KEY `delitembarcodeidx` (`barcode`),
KEY `delitemstocknumberidx` (`stocknumber`),
--
1.7.2.3
From nengard at bywatersolutions.com Sun Oct 2 10:05:35 2011
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Sun, 2 Oct 2011 04:05:35 -0400
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Use unitprice in neworder so
that the value is saved in the database and so it will be the
same field used as to receive shipments
Message-ID: <1317542735-4928-1-git-send-email-nengard@bywatersolutions.com>
From: Maxime Pelletier
http://bugs.koha-community.org/show_bug.cgi?id=6879
Signed-off-by: Nicole C. Engard
Signed off with a note: this doesn't fix everything mentioned in the bug.
It also might clash with bug 4831 and should be tested with that patch.
---
acqui/neworderempty.pl | 1 +
.../prog/en/modules/acqui/neworderempty.tt | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl
index 6361125..02b829a 100755
--- a/acqui/neworderempty.pl
+++ b/acqui/neworderempty.pl
@@ -383,6 +383,7 @@ $template->param(
listprice => sprintf("%.2f", $data->{'listprice'}||$data->{'price'}||$listprice),
total => sprintf("%.2f", ($data->{'ecost'}||0)*($data->{'quantity'}||0) ),
ecost => $data->{'ecost'},
+ unitprice => sprintf("%.2f", $data->{'unitprice'}),
notes => $data->{'notes'},
publishercode => $data->{'publishercode'},
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
index 39e9ca2..e74a0e5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -416,10 +416,10 @@ $(document).ready(function()
[% IF ( close ) %]
-
+
[% ELSE %]
-
+
[% END %]
--
1.7.2.3
From oleonard at myacpl.org Tue Oct 4 16:23:51 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue, 4 Oct 2011 10:23:51 -0400
Subject: [Koha-patches] [PATCH] Follow-up fix for Bug 4473 - Recent comments
view for the OPAC
Message-ID: <1317738231-24928-1-git-send-email-oleonard@myacpl.org>
This follow-up adds a system preference which controls display
of a link to recent comments in the OPAC masthead alongside
"Advanced search," "Tag cloud," etc.
---
C4/Auth.pm | 1 +
installer/data/mysql/sysprefs.sql | 1 +
installer/data/mysql/updatedatabase.pl | 7 +++++++
.../prog/en/modules/admin/preferences/opac.pref | 7 +++++++
koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc | 1 +
5 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/C4/Auth.pm b/C4/Auth.pm
index 7211769..3690f5e 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -424,6 +424,7 @@ sub get_template_and_user {
OpacHighlightedWords => C4::Context->preference("OpacHighlightedWords"),
OPACItemHolds => C4::Context->preference("OPACItemHolds"),
OPACShelfBrowser => "". C4::Context->preference("OPACShelfBrowser"),
+ OpacShowRecentComments => C4::Context->preference("OpacShowRecentComments"),
OPACURLOpenInNewWindow => "" . C4::Context->preference("OPACURLOpenInNewWindow"),
OPACUserCSS => "". C4::Context->preference("OPACUserCSS"),
OPACViewOthersSuggestions => "" . C4::Context->preference("OPACViewOthersSuggestions"),
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index 79d4893..27bef9a 100755
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -318,3 +318,4 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES (
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('BasketConfirmations', '1', 'When closing or reopening a basket,', 'always ask for confirmation.|do not ask for confirmation.', 'Choice');
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '|| aca||aabn | a|a d', NULL, NULL, 'Textarea');
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0,'If ON Openlibrary book covers will be show',NULL,'YesNo');
+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacShowRecentComments',0,'If ON a link to recent comments will appear in the OPAC masthead',NULL,'YesNo');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 6b88c29..ebb6cb3 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4446,6 +4446,13 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
SetVersion($DBversion);
}
+$DBversion = "3.05.00.XXX";
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+ $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacShowRecentComments',0,'If ON a link to recent comments will appear in the OPAC masthead',NULL,'YesNo');");
+ print "Upgrade to $DBversion done (Add syspref OpacShowRecentComments. When the preference is turned on a link to recent comments will appear in the OPAC masthead. )\n";
+ SetVersion($DBversion);
+}
+
=head1 FUNCTIONS
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 8bbf692..deb7cbb 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
@@ -86,6 +86,13 @@ OPAC:
no: "Don't show"
- the name of the patron that has an item checked out on item detail pages on the OPAC.
-
+ - pref: OpacShowRecentComments
+ default: 0
+ choices:
+ yes: Show
+ no: "Don't show"
+ - a link to recent comments in the OPAC masthead.
+ -
- pref: OpacHighlightedWords
choices:
yes: Highlight
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
index 2510a7f..07268a2 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
@@ -112,6 +112,7 @@
Advanced Search
[% IF ( OpacBrowser ) %] | Browse by Hierarchy[% END %]
[% IF ( OpacAuthorities ) %] | Browse by author or subject[% END %]
+[% IF ( OpacShowRecentComments ) %] | Recent Comments[% END %]
[% IF ( TagsEnabled ) %] | Tag Cloud[% END %]
[% IF ( OpacCloud ) %] | Subject Cloud[% END %]
[% IF ( OpacTopissue ) %] | Most Popular[% END %]
--
1.7.3
From ruth at bywatersolutions.com Tue Oct 4 16:40:29 2011
From: ruth at bywatersolutions.com (D Ruth Bavousett)
Date: Tue, 4 Oct 2011 07:40:29 -0700
Subject: [Koha-patches] [PATCH] Bug 6867: Date last seen ignored on import
Message-ID: <1317739229-30615-1-git-send-email-ruth@bywatersolutions.com>
The date last seen field (952 $r) and replacement price date (952 $w) were being
ignored on import, being replaced with NOW() as a hardcoded value. This patch will
allow a value to be imported, but if none is, it will use the ISO date of import
as a default.
---
C4/Items.pm | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/C4/Items.pm b/C4/Items.pm
index bc36dd1..69557aa 100644
--- a/C4/Items.pm
+++ b/C4/Items.pm
@@ -1971,9 +1971,9 @@ sub _koha_new_item {
homebranch = ?,
price = ?,
replacementprice = ?,
- replacementpricedate = NOW(),
+ replacementpricedate = ?,
datelastborrowed = ?,
- datelastseen = NOW(),
+ datelastseen = ?,
stack = ?,
notforloan = ?,
damaged = ?,
@@ -2002,6 +2002,7 @@ sub _koha_new_item {
stocknumber = ?
";
my $sth = $dbh->prepare($query);
+ my $today = C4::Dates->today('iso');
$sth->execute(
$item->{'biblionumber'},
$item->{'biblioitemnumber'},
@@ -2011,7 +2012,9 @@ sub _koha_new_item {
$item->{'homebranch'},
$item->{'price'},
$item->{'replacementprice'},
+ $item->{'replacementpricedate'} || $today,
$item->{datelastborrowed},
+ $item->{datelastseen} || $today,
$item->{stack},
$item->{'notforloan'},
$item->{'damaged'},
--
1.7.2.5
From nengard at bywatersolutions.com Sun Oct 2 11:39:27 2011
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Sun, 2 Oct 2011 05:39:27 -0400
Subject: [Koha-patches] =?utf-8?q?=5BPATCH=5D_Bug_6966=3A_Admin_Help_Files?=
Message-ID: <1317548367-5240-1-git-send-email-nengard@bywatersolutions.com>
This patch updates help files in the admin folder. It removes
two files that aren't used anymore and adds links to the manual
for all files that weren't edit in patches for bug 6942.
---
.../prog/en/modules/help/admin/aqbookfund.tt | 41 --------------------
.../prog/en/modules/help/admin/aqbudget.tt | 33 ----------------
.../prog/en/modules/help/admin/aqbudgetperiods.tt | 2 +
.../prog/en/modules/help/admin/aqbudgets.tt | 4 +-
.../prog/en/modules/help/admin/aqplan.tt | 2 +
.../modules/help/admin/auth_subfields_structure.tt | 1 +
.../en/modules/help/admin/auth_tag_structure.tt | 2 +
.../en/modules/help/admin/authorised_values.tt | 2 +
.../prog/en/modules/help/admin/authtypes.tt | 2 +
.../prog/en/modules/help/admin/biblio_framework.tt | 2 +
.../modules/help/admin/branch_transfer_limits.tt | 2 +
.../prog/en/modules/help/admin/branches.tt | 4 +-
.../prog/en/modules/help/admin/categorie.tt | 2 +
.../prog/en/modules/help/admin/checkmarc.tt | 2 +
.../prog/en/modules/help/admin/cities.tt | 2 +
.../prog/en/modules/help/admin/classsources.tt | 2 +
.../prog/en/modules/help/admin/currency.tt | 2 +
.../prog/en/modules/help/admin/fieldmapping.tt | 2 +
.../modules/help/admin/item_circulation_alerts.tt | 2 +
.../prog/en/modules/help/admin/itemtypes.tt | 2 +
.../prog/en/modules/help/admin/koha2marclinks.tt | 2 +
.../modules/help/admin/marc_subfields_structure.tt | 2 +
.../prog/en/modules/help/admin/marctagstructure.tt | 2 +
.../prog/en/modules/help/admin/matching-rules.tt | 2 +
.../en/modules/help/admin/patron-attr-types.tt | 2 +
.../prog/en/modules/help/admin/preferences.tt | 2 +
.../prog/en/modules/help/admin/roadtype.tt | 2 +
.../prog/en/modules/help/admin/smart-rules.tt | 24 +++++-------
.../prog/en/modules/help/admin/stopwords.tt | 2 +
.../prog/en/modules/help/admin/z3950servers.tt | 2 +
30 files changed, 65 insertions(+), 90 deletions(-)
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbookfund.tt
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudget.tt
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbookfund.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbookfund.tt
deleted file mode 100644
index 4127cb6..0000000
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbookfund.tt
+++ /dev/null
@@ -1,41 +0,0 @@
-[% INCLUDE 'help-top.inc' %]
-
-
Fund Administration
-
-TIP: Funds may be ignored if you are setting your Global System Preferences for 'Acquisitions' to
-"simple" acquisitions: the funds are only useful when using "normal"
-acquisitions.
-
-
-
Funds & Budgets
-
-
-"Funds" are accounts that you establish to track your
-expenditures for library materials. They may be used for any kind of
-material and should match the lines in your materials budget. For
-instance, if your library establishes a budget line for books, another
-for audiovisual materials, a third line for magazines, and a fourth
-budget line for electronic databases, then you would have four funds.
-
-TIP: The first time you access this page, you will be asked to add your
-first fund -- thereafter you will have the option of editing and
-deleting funds.
-
-
Adding a Fund
-
-
Click 'New Fund'
-
Each fund has a unique fund code, limited to a maximum of five characters, which identifies it
-
Enter in a fund name to provide more information for staff members about the fund
-
Funds can be library/branch specific if needed, but this is an optional field
-
Once a fund is created a budget can then be applied to it
-
Click 'Add budget' next to the fund you want to edit
-
IMPORTANT: Your dates will not save correctly unless you have set your date
- format ('dateformat') in the Global System Preferences under 'I18N/L10N' -- DO
- THIS BEFORE setting budgets
-
Once budgets have been added you can see/search them all by clicking 'Show all budgets' under the list of funds
-
Budget information will also be accessible via the 'Acquisitions' module
-
-
-From this module you can easily see what has been spent from each budget
-
-[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudget.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudget.tt
deleted file mode 100644
index 590a11f..0000000
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudget.tt
+++ /dev/null
@@ -1,33 +0,0 @@
-[% INCLUDE 'help-top.inc' %]
-
-
Funds & Budgets
-
-
TIP: Funds may be ignored if you are setting your Global System Preferences for 'Acquisitions' to "simple" acquisitions: the funds are only useful when using "normal" acquisitions.
-
-
"Funds" are accounts that you establish to track your expenditures for library materials. They may be used for any kind of material and should match the lines in your materials budget. For instance, if your library establishes a budget line for books, another for audiovisual materials, a third line for magazines, and a fourth budget line for electronic databases, then you would have four funds.
-
-
-TIP: The first time you access this page, you will be asked to add your first fund -- thereafter you will have the option of editing and deleting funds.
-
-
Adding a Fund
-
-
Click 'New Fund'
-
-
-
Each fund has a unique fund code, limited to a maximum of five characters, which identifies it
-
Enter in a fund name to provide more information for staff members about the fund
-
Funds can be library specific if needed, but this is an optional field
-
Once a fund is created a budget can then be applied to it
-
Click 'Add budget' next to the fund you want to edit
-
IMPORTANT: Your dates will not save correctly unless you have set your date format ('dateformat') in the Global System Preferences under 'I18N/L10N'-- DO THIS BEFORE setting budgets
-
-
-
-
Once budgets have been added you can see/search them all by clicking 'Show all budgets' under the list of funds
-
Budget information will also be accessible via the 'Acquisitions' module
-
-
-
From this module you can easily see what has been spent from each budget
-
-
-[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgetperiods.tt
index 6eae39d..5d362e8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgetperiods.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgetperiods.tt
@@ -20,4 +20,6 @@
Once you have made your edits, click the 'Save Changes' button. You will be brought to a list of your existing budgets.
+
See the full documentation for Budgets in the manual (online).
+
[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tt
index fb93814..08133af 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tt
@@ -2,7 +2,7 @@
Funds
-
Budgets are broken in to funds.
+
Budgets are broken into funds.
Add a Fund
@@ -31,4 +31,6 @@
To the right of each fund you will find the 'Edit,' 'Delete,' and 'Add Child Fund' options. A child fund simply a sub-fund of the fund listed. An example would be to have a fund for 'Fiction' and under that have a fund for 'New Releases' and a fund for 'Science Fiction.' It is an optional way to further organize your finances.
+
See the full documentation for Funds in the manual (online).
+
[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqplan.tt
index 278cfed..2518ced 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqplan.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqplan.tt
@@ -12,4 +12,6 @@
Once your changes are made, click the 'Save' button. If you would like to export your data as a CSV file you can do so by entering a file name in the 'Output to a file named' field and clicking the 'Output' button.
+
See the full documentation for Budget Planning in the manual (online).
+
[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tt
index cf6b639..282b96a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tt
@@ -137,6 +137,7 @@ To edit the subfields associated with the tag, click 'Subfields' to the right of
To save your changes simply click the 'Save Changes' button at the top of the screen
+
See the full documentation for Authorities in the manual (online).
[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_tag_structure.tt
index db28c7d..dc01409 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_tag_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_tag_structure.tt
@@ -21,4 +21,6 @@
To the right of the new field is a link to 'Subfields,' you will need to add subfields before this tag will appear in your MARC editor.
+
See the full documentation for Authorities in the manual (online).
+
[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authorised_values.tt
index 6da96c4..ce3b346 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authorised_values.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authorised_values.tt
@@ -146,4 +146,6 @@
The new value will appear in the list along with existing values
+
See the full documentation for Authorized Values in the manual (online).
+
[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authtypes.tt
index c17c772..78a2095 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authtypes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authtypes.tt
@@ -6,4 +6,6 @@
Koha comes with many of the necessary Authority frameworks already installed.
+
See the full documentation for Authorities in the manual (online).
+
[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/biblio_framework.tt
index 26cd5c8..9183344 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/biblio_framework.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/biblio_framework.tt
@@ -34,4 +34,6 @@
To make edits to the fields associated with the Framework you must first click 'MARC Structure' and then follow the instructions for editing subfields
+
See the full documentation for Frameworks in the manual (online).
+
[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branch_transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branch_transfer_limits.tt
index 7cc9fe5..168d69c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branch_transfer_limits.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branch_transfer_limits.tt
@@ -16,4 +16,6 @@
In the above example, Centerville library will allow patrons to return items from all libraries except Liberty and Franklin to their branch.
+
See the full documentation for Library Transfer Limits in the manual (online).
+
[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branches.tt
index 62d09e0..973e2af 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branches.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branches.tt
@@ -1,6 +1,6 @@
[% INCLUDE 'help-top.inc' %]
-
Libraries & Groups
+
Libraries & Groups
When setting up your Koha system you will want to add information for every library that will be sharing your system. This data is used in several areas of Koha.
@@ -47,4 +47,6 @@
Properties are then applied to libraries via the add or edit library form.
+
See the full documentation for Libraries & Groups in the manual (online).
+
[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tt
index 97e3cbe..4102c46 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tt
@@ -77,4 +77,6 @@
+
See the full documentation for Patron Categories in the manual (online).
+
[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/checkmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/checkmarc.tt
index 54cd878..e9eeba8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/checkmarc.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/checkmarc.tt
@@ -6,4 +6,6 @@
If you change your MARC Bibliographic framework it's recommended that you run this tool to test for errors in your definition.
+
See the full documentation for the MARC Bibliographic Framework Test in the manual (online).
+
[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/cities.tt
index fdb27ac..f1574af 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/cities.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/cities.tt
@@ -18,4 +18,6 @@
This will allow for easy entry of local cities into the patron record without risking the potential for typos or mistaken zip/postal codes.
+
See the full documentation for Cities and Towns in the manual (online).
+
[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/classsources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/classsources.tt
index f7e8bbd..aad39f0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/classsources.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/classsources.tt
@@ -53,4 +53,6 @@
Choose an appropriate filing routine - dewey, generic or lcc
+
See the full documentation for Classification Sources in the manual (online).
+
[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/currency.tt
index b6d9d19..22d2d63 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/currency.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/currency.tt
@@ -8,4 +8,6 @@
The active currency is the main currency you use in your library. Your active currency will have a check mark in the 'Active' column. If you don't have an active currency you will see an error message telling you to choose an active currency.
+
See the full documentation for Currencies and Exchange Rates in the manual (online).
+
[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/fieldmapping.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/fieldmapping.tt
index 6c4a3b0..d689c55 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/fieldmapping.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/fieldmapping.tt
@@ -20,4 +20,6 @@
Future developments will include additional keyword assigned fields.
+
See the full documentation for Keyword to MARC Mapping in the manual (online).
+
[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/item_circulation_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/item_circulation_alerts.tt
index fd324a4..e93bdd8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/item_circulation_alerts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/item_circulation_alerts.tt
@@ -19,4 +19,6 @@
By default all item types and all patrons are notified of check ins and check outs. To change this, click on the item/patron type combo that you would like to stop notices for.
+
See the full documentation for Item Circulation Alerts in the manual (online).
+
[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/itemtypes.tt
index bb68cb6..bbf42b5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/itemtypes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/itemtypes.tt
@@ -57,4 +57,6 @@
You will not be able to delete item types that are being used by items within your system.
+
See the full documentation for Item Types in the manual (online).
+
[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/koha2marclinks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/koha2marclinks.tt
index deaced4..85becbd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/koha2marclinks.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/koha2marclinks.tt
@@ -12,4 +12,6 @@
Important: At this time you can map only 1 MARC field to 1 Koha field. This means that you won't be able to map both the 100a and the 700a to the author field, you need to choose one or the other.
+
See the full documentation for Koha to MARC Mapping in the manual (online).
+
[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tt
index 6b70760..2a8801c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tt
@@ -137,4 +137,6 @@ To edit the subfields associated with the tag, click 'Subfields' to the right of
To save your changes simply click the 'Save Changes' button at the top of the screen
+
See the full documentation for MARC Frameworks in the manual (online).
+
[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tt
index f4a250c..fcd52d9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tt
@@ -21,4 +21,6 @@
To the right of the new field is a link to 'Subfields,' you will need to add subfields before this tag will appear in your MARC editor.
+
See the full documentation for MARC Frameworks in the manual (online).
+
[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/matching-rules.tt
index 10d0a6d..c318cac 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/matching-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/matching-rules.tt
@@ -46,4 +46,6 @@
Required Match checks: none (remove the blank one)
+
See the full documentation for Record Matching Rules in the manual (online).
+
[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/patron-attr-types.tt
index e304b69..c068da7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/patron-attr-types.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/patron-attr-types.tt
@@ -56,4 +56,6 @@
You will be unable to delete an attribute if it's in use.
+
See the full documentation for Patron Attribute Types in the manual (online).
+
[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/preferences.tt
index 09df1fe..edc4c97 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/preferences.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/preferences.tt
@@ -33,4 +33,6 @@
Web Services: includes preferences related to services like OAI-PMH.
+
See the full documentation for System Preferences in the manual (online).
+
[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/roadtype.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/roadtype.tt
index 9793051..4431222 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/roadtype.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/roadtype.tt
@@ -10,4 +10,6 @@
When adding or editing a patron, if you have road types defined, there will be a pull down to choose the road type from.
+
See the full documentation for Road Types in the manual (online).
+
[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt
index 3b43612..3f63222 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt
@@ -5,10 +5,9 @@
These rules define how your items are circulated, how/when fines are calculated and how holds are handled.
The rules are applied from most specific to less specific, using the first found in this order:
-
-
same library, same patron type, all item types
-
same library, same patron type, alll item types
+
same library, same patron type, same item type
+
same library, same patron type, all item type
same library, all patron types, same item type
same library, all patron types, all item types
all libraries, same patron type, same item type
@@ -19,24 +18,23 @@
Tip: If you are a single library system choose your branch name before creating rules (sometimes having only rules for the 'all libraries' option can cause issues with holds)
-
Important: At the very least you will need to set an default circulation rule. This rule should be set for all item types, all libraries and all patron types. That will catch all instances that do not match a specific rule. When checking out if you do not have a rule for all libraries, all item types and all patron types then you may see patrons getting blocked from placing holds. You will also want a rule for your specific library set for all item types and all patron types to avoid this holds issue. Koha needs to know what rule to fall back on.
+
Important: At the very least you will need to set a default circulation rule. This rule should be set for all item types, all libraries and all patron categories. That will catch all instances that do not match a specific rule. When checking out if you do not have a rule for all libraries, all item types and all patron types then you may see patrons getting blocked from placing holds. You will also want a rule for your specific library set for all item types and all patron types to avoid this holds issue. Koha needs to know what rule to fall back on.
Default Circulation Rules
Using the issuing rules matrix you can define rules that depend on patron/item type combos. To set your rules, choose a library from the pull down (or 'all libraries' if you want to apply these rules to all branches):
From the matrix you can choose any combination of patron categories and item types to apply the rules to
-
First choose which patron category you'd like the rule to be applied to. If you leave this to 'All' it will apply to all patron categories
Choose the 'Item Type' you would like this rule to apply to. If you leave this to 'All' it will apply to all item types
Limit the number of items a patron can have checked out at the same time by entering a number in the 'Current Checkouts Allowed' field
Define the period of time and item can be checked out to a patron by entering the number of days in the 'Loan Period' box.
-
'Fine Amount' should have the amount you would like to charge for overdue items
+
You can also define a hard due date for a specific patron category and item type. A hard due date ignores your usual circulation rules and makes it so that all items of the type defined are due on, before or after the date you specify.
+
'Fine Amount' should have the amount you would like to charge for overdue items
-
Enter only numbers and decimal points (no currency symbols).
+
Important
Enter only numbers and decimal points (no currency symbols).
-
The 'Fine Grace Period' is the period of time an item can be overdue before you start charging fines.
Enter the 'Fine Charging Interval' in days (ex. charge fines every 1 day, or every 2 days)
If your library 'fines' patrons by suspending their account you can enter the number of days their fine should be suspended in the 'Suspension in Days' field
@@ -56,31 +54,27 @@
You can set a default maximum number of checkouts and hold policy that will be used if none is defined below for a particular item type or category.
From this menu you can set a default to apply to all item types and patrons in the library.
-
In 'Total Current Checkouts Allowed' enter the total number of items patrons can have checked out at one time
-
Control where patrons can place holds from using the 'Hold Policy' menu
+
Control where patrons can place holds from using the 'Hold Policy' menu
From Any Library: Patrons from any library may put this item on hold. (default if none is defined)
From Home Library: Only patrons from the item's home library may put this book on hold.
No Holds Allowed: No patron may put this book on hold.
-
Once your policy is set, you can unset it by clicking the 'Unset' link to the right of the rule
-
Checkouts Per Patron
For this library, you can specify the maximum number of loans that a patron of a given category can make, regardless of the item type.
-
If the total amount loanable for a given patron category is left blank, no limit applies, except possibly for a limit you define for a specific item type.
+
Tip: If the total amount loanable for a given patron category is left blank, no limit applies, except possibly for a limit you define for a specific item type.
Item Hold Policies
For this library, you can edit rules for given itemtypes, regardless of the patron's category. Currently, this means hold policies.
The various policies have the following effects:
-
From Any Library: Patrons from any library may put this item on hold. (default if none is defined)
From Home Library: Only patrons from the item's home library may put this book on hold.
@@ -91,4 +85,6 @@
Important: These policies are based on the patron's home branch, not the branch that the reserving staff member is from.
+
See the full documentation for Circulation and Fine Rules in the manual (online).
+
[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/stopwords.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/stopwords.tt
index 7fa1807..12e54e1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/stopwords.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/stopwords.tt
@@ -12,4 +12,6 @@
Important: If you change something in this table, ask your administrator to run misc/batchRebuildBiblioTables.pl script.
+
See the full documentation for Stop Words in the manual (online).
+
[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tt
index 1d5d284..51a2a8f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tt
@@ -38,4 +38,6 @@
VANCOUVER PUBLIC LIBRARY z3950.vpl.ca:210 Horizon
+
See the full documentation for Z39.50 Servers in the manual (online).
+
[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
--
1.7.2.3
From nengard at bywatersolutions.com Sun Oct 2 11:48:53 2011
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Sun, 2 Oct 2011 05:48:53 -0400
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 6867: Date last seen
ignored on import
Message-ID: <1317548933-5439-1-git-send-email-nengard@bywatersolutions.com>
From: D Ruth Bavousett
The date last seen field (952 $r) and replacement price date (952 $w) were being
ignored on import, being replaced with NOW() as a hardcoded value. This patch will
allow a value to be imported, but if none is, it will use the ISO date of import
as a default.
Signed-off-by: Nicole C. Engard
---
C4/Items.pm | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/C4/Items.pm b/C4/Items.pm
index bc36dd1..69557aa 100644
--- a/C4/Items.pm
+++ b/C4/Items.pm
@@ -1971,9 +1971,9 @@ sub _koha_new_item {
homebranch = ?,
price = ?,
replacementprice = ?,
- replacementpricedate = NOW(),
+ replacementpricedate = ?,
datelastborrowed = ?,
- datelastseen = NOW(),
+ datelastseen = ?,
stack = ?,
notforloan = ?,
damaged = ?,
@@ -2002,6 +2002,7 @@ sub _koha_new_item {
stocknumber = ?
";
my $sth = $dbh->prepare($query);
+ my $today = C4::Dates->today('iso');
$sth->execute(
$item->{'biblionumber'},
$item->{'biblioitemnumber'},
@@ -2011,7 +2012,9 @@ sub _koha_new_item {
$item->{'homebranch'},
$item->{'price'},
$item->{'replacementprice'},
+ $item->{'replacementpricedate'} || $today,
$item->{datelastborrowed},
+ $item->{datelastseen} || $today,
$item->{stack},
$item->{'notforloan'},
$item->{'damaged'},
--
1.7.2.3
From nengard at bywatersolutions.com Sun Oct 2 11:52:38 2011
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Sun, 2 Oct 2011 05:52:38 -0400
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Follow-up fix for Bug 4473 -
Recent comments view for the OPAC
Message-ID: <1317549158-5571-1-git-send-email-nengard@bywatersolutions.com>
From: Owen Leonard
This follow-up adds a system preference which controls display
of a link to recent comments in the OPAC masthead alongside
"Advanced search," "Tag cloud," etc.
Signed-off-by: Nicole C. Engard
---
C4/Auth.pm | 1 +
installer/data/mysql/sysprefs.sql | 1 +
installer/data/mysql/updatedatabase.pl | 7 +++++++
.../prog/en/modules/admin/preferences/opac.pref | 7 +++++++
koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc | 1 +
5 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/C4/Auth.pm b/C4/Auth.pm
index 7211769..3690f5e 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -424,6 +424,7 @@ sub get_template_and_user {
OpacHighlightedWords => C4::Context->preference("OpacHighlightedWords"),
OPACItemHolds => C4::Context->preference("OPACItemHolds"),
OPACShelfBrowser => "". C4::Context->preference("OPACShelfBrowser"),
+ OpacShowRecentComments => C4::Context->preference("OpacShowRecentComments"),
OPACURLOpenInNewWindow => "" . C4::Context->preference("OPACURLOpenInNewWindow"),
OPACUserCSS => "". C4::Context->preference("OPACUserCSS"),
OPACViewOthersSuggestions => "" . C4::Context->preference("OPACViewOthersSuggestions"),
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index 79d4893..27bef9a 100755
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -318,3 +318,4 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES (
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('BasketConfirmations', '1', 'When closing or reopening a basket,', 'always ask for confirmation.|do not ask for confirmation.', 'Choice');
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '|| aca||aabn | a|a d', NULL, NULL, 'Textarea');
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0,'If ON Openlibrary book covers will be show',NULL,'YesNo');
+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacShowRecentComments',0,'If ON a link to recent comments will appear in the OPAC masthead',NULL,'YesNo');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 6b88c29..ebb6cb3 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4446,6 +4446,13 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
SetVersion($DBversion);
}
+$DBversion = "3.05.00.XXX";
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+ $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacShowRecentComments',0,'If ON a link to recent comments will appear in the OPAC masthead',NULL,'YesNo');");
+ print "Upgrade to $DBversion done (Add syspref OpacShowRecentComments. When the preference is turned on a link to recent comments will appear in the OPAC masthead. )\n";
+ SetVersion($DBversion);
+}
+
=head1 FUNCTIONS
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 8bbf692..deb7cbb 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
@@ -86,6 +86,13 @@ OPAC:
no: "Don't show"
- the name of the patron that has an item checked out on item detail pages on the OPAC.
-
+ - pref: OpacShowRecentComments
+ default: 0
+ choices:
+ yes: Show
+ no: "Don't show"
+ - a link to recent comments in the OPAC masthead.
+ -
- pref: OpacHighlightedWords
choices:
yes: Highlight
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
index 2510a7f..07268a2 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
@@ -112,6 +112,7 @@
Advanced Search
[% IF ( OpacBrowser ) %] | Browse by Hierarchy[% END %]
[% IF ( OpacAuthorities ) %] | Browse by author or subject[% END %]
+[% IF ( OpacShowRecentComments ) %] | Recent Comments[% END %]
[% IF ( TagsEnabled ) %] | Tag Cloud[% END %]
[% IF ( OpacCloud ) %] | Subject Cloud[% END %]
[% IF ( OpacTopissue ) %] | Most Popular[% END %]
--
1.7.2.3
From oleonard at myacpl.org Tue Oct 4 17:52:22 2011
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue, 4 Oct 2011 11:52:22 -0400
Subject: [Koha-patches] [PATCH] Suggested change to Bug 5725 - Batch
modifications for Biblios
Message-ID: <1317743542-25530-1-git-send-email-oleonard@myacpl.org>
This modification changes the "Batch edit" button to a link
in the "Selected items: " set alongside "add to a list," "place
hold," etc. Instead of always batch editing all items, the user
can select individual ones to be passed to the batch edit page.
---
koha-tmpl/intranet-tmpl/prog/en/js/basket.js | 12 ++++---
.../intranet-tmpl/prog/en/modules/basket/basket.tt | 31 +++++++++-----------
2 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/basket.js b/koha-tmpl/intranet-tmpl/prog/en/js/basket.js
index 03dc306..31ffc11 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/js/basket.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/basket.js
@@ -434,9 +434,11 @@ $(document).ready(function(){
});
function batchEdit(){
- var valCookie = readCookie(nameCookie);
- var strCookie = nameParam + "=" + valCookie;
-
- var loc = CGIBIN + "tools/batchedit.pl?" + strCookie;
- window.opener.location = loc;
+ var items = document.getElementById('records').value;
+ if(items){
+ var loc = CGIBIN + "tools/batchedit.pl?" + nameParam + "=" + items;
+ window.opener.location = loc;
+ } else {
+ alert(MSG_NO_RECORD_SELECTED);
+ }
}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt
index 05a8acc..6049f08 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt
@@ -13,16 +13,6 @@
@@ -194,10 +198,34 @@ $(document).ready(function(){