+
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: Srdjan Jankovic
Raise warning rather than disallowing
Remove due date js validation when checking out
Signed-off-by: Robin Sheat
---
C4/Circulation.pm | 9 +++++++--
circ/circulation.pl | 12 ++++++------
.../prog/en/modules/circ/circulation.tmpl | 13 ++++++++++---
3 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 644ab27..1962d57 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -641,7 +641,7 @@ reserved for someone else.
=head3 INVALID_DATE
-sticky due date is invalid
+sticky due date is invalid or due date in the past
=head3 TOO_MANY
@@ -679,7 +679,12 @@ sub CanBookBeIssued {
# Offline circ calls AddIssue directly, doesn't run through here
# So issuingimpossible should be ok.
}
- $issuingimpossible{INVALID_DATE} = $duedate->output('syspref') unless ( $duedate && $duedate->output('iso') ge C4::Dates->today('iso') );
+ if ($duedate) {
+ $needsconfirmation{INVALID_DATE} = $duedate->output('syspref')
+ unless $duedate->output('iso') ge C4::Dates->today('iso');
+ } else {
+ $issuingimpossible{INVALID_DATE} = $duedate->output('syspref');
+ }
#
# BORROWER STATUS
diff --git a/circ/circulation.pl b/circ/circulation.pl
index 4b67920..4a79695 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -142,13 +142,13 @@ if($duedatespec_allow){
if ($duedatespec) {
if ($duedatespec =~ C4::Dates->regexp('syspref')) {
my $tempdate = C4::Dates->new($duedatespec);
- if ($tempdate and $tempdate->output('iso') gt C4::Dates->new()->output('iso')) {
- # i.e., it has to be later than today/now
+# if ($tempdate and $tempdate->output('iso') gt C4::Dates->new()->output('iso')) {
+# # i.e., it has to be later than today/now
$datedue = $tempdate;
- } else {
- $invalidduedate = 1;
- $template->param(IMPOSSIBLE=>1, INVALID_DATE=>$duedatespec);
- }
+# } else {
+# $invalidduedate = 1;
+# $template->param(IMPOSSIBLE=>1, INVALID_DATE=>$duedatespec);
+# }
} else {
$invalidduedate = 1;
$template->param(IMPOSSIBLE=>1, INVALID_DATE=>$duedatespec);
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index 980d195..73bc536 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -267,7 +267,14 @@ function refocus(calendar) {
" />
+
+
+ " />
+
+
+
" />
+
" />
" />
@@ -420,7 +427,7 @@ No patron matched
-
+ >"/>
@@ -449,8 +456,8 @@ No patron matched
inputField : "duedatespec",
ifFormat : "",
button : "CalendarDueDate",
- disableFunc : validate1,
- dateStatusFunc : validate1,
+// disableFunc : validate1,
+// dateStatusFunc : validate1,
onClose : refocus
}
);
--
1.7.1
From oleonard at myacpl.org Mon Oct 4 15:54:18 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon, 4 Oct 2010 09:54:18 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 5269 - link to patron edit form
when editing turned off
Message-ID: <1286200458-6328-1-git-send-email-oleonard@myacpl.org>
---
koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
index 2b62407..001d947 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
@@ -102,13 +102,13 @@ $.tablesorter.addParser({
-
Please note: 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.
+
Please note: 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 contact the library.
-
Please note: According to our records, we don'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)
+
Please note: According to our records, we don't have up-to-date contact informationcontact information on file. Please contact the library 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).
-
Please note: 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.
+
Please note: Your library card has been marked as lost or stolen. If this is an error, please contact the library.
Please note: Since you have more than in fines, you cannot renew your books online. Please pay your fines if you wish to renew your books.
--
1.7.0.4
From oleonard at myacpl.org Mon Oct 4 16:32:42 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon, 4 Oct 2010 10:32:42 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 5265,
error message on lists is misleading
Message-ID: <1286202762-6738-1-git-send-email-oleonard@myacpl.org>
The check to see if an item exists always evaluates as true.
Correcting this lets the script handle the error as it
was designed to.
---
C4/VirtualShelves/Page.pm | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm
index 73ca42d..9d15847 100644
--- a/C4/VirtualShelves/Page.pm
+++ b/C4/VirtualShelves/Page.pm
@@ -89,7 +89,8 @@ sub shelfpage ($$$$$) {
if ( $shelfnumber = $query->param('viewshelf') ) {
if ( ShelfPossibleAction( $loggedinuser, $shelfnumber, 'manage' ) ) {
if ( $barcode = $query->param('addbarcode') ) {
- if ( $item = GetItem( 0, $barcode ) ) {
+ $item = GetItem( 0, $barcode );
+ if (defined $item && $item->{'itemnumber'}){
$biblio = GetBiblioFromItemNumber( $item->{'itemnumber'} );
AddToShelf( $biblio->{'biblionumber'}, $shelfnumber )
or push @paramsloop, { duplicatebiblio => $barcode };
--
1.7.0.4
From oleonard at myacpl.org Mon Oct 4 17:11:33 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon, 4 Oct 2010 11:11:33 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 5240 - next link hidden on edit
subfields
Message-ID: <1286205093-6991-1-git-send-email-oleonard@myacpl.org>
This patch removes the pagination altogether, displaying
everything on one page. It also moves some HTML out of the
script and into the template.
---
admin/marc_subfields_structure.pl | 23 +------------------
.../en/modules/admin/marc_subfields_structure.tmpl | 2 +-
2 files changed, 3 insertions(+), 22 deletions(-)
diff --git a/admin/marc_subfields_structure.pl b/admin/marc_subfields_structure.pl
index bae9c65..372a811 100755
--- a/admin/marc_subfields_structure.pl
+++ b/admin/marc_subfields_structure.pl
@@ -76,7 +76,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
debug => 1,
}
);
-my $pagesize = 30;
+
my $op = $input->param('op');
$tagfield =~ s/\,//g;
@@ -531,12 +531,7 @@ elsif ( $op eq 'delete_confirmed' ) {
else { # DEFAULT
my ( $count, $results ) = string_search( $tagfield, $frameworkcode );
my @loop_data = ();
- for (
- my $i = $offset ;
- $i < ( $offset + $pagesize < $count ? $offset + $pagesize : $count ) ;
- $i++
- )
- {
+ for ( my $i = 0; $i < $count; $i++ ) {
my %row_data; # get a fresh hash for the row data
$row_data{tagfield} = $results->[$i]{'tagfield'};
$row_data{tagsubfield} = $results->[$i]{'tagsubfield'};
@@ -552,10 +547,6 @@ else { # DEFAULT
$row_data{hidden} = $results->[$i]{'hidden'};
$row_data{isurl} = $results->[$i]{'isurl'};
$row_data{link} = $results->[$i]{'link'};
- $row_data{delete} =
-"$script_name?op=delete_confirm&tagfield=$tagfield&tagsubfield="
- . $results->[$i]{'tagsubfield'}
- . "&frameworkcode=$frameworkcode";
if ( $row_data{tab} eq -1 ) {
$row_data{subfield_ignored} = 1;
@@ -569,16 +560,6 @@ else { # DEFAULT
edit_frameworkcode => $frameworkcode
);
- if ( $offset > 0 ) {
- my $prevpage = $offset - $pagesize;
- $template->param(
- prev => "" );
- }
- if ( $offset + $pagesize < $count ) {
- my $nextpage = $offset + $pagesize;
- $template->param(
- next => "" );
- }
} #---- END $OP eq DEFAULT
output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
index 2ea58de..201aad5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
@@ -207,7 +207,7 @@
| Link:,
-
--
1.5.6.5
From nengard at bywatersolutions.com Mon Oct 4 17:38:48 2010
From: nengard at bywatersolutions.com (Nicole Engard)
Date: Mon, 4 Oct 2010 11:38:48 -0400
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 5269 - link to
patron edit form when editing turned off
Message-ID: <1286206728-2575-1-git-send-email-nengard@bywatersolutions.com>
From: Owen Leonard
Signed-off-by: Nicole Engard
---
koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
index 2b62407..001d947 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
@@ -102,13 +102,13 @@ $.tablesorter.addParser({
-
Please note: 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.
+
Please note: 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 contact the library.
-
Please note: According to our records, we don'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)
+
Please note: According to our records, we don't have up-to-date contact informationcontact information on file. Please contact the library 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).
-
Please note: 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.
+
Please note: Your library card has been marked as lost or stolen. If this is an error, please contact the library.
Please note: Since you have more than in fines, you cannot renew your books online. Please pay your fines if you wish to renew your books.
--
1.5.6.5
From colin.campbell at ptfs-europe.com Tue Oct 5 11:32:36 2010
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Tue, 5 Oct 2010 10:32:36 +0100
Subject: [Koha-patches] [PATCH] Bug 2664: Add item should preselect logged
in branch
Message-ID: <1286271156-3388-1-git-send-email-colin.campbell@ptfs-europe.com>
An earlier fix to stop branch values being overwritten in
edit items was causing the branch value to be unset when adding items
---
cataloguing/additem.pl | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl
index ea4daf9..e6f19d2 100755
--- a/cataloguing/additem.pl
+++ b/cataloguing/additem.pl
@@ -433,7 +433,10 @@ foreach my $tag (sort keys %{$tagslib}) {
foreach my $thisbranch (@$branches) {
push @authorised_values, $thisbranch->{value};
$authorised_lib{$thisbranch->{value}} = $thisbranch->{branchname};
- # $value = $thisbranch->{value} if $thisbranch->{selected};
+ # in edit item this is set to the data value otherwise use default
+ if ($op ne 'edititem' && $thisbranch->{selected} ) {
+ $value = $thisbranch->{value};
+ }
}
}
elsif ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "itemtypes" ) {
--
1.7.2.3
From nengard at bywatersolutions.com Tue Oct 5 13:48:25 2010
From: nengard at bywatersolutions.com (Nicole Engard)
Date: Tue, 5 Oct 2010 07:48:25 -0400
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 2664: Add item should
preselect logged in branch
Message-ID: <1286279305-2326-1-git-send-email-nengard@bywatersolutions.com>
From: Colin Campbell
An earlier fix to stop branch values being overwritten in
edit items was causing the branch value to be unset when adding items
Signed-off-by: Nicole Engard
---
cataloguing/additem.pl | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl
index ea4daf9..e6f19d2 100755
--- a/cataloguing/additem.pl
+++ b/cataloguing/additem.pl
@@ -433,7 +433,10 @@ foreach my $tag (sort keys %{$tagslib}) {
foreach my $thisbranch (@$branches) {
push @authorised_values, $thisbranch->{value};
$authorised_lib{$thisbranch->{value}} = $thisbranch->{branchname};
- # $value = $thisbranch->{value} if $thisbranch->{selected};
+ # in edit item this is set to the data value otherwise use default
+ if ($op ne 'edititem' && $thisbranch->{selected} ) {
+ $value = $thisbranch->{value};
+ }
}
}
elsif ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "itemtypes" ) {
--
1.5.6.5
From chrisc at catalyst.net.nz Tue Oct 5 21:53:49 2010
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Wed, 6 Oct 2010 08:53:49 +1300
Subject: [Koha-patches] [SIGNED-OFF] [PATCH] Bug 5194 - Patron notification
on new issues not working
Message-ID: <1286308429-29392-1-git-send-email-chrisc@catalyst.net.nz>
From: Katrin Fischer
Signed-off-by: Chris Cormack
---
C4/Letters.pm | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/C4/Letters.pm b/C4/Letters.pm
index 885ed5f..62b339a 100644
--- a/C4/Letters.pm
+++ b/C4/Letters.pm
@@ -275,7 +275,7 @@ sub SendAlerts {
# and parse borrower ...
my $innerletter = $letter;
- my $borinfo = GetMember( 'borrowernumber' => $_->{'borrowernumber'});
+ my $borinfo = C4::Members::GetMember('borrowernumber' => $_->{'borrowernumber'});
parseletter( $innerletter, 'borrowers', $_->{'borrowernumber'} );
# ... then send mail
--
1.7.0.4
From mason at kohaaloha.com Wed Oct 6 04:09:03 2010
From: mason at kohaaloha.com (Mason James)
Date: Wed, 06 Oct 2010 15:09:03 +1300
Subject: [Koha-patches] [PATCH] [PATCH] (bug 5277) (HEAD) cant search by
barcode in OPAC search-page
Message-ID: <1286330943-27499-1-git-send-email-mason@kohaaloha.com>
---
.../opac-tmpl/prog/en/modules/opac-advsearch.tmpl | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
index 52b00e7..2f762f5 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
@@ -93,6 +93,7 @@
+
--
1.7.1
From gmcharlt at gmail.com Wed Oct 6 13:43:15 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Wed, 6 Oct 2010 07:43:15 -0400
Subject: [Koha-patches] [PATCH] bug 5086: fix setting claim date
Message-ID: <1286365395-11607-1-git-send-email-gmcharlt@gmail.com>
Also removed a locus for SQL injection.
Signed-off-by: Galen Charlton
---
C4/Serials.pm | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/C4/Serials.pm b/C4/Serials.pm
index 9c22901..32e46be 100644
--- a/C4/Serials.pm
+++ b/C4/Serials.pm
@@ -287,10 +287,10 @@ sub UpdateClaimdateIssues {
my $dbh = C4::Context->dbh;
$date = strftime( "%Y-%m-%d", localtime ) unless ($date);
my $query = "
- UPDATE serial SET claimdate=$date,status=7
- WHERE serialid in (" . join( ",", @$serialids ) . ")";
+ UPDATE serial SET claimdate = ?, status = 7
+ WHERE serialid in (" . join( ",", map { '?' } @$serialids ) . ")";
my $rq = $dbh->prepare($query);
- $rq->execute;
+ $rq->execute($date, @$serialids);
return $rq->rows;
}
--
1.7.0
From gmcharlt at gmail.com Wed Oct 6 13:45:05 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Wed, 6 Oct 2010 07:45:05 -0400
Subject: [Koha-patches] [PATCH] Bug 5086 Pass claimed date correctly
In-Reply-To: <1280930897.8220.3.camel@koha-dev>
References: <1280922958-8096-1-git-send-email-colin.campbell@ptfs-europe.com>
<1280930897.8220.3.camel@koha-dev>
Message-ID:
Hi,
On Wed, Aug 4, 2010 at 10:08 AM, Michael Hafen wrote:
> I would think that the $dbh->quote() function should be used here.
> Especially if $date can come from the browser. ?A place holder and
> passing $date through $rq->execute() would accomplish the same thing.
... and remove a possible entry point for SQL injection. I've
submitted and will push a new patch that uses placeholders. Direct
interpolation of strings in to queries should be removed on sight, and
if for some reason a placeholder cannot be used, $dbh->quote() should
be used.
Regards,
Galen
--
Galen Charlton
gmcharlt at gmail.com
From gmcharlt at gmail.com Wed Oct 6 14:29:12 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Wed, 6 Oct 2010 08:29:12 -0400
Subject: [Koha-patches] Bug 5128 [3.2] To define default 9xx fields for
Unimarc
In-Reply-To: <4ece90a0715addbb380df4817d6d3302@cilea.it>
References: <4ece90a0715addbb380df4817d6d3302@cilea.it>
Message-ID:
Hi,
I have a question about one of the changes to record.abs:
-melm 995$h ccode,item
...
+melm 995$8 ccode,item
Would this not break indexing of the ccode for existing UNIMARC users?
Regards,
Galen
2010/8/12 tajoli :
> Hi,
>
> I have problem with git-send; I will able to use it
> only from 28/Aug.
> So I sent the patch as attach.
>
> Bye
>
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
>
--
Galen Charlton
gmcharlt at gmail.com
From henridamien.laurent at biblibre.com Wed Oct 6 15:04:34 2010
From: henridamien.laurent at biblibre.com (LAURENT Henri-Damien)
Date: Wed, 06 Oct 2010 15:04:34 +0200
Subject: [Koha-patches] Bug 5128 [3.2] To define default 9xx fields for
Unimarc
In-Reply-To:
References: <4ece90a0715addbb380df4817d6d3302@cilea.it>
Message-ID: <4CAC73E2.6050907@biblibre.com>
Le 06/10/2010 14:29, Galen Charlton a ?crit :
> Hi,
>
> I have a question about one of the changes to record.abs:
>
> -melm 995$h ccode,item
> ...
> +melm 995$8 ccode,item
>
> Would this not break indexing of the ccode for existing UNIMARC users?
>
> Regards,
>
> Galen
Yes, I confirm this would be quite bad for french users.
--
Herni-Damien LAURENT
From gmcharlt at gmail.com Wed Oct 6 15:30:47 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Wed, 6 Oct 2010 09:30:47 -0400
Subject: [Koha-patches] Bug 5128 [3.2] To define default 9xx fields for
Unimarc
In-Reply-To: <4CAC73E2.6050907@biblibre.com>
References: <4ece90a0715addbb380df4817d6d3302@cilea.it>
<4CAC73E2.6050907@biblibre.com>
Message-ID:
Hi,
On Wed, Oct 6, 2010 at 9:04 AM, LAURENT Henri-Damien
wrote:
> Yes, I confirm this would be quite bad for french users.
Thanks for confirming. Since the rest of the patch is for the English
UNIMARC framework, I think that the keeping the 995$h for ccode is
required; once that's rectified, the patch can be pushed.
Regards,
Galen
--
Galen Charlton
gmcharlt at gmail.com
From tajoli at cilea.it Wed Oct 6 15:33:58 2010
From: tajoli at cilea.it (Zeno Tajoli)
Date: Wed, 06 Oct 2010 15:33:58 +0200
Subject: [Koha-patches] Bug 5128 [3.2] To define default 9xx fields for
Unimarc
In-Reply-To:
References: <4ece90a0715addbb380df4817d6d3302@cilea.it>
Message-ID: <4CAC7AC6.101@cilea.it>
Hi Galen,
Il 06/10/2010 14:29, Galen Charlton ha scritto:
> I have a question about one of the changes to record.abs:
>
> -melm 995$h ccode,item
> ...
> +melm 995$8 ccode,item
>
> Would this not break indexing of the ccode for existing UNIMARC users?
>
I think no. Why?
1) A 995 subfield for ccode (for Unimarc setup) is a new thing in 3.2. A
value for items.ccode is not present in file record.abs of 3.0.6
2)In 3.2 the en SQL Unimarc definition for items.ccode is 995$8
file
../installer/data/mysql/en/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql
line 182: ('995', '8', 'Koha collection', 'Koha collection', 0, 0,
'items.ccode', 10, 'CCODE', '', '', 0, 0, '', '', '', NULL),
3)In 3.2 all fr SQL Unimarc defintions use 995$h for "code ? barres,
incr?mentation"
All french SQL definitions don't setup a subfield for items.ccode
file
..installer/data/mysql/fr-FR/marcflavour/unimarc_complet/Obligatoire/framework_DEFAULT.sql
line 2023: ('995', 'h', 'code ? barres, incr?mentation', '', 0, 0, '',
-1, '', '', '', NULL, 0, '', NULL, NULL, ''),
3b)In 3.2 all fr SQL Unimarc defintions don't use 995$8
4)In my wiki proposal of 995 for 3.2 Unimarc
I inserted 995$8 for items.ccode.
So I think we can use 995$8 for items.ccode and connect index.
Bye
--
Zeno Tajoli
CILEA - Segrate (MI)
tajoliAT_SPAM_no_prendiATcilea.it
(Indirizzo mascherato anti-spam; sostituisci qaunto tra AT con @)
From henridamien.laurent at biblibre.com Wed Oct 6 15:51:35 2010
From: henridamien.laurent at biblibre.com (LAURENT Henri-Damien)
Date: Wed, 06 Oct 2010 15:51:35 +0200
Subject: [Koha-patches] Bug 5128 [3.2] To define default 9xx fields for
Unimarc
In-Reply-To: <4CAC7AC6.101@cilea.it>
References: <4ece90a0715addbb380df4817d6d3302@cilea.it>
<4CAC7AC6.101@cilea.it>
Message-ID: <4CAC7EE7.4070704@biblibre.com>
Le 06/10/2010 15:33, Zeno Tajoli a ?crit :
> Hi Galen,
>
> Il 06/10/2010 14:29, Galen Charlton ha scritto:
>> I have a question about one of the changes to record.abs:
>>
>> -melm 995$h ccode,item
>> ...
>> +melm 995$8 ccode,item
>>
>> Would this not break indexing of the ccode for existing UNIMARC users?
>>
>
> I think no. Why?
>
> 1) A 995 subfield for ccode (for Unimarc setup) is a new thing in 3.2. A
> value for items.ccode is not present in file record.abs of 3.0.6
>
> 2)In 3.2 the en SQL Unimarc definition for items.ccode is 995$8
> file
> ../installer/data/mysql/en/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql
>
> line 182: ('995', '8', 'Koha collection', 'Koha collection', 0, 0,
> 'items.ccode', 10, 'CCODE', '', '', 0, 0, '', '', '', NULL),
>
> 3)In 3.2 all fr SQL Unimarc defintions use 995$h for "code ? barres,
> incr?mentation"
> All french SQL definitions don't setup a subfield for items.ccode
> file
> ..installer/data/mysql/fr-FR/marcflavour/unimarc_complet/Obligatoire/framework_DEFAULT.sql
>
> line 2023: ('995', 'h', 'code ? barres, incr?mentation', '', 0, 0, '',
> -1, '', '', '', NULL, 0, '', NULL, NULL, ''),
>
> 3b)In 3.2 all fr SQL Unimarc defintions don't use 995$8
>
> 4)In my wiki proposal of 995 for 3.2 Unimarc
>
> I inserted 995$8 for items.ccode.
>
> So I think we can use 995$8 for items.ccode and connect index.
>
> Bye
This would mean that all french unimarc users would have to
a) edit zebra configuration
b) change their frameworks
c) use sync_items_in_marc_bib
d) reindex
All that would turn out to be quite heavy for big libraries
(sync_items_in_marc_bib is quite slow).
How many UNIMARC foreign users is there compared to french ?
--
Henri-Damien LAURENT
From gmcharlt at gmail.com Wed Oct 6 16:41:25 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Wed, 6 Oct 2010 10:41:25 -0400
Subject: [Koha-patches] [PATCH 2/4] fix test plan and false test errors in
Search.t
In-Reply-To: <1286376087-20304-1-git-send-email-gmcharlt@gmail.com>
References: <1286376087-20304-1-git-send-email-gmcharlt@gmail.com>
Message-ID: <1286376087-20304-2-git-send-email-gmcharlt@gmail.com>
Signed-off-by: Galen Charlton
---
t/db_dependent/Search.t | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/t/db_dependent/Search.t b/t/db_dependent/Search.t
index 00d5b7c..31316f2 100644
--- a/t/db_dependent/Search.t
+++ b/t/db_dependent/Search.t
@@ -5,24 +5,26 @@
use strict;
use warnings;
+use utf8;
+
use YAML;
use C4::Debug;
use C4::Context;
use C4::Search;
-use Test::More tests => 3;
+use Test::More tests => 4;
-BEGIN {
- use_ok('C4::Search');
-}
-foreach my $string ("Le??on","mod\xc3\xa8les"){
-my @results=C4::Search::_remove_stopwords($string,"kw");
-$debug && warn "$string ",Dump(@results);
-ok($results[0] eq $string,"$string is not modified");
+use_ok('C4::Search');
+
+foreach my $string ("Le??on","mod??les") {
+ my @results=C4::Search::_remove_stopwords($string,"kw");
+ $debug && warn "$string ",Dump(@results);
+ ok($results[0] eq $string,"$string is not modified");
}
-foreach my $string ("Les chaussettes de l'archiduchesse"){
-my @results=C4::Search::_remove_stopwords($string,"kw");
-$debug && warn "$string ",Dump(@results);
-ok($results[0] ne $string,"$results[0] from $string");
+
+foreach my $string ("Les chaussettes de l'archiduchesse") {
+ my @results=C4::Search::_remove_stopwords($string,"kw");
+ $debug && warn "$string ",Dump(@results);
+ ok($results[0] ne $string,"$results[0] from $string");
}
--
1.7.0
From gmcharlt at gmail.com Wed Oct 6 16:41:27 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Wed, 6 Oct 2010 10:41:27 -0400
Subject: [Koha-patches] [PATCH 4/4] various improvements to
t/db_dependent/VirtualShelves.t
In-Reply-To: <1286376087-20304-3-git-send-email-gmcharlt@gmail.com>
References: <1286376087-20304-1-git-send-email-gmcharlt@gmail.com>
<1286376087-20304-2-git-send-email-gmcharlt@gmail.com>
<1286376087-20304-3-git-send-email-gmcharlt@gmail.com>
Message-ID: <1286376087-20304-4-git-send-email-gmcharlt@gmail.com>
* updated to reflect recent (and old) changes to the API
* corrected test plan
* adopted Test::More
* correctly handle and test functionality to not add duplicate
bibs to a list
Signed-off-by: Galen Charlton
---
t/db_dependent/VirtualShelves.t | 103 ++++++++++++++++----------------------
1 files changed, 43 insertions(+), 60 deletions(-)
diff --git a/t/db_dependent/VirtualShelves.t b/t/db_dependent/VirtualShelves.t
index 00cb032..041c3fc 100755
--- a/t/db_dependent/VirtualShelves.t
+++ b/t/db_dependent/VirtualShelves.t
@@ -5,13 +5,11 @@
# Author : Antoine Farnault, antoine at koha-fr.org
#
-use Test;
use strict;
-#use warnings; FIXME - Bug 2505
+use warnings;
use C4::Context;
-# Making 30 tests.
-BEGIN { plan tests => 112 }
+use Test::More tests => 92;
# Getting some borrowers from database.
my $dbh = C4::Context->dbh;
@@ -27,26 +25,13 @@ while(my $borrower = $sth->fetchrow){
push @borrowers, $borrower;
}
-# Getting some itemnumber from database
-my $query = qq/
- SELECT itemnumber
- FROM items
- LIMIT 10
-/;
-my $sth = $dbh->prepare($query);
-$sth->execute;
-my @items;
-while(my $item = $sth->fetchrow){
- push @items, $item;
-}
-
# Getting some biblionumbers from database
-my $query = qq/
+$query = qq/
SELECT biblionumber
FROM biblio
LIMIT 10
/;
-my $sth = $dbh->prepare($query);
+$sth = $dbh->prepare($query);
$sth->execute;
my @biblionumbers;
while(my $biblionumber = $sth->fetchrow){
@@ -61,9 +46,9 @@ my $delete_virtualshelfcontent =qq/
DELETE FROM virtualshelfcontents WHERE 1
/;
-my $sth = $dbh->prepare($delete_virtualshelf);
+$sth = $dbh->prepare($delete_virtualshelf);
$sth->execute;
-my $sth = $dbh->prepare($delete_virtualshelfcontent);
+$sth = $dbh->prepare($delete_virtualshelfcontent);
$sth->execute;
# ---
@@ -73,12 +58,7 @@ $sth->execute;
#
#----------------------------------------------------------------------#
-use C4::VirtualShelves;
-my $version = C4::VirtualShelves->VERSION;
-print "\n----------Testing C4::VirtualShelves version ".$version."--------\n";
-
-ok($version); # First test: the module is loaded & the version is readable.
-
+use_ok('C4::VirtualShelves');
#-----------------------TEST AddShelf function------------------------#
# usage : $shelfnumber = &AddShelf( $shelfname, $owner, $category);
@@ -88,38 +68,49 @@ my @shelves;
for(my $i=0; $i<10;$i++){
my $ShelfNumber = AddShelf("Shelf_".$i,$borrowers[$i] || '',int(rand(3))+1);
die "test Not ok, remove some shelves before" if ($ShelfNumber == -1);
- ok($ShelfNumber); # Shelf creation successful;
- push @shelves, $ShelfNumber if ok($ShelfNumber);
+ ok($ShelfNumber > -1, "created shelf"); # Shelf creation successful;
+ push @shelves, $ShelfNumber if $ShelfNumber > -1;
}
-ok(10,scalar @shelves); # 10 shelves in @shelves;
+ok(10 == scalar @shelves, 'created 10 lists'); # 10 shelves in @shelves;
# try to create some shelf which already exists.
for(my $i=0;$i<10;$i++){
my $badNumShelf = AddShelf("Shelf_".$i,$borrowers[$i] || '','');
- ok(-1,$badNumShelf); # AddShelf returns -1 if name already exist.
+ ok(-1 == $badNumShelf, 'do not create lists with duplicate names'); # AddShelf returns -1 if name already exist.
}
-#-----------TEST AddToShelf & &AddToShelfFromBiblio & GetShelfContents & DelFromShelf functions--------------#
-# usage : &AddToShelf($itemnumber, $shelfnumber);
-# usage : $itemlist = &GetShelfContents($shelfnumber);
-# usage : $itemlist = GetShelfContents($shelfnumber);
+#-----------TEST AddToShelf & GetShelfContents & DelFromShelf functions--------------#
+# usage : &AddToShelf($biblionumber, $shelfnumber);
+# usage : $biblist = &GetShelfContents($shelfnumber);
+# usage : $biblist = GetShelfContents($shelfnumber);
+my %used = ();
for(my $i=0; $i<10;$i++){
- my $item = $items[int(rand(9))];
+ my $bib = $biblionumbers[int(rand(9))];
my $shelfnumber = $shelves[int(rand(9))];
-
- my ($itemlistBefore,$countbefore) = GetShelfContents($shelfnumber);
- AddToShelf($item,$shelfnumber);
- my ($itemlistAfter,$countafter) = GetShelfContents($shelfnumber);
- ok($countbefore,$countafter - 1); # the item has been successfuly added.
+
+ my $key = "$bib\t$shelfnumber";
+ my $should_fail if exists $used{$key};
+
+ my ($biblistBefore,$countbefore) = GetShelfContents($shelfnumber);
+ my $status = AddToShelf($bib,$shelfnumber);
+ my ($biblistAfter,$countafter) = GetShelfContents($shelfnumber);
+
+ if ($should_fail) {
+ ok(!defined($status), 'failed to add to list when we should');
+ } else {
+ ok(defined($status), 'added to list when we should');
+ }
+
+ if (defined $status) {
+ ok($countbefore == $countafter - 1, 'added bib to list'); # the bib has been successfuly added.
+ } else {
+ ok($countbefore == $countafter, 'did not add duplicate bib to list'); # the bib has been successfuly added.
+ }
+
+ $used{$key}++;
-
- # same thing with AddToShelfFromBiblio
- my $biblionumber = $biblionumbers[int(rand(9))];
- &AddToShelfFromBiblio($biblionumber, $shelfnumber);
- my ($AfterAgain,$countagain) = GetShelfContents($shelfnumber);
- ok($countafter, $countagain -1);
}
#-----------------------TEST ModShelf & GetShelf functions------------------------#
@@ -136,25 +127,17 @@ for(my $i=0; $i<10;$i++){
ModShelf($numA,$shelf);
my ($numB,$nameB,$ownerB,$categoryB) = GetShelf($numA);
- ok($numA,$numB);
- ok($shelf->{shelfname},$nameB);
- ok($shelf->{owner},$ownerB);
- ok($shelf->{category},$categoryB);
+ ok($numA == $numB, 'modified shelf');
+ ok($shelf->{shelfname} eq $nameB, '... and name change took');
+ ok($shelf->{owner} eq $ownerB, '... and owner change took');
+ ok($shelf->{category} eq $categoryB, '... and category change took');
}
#-----------------------TEST DelShelf & DelFromShelf functions------------------------#
# usage : ($status) = &DelShelf($shelfnumber);
-# usage : &DelFromShelf( $itemnumber, $shelfnumber);
for(my $i=0; $i<10;$i++){
my $shelfnumber = $shelves[$i];
my $status = DelShelf($shelfnumber);
- if($status){
- my ($items,$count) = GetShelfContents($shelfnumber);
- ok($status,$count);
- foreach (@$items){ # delete all the item in this shelf
- DelFromShelf($_{'itemnumber'},$shelfnumber);
- }
- ok(DelShelf($shelfnumber));
- }
+ ok(1 == $status, "deleted shelf $shelfnumber and its contents");
}
--
1.7.0
From gmcharlt at gmail.com Wed Oct 6 16:41:24 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Wed, 6 Oct 2010 10:41:24 -0400
Subject: [Koha-patches] [PATCH 1/4] fix test plan for SQLHelper.t
Message-ID: <1286376087-20304-1-git-send-email-gmcharlt@gmail.com>
Also removed incorrect comments about test case numbers - we should
just let Test::More number them.
Signed-off-by: Galen Charlton
---
t/db_dependent/SQLHelper.t | 24 +++---------------------
1 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/t/db_dependent/SQLHelper.t b/t/db_dependent/SQLHelper.t
index 80c4478..f783393 100755
--- a/t/db_dependent/SQLHelper.t
+++ b/t/db_dependent/SQLHelper.t
@@ -10,12 +10,10 @@ use YAML;
use C4::Debug;
use C4::SQLHelper qw(:all);
-use Test::More tests => 19;
+use Test::More tests => 20;
+
+use_ok('C4::SQLHelper');
-#1
-BEGIN {
- use_ok('C4::SQLHelper');
-}
use C4::Category;
use C4::Branch;
my @categories=C4::Category->all;
@@ -28,24 +26,17 @@ ok($borrid=InsertInTable("borrowers",{firstname=>"Jean",surname=>"Valjean",city=
$borrtmp=InsertInTable("borrowers",{firstname=>"Jean",surname=>"cocteau",city=>" ",zipcode=>" ",email=>"email",categorycode=>$categories[0]->{categorycode}, branchcode=>$branchcodes[0]});
ok(my $status=UpdateInTable("borrowers",{borrowernumber=>$borrid,firstname=>"Jean",surname=>"Valjean",city=>"Dampierre",zipcode=>" ",email=>"email", branchcode=>$branchcodes[1]}),"Update In Table");
my $borrowers=SearchInTable("borrowers");
-#4
ok(@$borrowers>0, "Search In Table All values");
$borrowers=SearchInTable("borrowers",{borrowernumber=>$borrid});
-#5
ok(@$borrowers==1, "Search In Table by primary key on table");
$borrowers=SearchInTable("borrowers",{firstname=>"Jean"});
-#6
ok(@$borrowers>0, "Search In Table hashref");
$borrowers=SearchInTable("borrowers",{firstname=>"Jean"},[{firstname=>1},{borrowernumber=>1}],undef, [qw(borrowernumber)]);
-#7
ok(($$borrowers[0]{borrowernumber} + 0) > ($$borrowers[1]{borrowernumber} + 0), "Search In Table Order");
$borrowers=SearchInTable("borrowers",{firstname=>"Jean"},[{surname=>0},{firstname=>1}], undef, [qw(firstname surname)]);
-#8
ok(uc($$borrowers[0]{surname}) lt uc($$borrowers[1]{surname}), "Search In Table Order");
$borrowers=SearchInTable("borrowers","Jean");
-#9
ok(@$borrowers>0, "Search In Table string");
-#10
#FIXME : When searching on All the fields of the table, seems to return Junk
eval{$borrowers=SearchInTable("borrowers","Jean Valjean",undef,undef,undef,[qw(firstname surname borrowernumber cardnumber)],"start_with")};
#eval{$borrowers=SearchInTable("borrowers","Jean Valjean",undef,undef,undef,undef,"start_with")};
@@ -54,31 +45,22 @@ eval{$borrowers=SearchInTable("borrowers","Jean Valjean",undef,undef,undef,[qw(f
$debug && warn Dump(@$borrowers);
ok(scalar(@$borrowers)==1 && !($@), "Search In Table does an implicit AND of all the words in strings");
$borrowers=SearchInTable("borrowers",["Valjean",{firstname=>"Jean"}]);
-#11
ok(@$borrowers>0, "Search In Table arrayref");
$borrowers=SearchInTable("borrowers",["Valjean",{firstname=>"Jean"}],undef,undef,[qw(borrowernumber)]);
-#12
ok(keys %{$$borrowers[0]} ==1, "Search In Table columns out limit");
$borrowers=SearchInTable("borrowers",["Valjean",{firstname=>"Jean"}],undef,undef,[qw(borrowernumber)],[qw(firstname surname title)]);
-#13
ok(@$borrowers>0, "Search In Table columns out limit to borrowernumber AND filter firstname surname title");
$borrowers=SearchInTable("borrowers",["Valjean",{firstname=>"Jean"}],undef,undef,[qw(borrowernumber)],[qw(firstname title)]);
-#14
ok(@$borrowers==0, "Search In Table columns filter firstname title limit Valjean not in other fields than surname ");
$borrowers=SearchInTable("borrowers",["Val",{firstname=>"Jean"}],undef,undef,[qw(borrowernumber)],[qw(surname)],"start_with");
-#15
ok(@$borrowers>0, "Search In Table columns filter surname Val on a wide search found ");
$borrowers=SearchInTable("borrowers",["Val",{firstname=>"Jean"}],undef,undef,[qw(borrowernumber)],[qw(surname)],"exact");
-#16
ok(@$borrowers==0, "Search In Table columns filter surname Val in exact search not found ");
$borrowers=eval{SearchInTable("borrowers",["Val",{member=>"Jean"}],undef,undef,[qw(borrowernumber)],[qw(firstname title)],"exact")};
-#17
ok(@$borrowers==0 && !($@), "Search In Table fails gracefully when no correct field passed in hash");
-#18
$borrowers=eval{SearchInTable("borrowers",["Jea"],undef,undef,undef,[qw(firstname surname borrowernumber)],"start_with")};
ok(@$borrowers>0 && !($@), "Search on simple value in firstname");
$status=DeleteInTable("borrowers",{borrowernumber=>$borrid});
-#19
ok($status>0 && !($@), "DeleteInTable OK");
$status=DeleteInTable("borrowers",{borrowernumber=>$borrtmp});
--
1.7.0
From gmcharlt at gmail.com Wed Oct 6 16:41:26 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Wed, 6 Oct 2010 10:41:26 -0400
Subject: [Koha-patches] [PATCH 3/4] removed AddToShelfFromBiblio from
C4::VirtualShelves
In-Reply-To: <1286376087-20304-2-git-send-email-gmcharlt@gmail.com>
References: <1286376087-20304-1-git-send-email-gmcharlt@gmail.com>
<1286376087-20304-2-git-send-email-gmcharlt@gmail.com>
Message-ID: <1286376087-20304-3-git-send-email-gmcharlt@gmail.com>
Back in the day, lists could contain item records instead or in addition
to bibs, but that hasn't been the case for a while. Therefore, removed
AddToShelfFromBiblio, which does exactly the same thing that AddToShelf does.
Signed-off-by: Galen Charlton
---
C4/VirtualShelves.pm | 50 +++++------------------------------
opac/opac-addbybiblionumber.pl | 2 +-
virtualshelves/addbybiblionumber.pl | 2 +-
3 files changed, 9 insertions(+), 45 deletions(-)
diff --git a/C4/VirtualShelves.pm b/C4/VirtualShelves.pm
index fa599bd..715cace 100644
--- a/C4/VirtualShelves.pm
+++ b/C4/VirtualShelves.pm
@@ -40,7 +40,7 @@ BEGIN {
@ISA = qw(Exporter);
@EXPORT = qw(
&GetShelves &GetShelfContents &GetShelf
- &AddToShelf &AddToShelfFromBiblio &AddShelf
+ &AddToShelf &AddShelf
&ModShelf
&ShelfPossibleAction
&DelFromShelf &DelShelf
@@ -67,7 +67,7 @@ C4::VirtualShelves - Functions for manipulating Koha virtual virtualshelves
This module provides functions for manipulating virtual virtualshelves,
including creating and deleting virtualshelves, and adding and removing
-items to and from virtualshelves.
+bibs to and from virtualshelves.
=head1 FUNCTIONS
@@ -237,7 +237,7 @@ sub GetShelf ($) {
=head2 GetShelfContents
- $itemlist = &GetShelfContents($shelfnumber);
+ $biblist = &GetShelfContents($shelfnumber);
Looks up information about the contents of virtual virtualshelves number
C<$shelfnumber>. Sorted by a field in the biblio table. copyrightdate
@@ -331,8 +331,8 @@ sub AddShelf {
&AddToShelf($biblionumber, $shelfnumber);
-Adds item number C<$biblionumber> to virtual virtualshelves number
-C<$shelfnumber>, unless that item is already on that shelf.
+Adds bib number C<$biblionumber> to virtual virtualshelves number
+C<$shelfnumber>, unless that bib is already on that shelf.
=cut
@@ -364,42 +364,6 @@ sub AddToShelf {
$sth->execute( $shelfnumber );
}
-=head2 AddToShelfFromBiblio
-
- &AddToShelfFromBiblio($biblionumber, $shelfnumber)
-
-this function allow to add a virtual into the shelf number $shelfnumber
-from biblionumber.
-
-=cut
-
-sub AddToShelfFromBiblio {
- my ( $biblionumber, $shelfnumber ) = @_;
- return unless $biblionumber;
- my $query = qq(
- SELECT *
- FROM virtualshelfcontents
- WHERE shelfnumber=? AND biblionumber=?
- );
- my $sth = $dbh->prepare($query);
- $sth->execute( $shelfnumber, $biblionumber );
- unless ( $sth->rows ) {
- my $query =qq(
- INSERT INTO virtualshelfcontents
- (shelfnumber, biblionumber, flags)
- VALUES
- (?, ?, 0)
- );
- $sth = $dbh->prepare($query);
- $sth->execute( $shelfnumber, $biblionumber );
- $query = qq(UPDATE virtualshelves
- SET lastmodified = CURRENT_TIMESTAMP
- WHERE shelfnumber = ?);
- $sth = $dbh->prepare($query);
- $sth->execute( $shelfnumber );
- }
-}
-
=head2 ModShelf
ModShelf($shelfnumber, $hashref)
@@ -486,8 +450,8 @@ sub ShelfPossibleAction {
&DelFromShelf( $biblionumber, $shelfnumber);
-Removes item number C<$biblionumber> from virtual virtualshelves number
-C<$shelfnumber>. If the item wasn't on that virtualshelves to begin with,
+Removes bib number C<$biblionumber> from virtual virtualshelves number
+C<$shelfnumber>. If the bib wasn't on that virtualshelves to begin with,
nothing happens.
=cut
diff --git a/opac/opac-addbybiblionumber.pl b/opac/opac-addbybiblionumber.pl
index b04e662..8cbd239 100755
--- a/opac/opac-addbybiblionumber.pl
+++ b/opac/opac-addbybiblionumber.pl
@@ -42,7 +42,7 @@ sub AddBibliosToShelf {
@biblionumber = (split /\//,$biblionumber[0]);
}
for my $bib (@biblionumber){
- AddToShelfFromBiblio($bib, $shelfnumber);
+ AddToShelf($bib, $shelfnumber);
}
}
diff --git a/virtualshelves/addbybiblionumber.pl b/virtualshelves/addbybiblionumber.pl
index 7af17c8..a0d9fdd 100755
--- a/virtualshelves/addbybiblionumber.pl
+++ b/virtualshelves/addbybiblionumber.pl
@@ -77,7 +77,7 @@ sub AddBibliosToShelf {
@biblionumber = (split /\//,$biblionumber[0]);
}
for my $bib (@biblionumber){
- AddToShelfFromBiblio($bib, $shelfnumber);
+ AddToShelf($bib, $shelfnumber);
}
}
--
1.7.0
From gmcharlt at gmail.com Wed Oct 6 16:42:45 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Wed, 6 Oct 2010 10:42:45 -0400
Subject: [Koha-patches] Bug 5128 [3.2] To define default 9xx fields for
Unimarc
In-Reply-To: <4CAC7EE7.4070704@biblibre.com>
References: <4ece90a0715addbb380df4817d6d3302@cilea.it>
<4CAC7AC6.101@cilea.it> <4CAC7EE7.4070704@biblibre.com>
Message-ID:
Hi,
On Wed, Oct 6, 2010 at 9:51 AM, LAURENT Henri-Damien
wrote:
> This would mean that all french unimarc users would have to
> a) edit zebra configuration
> b) change their frameworks
> c) use sync_items_in_marc_bib
> d) reindex
> All that would turn out to be quite heavy for big libraries
> (sync_items_in_marc_bib is quite slow).
> How many UNIMARC foreign users is there compared to french ?
And this is not a burden I care to impose on French UNIMARC users
without a *really* good reason.
Regards,
Galen
--
Galen Charlton
gmcharlt at gmail.com
From henridamien.laurent at biblibre.com Wed Oct 6 16:51:43 2010
From: henridamien.laurent at biblibre.com (LAURENT Henri-Damien)
Date: Wed, 06 Oct 2010 16:51:43 +0200
Subject: [Koha-patches] Bug 5128 [3.2] To define default 9xx fields for
Unimarc
In-Reply-To:
References: <4ece90a0715addbb380df4817d6d3302@cilea.it> <4CAC7AC6.101@cilea.it> <4CAC7EE7.4070704@biblibre.com>
Message-ID: <4CAC8CFF.8020900@biblibre.com>
Le 06/10/2010 16:42, Galen Charlton a ?crit :
> Hi,
>
> On Wed, Oct 6, 2010 at 9:51 AM, LAURENT Henri-Damien
> wrote:
>> This would mean that all french unimarc users would have to
>> a) edit zebra configuration
>> b) change their frameworks
>> c) use sync_items_in_marc_bib
>> d) reindex
>> All that would turn out to be quite heavy for big libraries
>> (sync_items_in_marc_bib is quite slow).
>> How many UNIMARC foreign users is there compared to french ?
>
> And this is not a burden I care to impose on French UNIMARC users
> without a *really* good reason.
>
> Regards,
>
> Galen
thanks.
--
Henri-Damien LAURENT
From gmcharlt at gmail.com Wed Oct 6 17:14:01 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Wed, 6 Oct 2010 11:14:01 -0400
Subject: [Koha-patches] [PATCH 1/2] fix typo/thinko in list test
Message-ID: <1286378042-21302-1-git-send-email-gmcharlt@gmail.com>
Signed-off-by: Galen Charlton
---
t/db_dependent/VirtualShelves.t | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/t/db_dependent/VirtualShelves.t b/t/db_dependent/VirtualShelves.t
index 041c3fc..a50f81e 100755
--- a/t/db_dependent/VirtualShelves.t
+++ b/t/db_dependent/VirtualShelves.t
@@ -91,7 +91,7 @@ for(my $i=0; $i<10;$i++){
my $shelfnumber = $shelves[int(rand(9))];
my $key = "$bib\t$shelfnumber";
- my $should_fail if exists $used{$key};
+ my $should_fail = exists($used{$key}) ? 1 : 0;
my ($biblistBefore,$countbefore) = GetShelfContents($shelfnumber);
my $status = AddToShelf($bib,$shelfnumber);
--
1.7.0
From gmcharlt at gmail.com Wed Oct 6 17:14:02 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Wed, 6 Oct 2010 11:14:02 -0400
Subject: [Koha-patches] [PATCH 2/2] cleanup of DB-dependent fund test cases
In-Reply-To: <1286378042-21302-1-git-send-email-gmcharlt@gmail.com>
References: <1286378042-21302-1-git-send-email-gmcharlt@gmail.com>
Message-ID: <1286378042-21302-2-git-send-email-gmcharlt@gmail.com>
* remove test that was adding a second active budget period,
which was throwing off later tests
* updated to reflect current API
Signed-off-by: Galen Charlton
---
t/db_dependent/Budgets.t | 23 +++--------------------
1 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/t/db_dependent/Budgets.t b/t/db_dependent/Budgets.t
index 7d5732f..6ec8b57 100755
--- a/t/db_dependent/Budgets.t
+++ b/t/db_dependent/Budgets.t
@@ -1,12 +1,11 @@
use strict;
use warnings;
-use Test::More tests=>18;
+use Test::More tests=>17;
BEGIN {use_ok('C4::Budgets') }
use C4::Budgets;
use C4::Dates;
-print "ok 1\n";
use YAML;
#
@@ -23,21 +22,6 @@ ok($bpid=AddBudgetPeriod(
, budget_description => "MAPERI"}),
"AddBudgetPeriod with iso dates OK");
-if (C4::Context->preference('dateformat') eq "metric"){
- ok($bpid=AddBudgetPeriod(
- { budget_period_startdate => '01-01-2008'
- , budget_period_enddate => '31-12-2008'
- , budget_description => "MAPERI"}),
- "AddBudgetPeriod returned $bpid");
-}
-elsif (C4::Context->preference('dateformat') eq "us"){
- ok($bpid=AddBudgetPeriod(
- { budget_period_startdate => '01-01-2008'
- , budget_period_enddate => '12-31-2008'
- , budget_description => "MAPERI"}),
- "AddBudgetPeriod returned $bpid");
-}
-
ok($budgetperiod=GetBudgetPeriod($bpid),
"GetBudgetPeriod($bpid) returned ".Dump($budgetperiod));
ok(!GetBudgetPeriod(0) ,"GetBudgetPeriod(0) returned undef : noactive BudgetPeriod");
@@ -95,7 +79,6 @@ ok($budget_id=AddBudget(
#| budget_encumb | decimal(28,6) | YES | | 0.000000 | |
#| budget_expend | decimal(28,6) | YES | | 0.000000 | |
#| budget_notes | mediumtext | YES | | NULL | |
-#| budget_description | mediumtext | YES | | NULL | |
#| timestamp | timestamp | NO | | CURRENT_TIMESTAMP | |
#| budget_period_id | int(11) | YES | MUL | NULL | |
#| sort1_authcat | varchar(80) | YES | | NULL | |
@@ -111,9 +94,9 @@ ok(GetBudgets()>0,
"GetBudgets OK");
ok(GetBudgets({budget_period_id=>$bpid})>0,
"GetBudgets With Filter OK");
-ok(GetBudgets({budget_period_id=>$bpid},{"budget_description"=>0})>0,
+ok(GetBudgets({budget_period_id=>$bpid},[{"budget_name"=>0}])>0,
"GetBudgets With Order OK");
-ok(GetBudgets({budget_period_id=>GetBudgetPeriod(0)->{budget_period_id}},{"budget_description"=>0})>0,
+ok(GetBudgets({budget_period_id=>GetBudgetPeriod($bpid)->{budget_period_id}},[{"budget_name"=>0}])>0,
"GetBudgets With Order
Getting Active budgetPeriod OK");
ok($del_status=DelBudget($budget_id),
--
1.7.0
From tajoli at cilea.it Wed Oct 6 17:57:33 2010
From: tajoli at cilea.it (Zeno Tajoli)
Date: Wed, 06 Oct 2010 17:57:33 +0200
Subject: [Koha-patches] Bug 5128 [3.2] To define default 9xx fields for
Unimarc
In-Reply-To:
References: <4ece90a0715addbb380df4817d6d3302@cilea.it>
Message-ID: <4CAC9C6D.7080108@cilea.it>
Hi to all,
I have insert here all text.
Attention that I read koha-patch list with digest
Il 06/10/2010 14:29, Galen Charlton ha scritto:
>>> I have a question about one of the changes to record.abs:
>>>
>>> -melm 995$h ccode,item ... +melm 995$8
>>> ccode,item
>>>
>>> Would this not break indexing of the ccode for existing UNIMARC
>>> users?
>>>
From Zeno Tajoli
>> I think no. Why?
>> 1) A 995 subfield for ccode (for Unimarc setup) is a new thing in
>> 3.2.
> A value for items.ccode is not present in file record.abs of 3.0.6
>> 2)In 3.2 the en SQL Unimarc definition for items.ccode is 995$8
>> file ../installer/data/mysql/en/marcflavour/unimarc/mandatory
>> /unimarc_framework_DEFAULT.sql line 182: ('995', '8', 'Koha
>> collection', 'Koha collection', 0, 0, 'items.ccode', 10, 'CCODE',
>> '', '', 0, 0, '', '', '', NULL),
>> 3)In 3.2 all fr SQL Unimarc defintions use 995$h for "code ?
>> barres, incr?mentation" All french SQL definitions don't setup a
>> subfield for items.ccode file
>> ..installer/data/mysql/fr-FR/marcflavour/unimarc_complet
>> /Obligatoire/framework_DEFAULT.sql line 2023: ('995', 'h', 'code ?
>> barres, incr?mentation', '', 0, 0,'', -1, '', '', '', NULL, 0, '',
>> NULL, NULL, ''),
>> 3b)In 3.2 all fr SQL Unimarc defintions don't use 995$8
>> 4)In my wiki proposal of 995 for 3.2 Unimarc
>
> I inserted 995$8 for items.ccode.
>> So I think we can use 995$8 for items.ccode and connect index.
From: LAURENT Henri-Damien
> This would mean that all french unimarc users would have to a) edit
> zebra configuration b) change their frameworks c) use
> sync_items_in_marc_bib d) reindex All that would turn out to be quite
> heavy for big libraries (sync_items_in_marc_bib is quite slow). How
> many UNIMARC foreign users is there compared to french ?
Henry Damien writes that the present setup of French 3.2 use
995$h for ccode index.
But this, for me, is very strange.
All French Unimarc setups don't use 995$h for ccode.
In fact ccode is not used in France Unimarc setups.
It is a new feature.
Attention that for me the Unimarc setup are the SQL files
installer/data/mysql/fr-FR/marcflavour/unimarc_complet/Obligatoire/framework_DEFAULT.sql
installer/data/mysql/fr-FR/marcflavour/unimarc_lecture_pub/Obligatoire/framework_DEFAULT.sql
In those two file the definiton for 995$h is:
('995', 'h', 'code ? barres, incr?mentation', '', 0, 0, '', -1, '', '',
'', 0, 0, '', '', '', NULL);
I seek the sting 'ccode'; it is not present.
I use the last version of "master" from
git://git.koha-community.org/koha.git
So, before to correct the patch, I need to know the correct version
of French Unimarc setups.
Probably the files
installer/data/mysql/fr-FR/marcflavour/unimarc_complet/Obligatoire/framework_DEFAULT.sql
and
installer/data/mysql/fr-FR/marcflavour/unimarc_lecture_pub/Obligatoire/framework_DEFAULT.sql
need an update for 3.2
Bye
--
Zeno Tajoli
CILEA - Segrate (MI)
tajoliAT_SPAM_no_prendiATcilea.it
(Indirizzo mascherato anti-spam; sostituisci qaunto tra AT con @)
From gmcharlt at gmail.com Wed Oct 6 17:57:12 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Wed, 6 Oct 2010 11:57:12 -0400
Subject: [Koha-patches] [PATCH] more test case fixes
Message-ID: <1286380632-21855-1-git-send-email-gmcharlt@gmail.com>
SQLHelper.t - clean up after itself better
Context.t - fix reporting of test plan
Signed-off-by: Galen Charlton
---
t/db_dependent/Context.t | 8 +++-----
t/db_dependent/SQLHelper.t | 5 ++++-
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/t/db_dependent/Context.t b/t/db_dependent/Context.t
index 31b0684..eac3265 100755
--- a/t/db_dependent/Context.t
+++ b/t/db_dependent/Context.t
@@ -4,7 +4,7 @@
use strict;
use warnings;
-use Test::More tests => 91;
+use Test::More;
use vars qw($debug $koha $dbh $config $ret);
BEGIN {
@@ -42,8 +42,6 @@ foreach (grep {defined $koha->{$_}} sort @keys) {
}
ok($config = $koha->{config}, 'Getting $koha->{config} ');
-# diag("Examining configuration.");
-diag("Note: The overall number of tests may vary by configuration. Disregard the projected number.");
-1;
-__END__
+done_testing();
+1;
diff --git a/t/db_dependent/SQLHelper.t b/t/db_dependent/SQLHelper.t
index f783393..6be0192 100755
--- a/t/db_dependent/SQLHelper.t
+++ b/t/db_dependent/SQLHelper.t
@@ -10,7 +10,7 @@ use YAML;
use C4::Debug;
use C4::SQLHelper qw(:all);
-use Test::More tests => 20;
+use Test::More tests => 22;
use_ok('C4::SQLHelper');
@@ -64,3 +64,6 @@ ok(@$borrowers>0 && !($@), "Search on simple value in firstname");
$status=DeleteInTable("borrowers",{borrowernumber=>$borrid});
ok($status>0 && !($@), "DeleteInTable OK");
$status=DeleteInTable("borrowers",{borrowernumber=>$borrtmp});
+ok($status>0 && !($@), "DeleteInTable OK");
+$status=DeleteInTable("branches", {branchcode => 'ZZZZ'});
+ok($status>0 && !($@), "DeleteInTable (branch) OK");
--
1.7.0
From ian.walls at bywatersolutions.com Wed Oct 6 18:46:26 2010
From: ian.walls at bywatersolutions.com (Ian Walls)
Date: Wed, 6 Oct 2010 12:46:26 -0400
Subject: [Koha-patches] [PATCH] Followup to Bug 4305: multiple ISBNS in
biblioitems.isbn breaks patron
Message-ID: <1286383586-11388-1-git-send-email-ian.walls@bywatersolutions.com>
This patch adds a scrub for ' | ' when the ISBN comes from the
biblioitems table, in the event that Koha has attempted to store
multiple ISBNs in the field. The ISBN presented to Business::ISBN will
now be something it can handle.
---
C4/Koha.pm | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/C4/Koha.pm b/C4/Koha.pm
index fb27ee2..cbcd048 100644
--- a/C4/Koha.pm
+++ b/C4/Koha.pm
@@ -1241,6 +1241,9 @@ sub GetNormalizedISBN {
my ($isbn,$record,$marcflavour) = @_;
my @fields;
if ($isbn) {
+ # Koha attempts to store multiple ISBNs in biblioitems.isbn, separated by " | "
+ # anything after " | " should be removed, along with the delimiter
+ $isbn =~ s/(.*)( \| )(.*)/$1/;
return _isbn_cleanup($isbn);
}
return undef unless $record;
--
1.5.6.5
From nengard at bywatersolutions.com Wed Oct 6 07:19:55 2010
From: nengard at bywatersolutions.com (Nicole Engard)
Date: Wed, 6 Oct 2010 01:19:55 -0400
Subject: [Koha-patches] [PATCH] [bug 4935] fix for allowing authorized
values to be "unset"
Message-ID: <1286342395-5048-1-git-send-email-nengard@bywatersolutions.com>
From: Liz Rea
---
tools/batchMod.pl | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/batchMod.pl b/tools/batchMod.pl
index f5138d1..e4e2ed0 100755
--- a/tools/batchMod.pl
+++ b/tools/batchMod.pl
@@ -500,7 +500,7 @@ sub UpdateMarcWith($$){
my @fields_to=$marcto->field($itemtag);
foreach my $subfield ($fieldfrom->subfields()){
foreach my $field_to_update (@fields_to){
- $field_to_update->update($$subfield[0]=>$$subfield[1]) if ($$subfield[1]);
+ $field_to_update->update($$subfield[0]=>$$subfield[1]) if ($$subfield[1] != '' or $$subfield[1] == '0');
}
}
#warn "TO edited:",$marcto->as_formatted;
--
1.5.6.5
From nengard at gmail.com Wed Oct 6 18:52:18 2010
From: nengard at gmail.com (Nicole Engard)
Date: Wed, 6 Oct 2010 12:52:18 -0400
Subject: [Koha-patches] [PATCH] [bug 4935] fixed ability to unset
statuses such as "lost" or "damaged"
In-Reply-To: <1285858141-11228-1-git-send-email-lrea@nekls.org>
References: <1285858141-11228-1-git-send-email-lrea@nekls.org>
Message-ID:
patch doesn't apply - new one being sent
On Thu, Sep 30, 2010 at 10:49 AM, Liz Rea wrote:
> ---
> ?tools/batchMod.pl | ? ?5 +++--
> ?1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/tools/batchMod.pl b/tools/batchMod.pl
> index e85f45a..b183487 100755
> --- a/tools/batchMod.pl
> +++ b/tools/batchMod.pl
> @@ -319,6 +319,7 @@ foreach my $tag (sort keys %{$tagslib}) {
> ? ? ? ? ? ? ? push @authorised_values, $value;
> ? ? ? ? ? ? ? $authorised_lib{$value} = $lib;
> ? ? ? ? ? }
> + ? ? ? ? ? ? ? $value = '';
> ? ? ? }
> ? ? ? $subfield_data{marc_value} =CGI::scrolling_list( ? ? ?# FIXME: factor out scrolling_list
> ? ? ? ? ? -name ? ? => "field_value",
> @@ -500,9 +501,9 @@ sub UpdateMarcWith($$){
> ? ? ? ?my @fields_to=$marcto->field($itemtag);
> ? ? foreach my $subfield ($fieldfrom->subfields()){
> ? ? ? ? ? ? ? ?foreach my $field_to_update (@fields_to){
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? if ($$subfield[0] or $$subfield[0]=0) {
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? if ($$subfield[0]!='' or $$subfield[0]=='0') {
> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?$field_to_update->update($$subfield[0]=>$$subfield[1]);
> - ? ? ? ? ? ? ? ? ? ? ? }
> + ? ? ? ? ? ? ? ? ? ? ? }
> ? ? ? ? ? ? ? ?}
> ? ? }
> ? #warn "TO edited:",$marcto->as_formatted;
> --
> 1.5.6.5
>
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
>
From nengard at bywatersolutions.com Wed Oct 6 07:21:26 2010
From: nengard at bywatersolutions.com (Nicole Engard)
Date: Wed, 6 Oct 2010 01:21:26 -0400
Subject: [Koha-patches] [PATCH] fix for allowing authorized values to be
"unset"
Message-ID: <1286342486-5101-1-git-send-email-nengard@bywatersolutions.com>
From: Liz Rea
Signed-off-by: Nicole Engard
---
tools/batchMod.pl | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/batchMod.pl b/tools/batchMod.pl
index 5271d81..80ac58d 100755
--- a/tools/batchMod.pl
+++ b/tools/batchMod.pl
@@ -499,7 +499,7 @@ sub UpdateMarcWith {
my @fields_to=$marcto->field($itemtag);
foreach my $subfield ($fieldfrom->subfields()){
foreach my $field_to_update (@fields_to){
- $field_to_update->update($$subfield[0]=>$$subfield[1]) if ($$subfield[1]);
+ $field_to_update->update($$subfield[0]=>$$subfield[1]) if ($$subfield[1] != '' or $$subfield[1] == '0');
}
}
#warn "TO edited:",$marcto->as_formatted;
--
1.5.6.5
From nengard at gmail.com Wed Oct 6 18:53:23 2010
From: nengard at gmail.com (Nicole Engard)
Date: Wed, 6 Oct 2010 12:53:23 -0400
Subject: [Koha-patches] [PATCH] [bug 4935] fix for allowing authorized
values to be "unset"
In-Reply-To: <1286342395-5048-1-git-send-email-nengard@bywatersolutions.com>
References: <1286342395-5048-1-git-send-email-nengard@bywatersolutions.com>
Message-ID:
sorry - did the sign off wrong - right one on the way
On Wed, Oct 6, 2010 at 1:19 AM, Nicole Engard
wrote:
> From: Liz Rea
>
> ---
> ?tools/batchMod.pl | ? ?2 +-
> ?1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/tools/batchMod.pl b/tools/batchMod.pl
> index f5138d1..e4e2ed0 100755
> --- a/tools/batchMod.pl
> +++ b/tools/batchMod.pl
> @@ -500,7 +500,7 @@ sub UpdateMarcWith($$){
> ? ? ? ?my @fields_to=$marcto->field($itemtag);
> ? ? foreach my $subfield ($fieldfrom->subfields()){
> ? ? ? ? ? ? ? ?foreach my $field_to_update (@fields_to){
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? $field_to_update->update($$subfield[0]=>$$subfield[1]) if ($$subfield[1]);
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? $field_to_update->update($$subfield[0]=>$$subfield[1]) if ($$subfield[1] != '' or $$subfield[1] == '0');
> ? ? ? ? ? ? ? ?}
> ? ? }
> ? #warn "TO edited:",$marcto->as_formatted;
> --
> 1.5.6.5
>
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
>
From gmcharlt at gmail.com Wed Oct 6 18:54:37 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Wed, 6 Oct 2010 12:54:37 -0400
Subject: [Koha-patches] [PATCH] fix invalid invocation of GetBranches in
test case
Message-ID: <1286384077-23033-1-git-send-email-gmcharlt@gmail.com>
Signed-off-by: Galen Charlton
---
t/db_dependent/SQLHelper.t | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/t/db_dependent/SQLHelper.t b/t/db_dependent/SQLHelper.t
index 6be0192..cb26ed1 100755
--- a/t/db_dependent/SQLHelper.t
+++ b/t/db_dependent/SQLHelper.t
@@ -19,7 +19,7 @@ use C4::Branch;
my @categories=C4::Category->all;
my $insert;
ok(($insert=InsertInTable("branches",{branchcode=>"ZZZZ",branchname=>"Brancheinconnue",city=>" ",zipcode=>" "},1))==0,"AddBranch (Insert In Table with primary key defined)");
-my $branches=C4::Branch->GetBranches;
+my $branches=C4::Branch::GetBranches;
my @branchcodes=keys %$branches;
my ($borrid, $borrtmp);
ok($borrid=InsertInTable("borrowers",{firstname=>"Jean",surname=>"Valjean",city=>" ",zipcode=>" ",email=>"email",categorycode=>$categories[0]->{categorycode}, branchcode=>$branchcodes[0]}),"Insert In Table");
--
1.7.0
From frederic at demians.fr Wed Oct 6 19:11:47 2010
From: frederic at demians.fr (Frederic Demians)
Date: Wed, 06 Oct 2010 19:11:47 +0200
Subject: [Koha-patches] [PATCH] Followup to Bug 4305: multiple ISBNS in
biblioitems.isbn breaks patron
In-Reply-To: <1286383586-11388-1-git-send-email-ian.walls@bywatersolutions.com>
References: <1286383586-11388-1-git-send-email-ian.walls@bywatersolutions.com>
Message-ID: <4CACADD3.6040301@demians.fr>
> This patch adds a scrub for ' | ' when the ISBN comes from the
> biblioitems table, in the event that Koha has attempted to store
> multiple ISBNs in the field. The ISBN presented to Business::ISBN will
> now be something it can handle.
Couldn't you do it in _isbn_cleanup function and rather than taking the
first isbn you could try each one by one and retain the first which is
correct for Business::ISBN.
--
Fr?d?ric DEMIANS
From frederic at tamil.fr Wed Oct 6 19:14:11 2010
From: frederic at tamil.fr (Frederic Demians)
Date: Wed, 06 Oct 2010 19:14:11 +0200
Subject: [Koha-patches] [PATCH] Bug 4472 Fix how
are injected into XSL files
In-Reply-To: <1278863601-25667-1-git-send-email-f.demians@tamil.fr>
References: <1278863601-25667-1-git-send-email-f.demians@tamil.fr>
Message-ID: <4CACAE63.2010007@tamil.fr>
> tmpl_process is patched to handle properly specific XML directives.
> UNIMARC XSL files are modified to gain knowledge of HTML entity
> which isn't the case by default. It may be necessary to do the same
> thing for MARC21 XSL.
This patch still apply on HEAD. Without it, fr-FR XSL files are broken
after translation process.
From ian.walls at bywatersolutions.com Wed Oct 6 19:35:14 2010
From: ian.walls at bywatersolutions.com (Ian Walls)
Date: Wed, 6 Oct 2010 13:35:14 -0400
Subject: [Koha-patches] [PATCH] Followup to Bug 4305: multiple ISBNS in
biblioitems.isbn breaks patron
In-Reply-To: <4CACADD3.6040301@demians.fr>
References: <1286383586-11388-1-git-send-email-ian.walls@bywatersolutions.com>
<4CACADD3.6040301@demians.fr>
Message-ID:
The second ISBN is often cut off because of the character limit of the
biblioitems.isbn field. If both ISBNs in the MARC record were straight
ISBNs with no dashes or additional junk at the end (like "(pbk.)", it may be
possible to fit two in the field (limit 30 characters), but I have my doubts
that this will happen often enough to justify processing multiple ISBNs per
call. That's why I went with the simple scrub, until a more robust solution
can be developed to prevent (and cleanup) multiple ISBNs crammed into
biblioitems.isbn.
-Ian
On Wed, Oct 6, 2010 at 1:11 PM, Frederic Demians wrote:
>
> This patch adds a scrub for ' | ' when the ISBN comes from the
>> biblioitems table, in the event that Koha has attempted to store
>> multiple ISBNs in the field. The ISBN presented to Business::ISBN will
>> now be something it can handle.
>>
>
> Couldn't you do it in _isbn_cleanup function and rather than taking the
> first isbn you could try each one by one and retain the first which is
> correct for Business::ISBN.
>
> --
> Fr?d?ric DEMIANS
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
>
--
Ian Walls
Lead Development Specialist
ByWater Solutions
Phone # (888) 900-8944
http://bywatersolutions.com
ian.walls at bywatersolutions.com
Twitter: @sekjal
-------------- next part --------------
An HTML attachment was scrubbed...
URL:
From f.demians at tamil.fr Wed Oct 6 19:35:22 2010
From: f.demians at tamil.fr (=?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=)
Date: Wed, 6 Oct 2010 19:35:22 +0200
Subject: [Koha-patches] [PATCH] Bug 4305 Follow up Ian patch
Message-ID: <1286386522-18233-1-git-send-email-f.demians@tamil.fr>
Retain the first valid ISBN--if multiple ISBN are stored in
biblioitems.isbn--from Business::ISBN perspective.
---
C4/Koha.pm | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/C4/Koha.pm b/C4/Koha.pm
index ab9131a..6baf97b 100644
--- a/C4/Koha.pm
+++ b/C4/Koha.pm
@@ -1242,9 +1242,6 @@ sub GetNormalizedISBN {
my ($isbn,$record,$marcflavour) = @_;
my @fields;
if ($isbn) {
- # Koha attempts to store multiple ISBNs in biblioitems.isbn, separated by " | "
- # anything after " | " should be removed, along with the delimiter
- $isbn =~ s/(.*)( \| )(.*)/$1/;
return _isbn_cleanup($isbn);
}
return undef unless $record;
@@ -1327,12 +1324,20 @@ sub _normalize_match_point {
}
sub _isbn_cleanup ($) {
- my $isbn = Business::ISBN->new( shift );
- return undef unless $isbn;
- $isbn = $isbn->as_isbn10 if $isbn->type eq 'ISBN13';
- $isbn = $isbn->as_string;
- $isbn =~ s/-//g;
- return $isbn;
+ my $isbns = shift;
+ return undef unless $isbns;
+
+ # Koha attempts to store multiple ISBNs in biblioitems.isbn, separated by
+ # |. We retain the first valid ISBN
+ for my $isbn ( split /\|/, $isbns ) {
+ $isbn = Business::ISBN->new( $isbn );
+ next unless $isbn;
+ $isbn = $isbn->as_isbn10 if $isbn->type eq 'ISBN13';
+ $isbn = $isbn->as_string;
+ $isbn =~ s/-//g;
+ return $isbn;
+ }
+ return undef;
}
1;
--
1.7.1
From gmcharlt at gmail.com Wed Oct 6 23:44:56 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Wed, 6 Oct 2010 17:44:56 -0400
Subject: [Koha-patches] [PATCH] fix invalid invocation of GetBranches in
test case
Message-ID: <1286401496-27278-1-git-send-email-gmcharlt@gmail.com>
Signed-off-by: Galen Charlton
---
t/db_dependent/SQLHelper.t | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/t/db_dependent/SQLHelper.t b/t/db_dependent/SQLHelper.t
index 6be0192..cb26ed1 100755
--- a/t/db_dependent/SQLHelper.t
+++ b/t/db_dependent/SQLHelper.t
@@ -19,7 +19,7 @@ use C4::Branch;
my @categories=C4::Category->all;
my $insert;
ok(($insert=InsertInTable("branches",{branchcode=>"ZZZZ",branchname=>"Brancheinconnue",city=>" ",zipcode=>" "},1))==0,"AddBranch (Insert In Table with primary key defined)");
-my $branches=C4::Branch->GetBranches;
+my $branches=C4::Branch::GetBranches;
my @branchcodes=keys %$branches;
my ($borrid, $borrtmp);
ok($borrid=InsertInTable("borrowers",{firstname=>"Jean",surname=>"Valjean",city=>" ",zipcode=>" ",email=>"email",categorycode=>$categories[0]->{categorycode}, branchcode=>$branchcodes[0]}),"Insert In Table");
--
1.7.0
From gmcharlt at gmail.com Thu Oct 7 03:01:57 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Wed, 6 Oct 2010 21:01:57 -0400
Subject: [Koha-patches] [PATCH] translator hack to avoid failure on
opac-opensearch.tmpl
Message-ID: <1286413317-31521-1-git-send-email-gmcharlt@gmail.com>
Signed-off-by: Galen Charlton
---
misc/translator/TmplTokenizer.pm | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/misc/translator/TmplTokenizer.pm b/misc/translator/TmplTokenizer.pm
index 1413f77..12076e6 100644
--- a/misc/translator/TmplTokenizer.pm
+++ b/misc/translator/TmplTokenizer.pm
@@ -527,7 +527,10 @@ sub _next_token_intermediate {
if (!$this->cdata_mode_p) {
$it = $this->_next_token_internal($h);
if (defined $it && $it->type == TmplTokenType::TAG) {
- if ($it->string =~ /^<(script|style|textarea)\b/is) {
+ if ($it->string =~ /^<(script|style|textarea)\b/is ||
+ ($this->filename =~ /opensearch/ && $it->string =~ /^<(description)\b/) # FIXME special case to handle
+ # a CDATA in opac-opensearch.tmpl
+ ) {
$this->_set_cdata_mode( 1 );
$this->_set_cdata_close( "$1\\s*>" );
$this->_set_pcdata_mode( 0 );
--
1.7.0
From gmcharlt at gmail.com Thu Oct 7 03:13:20 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Wed, 6 Oct 2010 21:13:20 -0400
Subject: [Koha-patches] [PATCH 2/2] defer rotating collections
Message-ID: <1286414000-31756-1-git-send-email-gmcharlt@gmail.com>
Disabling rotating collections for 3.2.0 release; after more testing,
candidate for 3.4 as well as backport into 3.2.1.
Signed-off-by: Galen Charlton
---
circ/returns.pl | 24 +++++++++++--------
.../intranet-tmpl/prog/en/includes/tools-menu.inc | 2 +
.../prog/en/modules/tools/tools-home.tmpl | 2 +
3 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/circ/returns.pl b/circ/returns.pl
index 2611099..51ac9de 100755
--- a/circ/returns.pl
+++ b/circ/returns.pl
@@ -554,16 +554,20 @@ $template->param(
soundon => C4::Context->preference("SoundOn"),
);
-my $itemnumber = GetItemnumberFromBarcode( $query->param('barcode') );
-if ( $itemnumber ) {
- my ( $holdingBranch, $collectionBranch ) = GetCollectionItemBranches( $itemnumber );
- if ( ! ( $holdingBranch eq $collectionBranch ) ) {
- $template->param(
- collectionItemNeedsTransferred => 1,
- collectionBranch => GetBranchName($collectionBranch),
- );
- }
-}
+### Comment out rotating collections for now to allow it a little more time to bake
+### for 3.4; in particular, must ensure that it doesn't fight with transfers required
+### to fill hold requests
+### -- Galen Charlton 2010-10-06
+#my $itemnumber = GetItemnumberFromBarcode( $query->param('barcode') );
+#if ( $itemnumber ) {
+# my ( $holdingBranch, $collectionBranch ) = GetCollectionItemBranches( $itemnumber );
+# if ( ! ( $holdingBranch eq $collectionBranch ) ) {
+# $template->param(
+# collectionItemNeedsTransferred => 1,
+# collectionBranch => GetBranchName($collectionBranch),
+# );
+# }
+#}
# actually print the page!
output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
index e926358..bc7c7e7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
@@ -59,9 +59,11 @@
--
1.7.0
From cnighswonger at foundations.edu Thu Oct 7 05:31:57 2010
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Wed, 6 Oct 2010 23:31:57 -0400
Subject: [Koha-patches] [PATCH] Adding a temporary workaround to keep
template tests from borking on very large templates
Message-ID: <1286422317-29539-1-git-send-email-cnighswonger@foundations.edu>
NOTE: This should be properly fixed at some point in 3.4
This may help:
http://www.perlmonks.org/?node_id=150748
---
xt/author/valid-templates.t | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/xt/author/valid-templates.t b/xt/author/valid-templates.t
index 95825a6..df7c515 100644
--- a/xt/author/valid-templates.t
+++ b/xt/author/valid-templates.t
@@ -69,11 +69,14 @@ sub gen_template_test {
my $pid = open3(\*CHILD_IN, \*CHILD_OUT, \*CHILD_ERR,
"$FindBin::Bin/test_template.pl", $File::Find::name, $include_dir);
my @errors = ();
+ while () {
+ #FIXME: This is here just to ensure that STDOUT is read which avoids a deadlock in some instances, but probably not all
+ #FIXME: The real solution probably lies within the information found here: http://www.perlmonks.org/?node_id=150748
+ }
while () {
push @errors, $_;
}
waitpid($pid, 0);
-
@errors = grep { ! /^EXPR:.*non-initialized variable/ } @errors; # ignoring EXPR errors for now
my $rel_filename = File::Spec->abs2rel($File::Find::name);
ok(@errors == 0, "no errors in $rel_filename") or diag(join("", @errors) );
--
1.7.0.4
From glawson at rhcl.org Wed Oct 6 18:20:02 2010
From: glawson at rhcl.org (Greg Lawson)
Date: Wed, 6 Oct 2010 11:20:02 -0500
Subject: [Koha-patches] [PATCH] adding receipt printers to the docs
Message-ID: <1286382002-14548-1-git-send-email-glawson@rhcl.org>
---
en/koha3-2manual.xml | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/en/koha3-2manual.xml b/en/koha3-2manual.xml
index ed5b69c..7b394e5 100644
--- a/en/koha3-2manual.xml
+++ b/en/koha3-2manual.xml
@@ -25341,6 +25341,48 @@ print theme('pages_catalog');
+
+
+ RHCL
+ 2010
+
+ For Star SP542 Printers
+
+
+
+
+ Installing the Printer
+
+ While the following comments are based on the Star SP542 receipt printer,
+ they probably apply to all printers in the SP5xx series.
+
+
+ The Star SP542 receipt printer works well with Koha and Firefox on
+ Windows XP SP3. This printer, with either the parallel or USB interface,
+ is fairly easy to install and configure. You will need the following
+ executable file which is available from numerous places on the Internet:
+
+ linemode_2k-xp_20030205.exe
+
+ This executable actually does all of the installation;
+ you will not need to use the Microsoft Windows "Add Printer" program.
+ We recommend that when installing, the option for the software monitor
+ not be selected; we have experienced significant pauses and delays
+ in printing with it. Instead, simply choose to install the receipt printer
+ without the monitor.
+
+ Additionally, the install program may not put the printer on the correct port,
+ especially if using the USB interface. This is easily corrected by going to
+ "Start -> Printers and Faxes -> Properties for the SP542 printer -> Ports",
+ then check the appropriate port./para>
+
+ A reboot may be required, even if not indicated by the installation software
+ or the operating system.
+
+
+
+
+
@@ -26569,11 +26611,15 @@ $ zebraidx -c /etc/koha/zebradb/zebra-biblios.cfg -g iso2709 -d biblios init
- Click 'MarcEditor'
+ Click 'MarcEditor'
+
+
- Go to Tools > Edit Subfield Data
+ Go to Tools > Edit Subfield Data
+
+Edt subfield data
--
1.5.6
From M.de.Rooy at rijksmuseum.nl Thu Oct 7 11:50:52 2010
From: M.de.Rooy at rijksmuseum.nl (Marcel de Rooy)
Date: Thu, 7 Oct 2010 09:50:52 +0000
Subject: [Koha-patches] [PATCH] Enhancement 5074 (Adding possibility to
cleanup_database.pl to purge only older sessions) [UPDATED for master]
Message-ID: <809BE39CD64BFD4EB9036172EBCCFA31040D44@S-MAIL-1B.rijksmuseum.intra>
Currently, the misc/cronjobs script cleanup_database truncates the session table (deleting all records, including active sessions).
With an additional parameter sessdays, this behavior could be changed or (perhaps better) extended. If the parameter sessdays is passed along with a number of days, the script only deletes older session records. This is accomplished by examining the values of lasttime, atime or ctime in the record.
So, calling the script like:
./cleanup_database.pl -v -sessions -sessdays 7
will only delete sessions records older than 7 days. The "old style" call
./cleanup_database.pl -v -sessions
still works too and truncates the table as before.
---
misc/cronjobs/cleanup_database.pl | 45 ++++++++++++++++++++++++++++++++++--
1 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/misc/cronjobs/cleanup_database.pl b/misc/cronjobs/cleanup_database.pl
index f811b24..7d5bcd1 100755
--- a/misc/cronjobs/cleanup_database.pl
+++ b/misc/cronjobs/cleanup_database.pl
@@ -37,12 +37,13 @@ use Getopt::Long;
sub usage {
print STDERR < \$help,
'sessions' => \$sessions,
+ 'sessdays:i' => \$sess_days,
'v|verbose' => \$verbose,
'm|mail' => \$mail,
'zebraqueue:i' => \$zebraqueue_days,
@@ -77,7 +79,7 @@ my $sth;
my $sth2;
my $count;
-if ($sessions) {
+if ($sessions && !$sess_days) { #old behavior
if ($verbose){
print "Session purge triggered.\n";
$sth = $dbh->prepare("SELECT COUNT(*) FROM sessions");
@@ -91,6 +93,15 @@ if ($sessions) {
print "Done with session purge.\n";
}
}
+elsif($sessions && $sess_days>0) { #new behavior with number of days old
+ if ($verbose){
+ print "Session purge triggered with days>$sess_days.\n";
+ }
+ RemoveOldSessions();
+ if ($verbose){
+ print "Done with session purge with days>$sess_days.\n";
+ }
+}
if ($zebraqueue_days){
$count = 0;
@@ -122,3 +133,31 @@ if ($mail) {
print "Done with purging the mail queue.\n" if ($verbose);
}
exit(0);
+
+sub RemoveOldSessions {
+ my ($id, $a_session, $limit, $lasttime);
+ $limit= time() - 24*3600*$sess_days;
+
+ $sth= $dbh->prepare("SELECT id, a_session FROM sessions");
+ $sth->execute or die $dbh->errstr;
+ $sth->bind_columns(\$id, \$a_session);
+ $sth2 = $dbh->prepare("DELETE FROM sessions WHERE id=?");
+ $count=0;
+
+ while ($sth->fetch) {
+ $lasttime=0;
+ if($a_session =~ /lasttime:\s+(\d+)/) {
+ $lasttime= $1;
+ }
+ elsif($a_session =~ /(ATIME|CTIME):\s+(\d+)/ ) {
+ $lasttime= $2;
+ }
+ if($lasttime && $lasttime < $limit) {
+ $sth2->execute($id) or die $dbh->errstr;
+ $count++;
+ }
+ }
+ if ($verbose){
+ print "$count sessions were deleted.\n";
+ }
+}
--
1.6.0.6
From oleonard at myacpl.org Thu Oct 7 18:13:23 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu, 7 Oct 2010 12:13:23 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 5254 - no need to scroll left to
right on acq z search
Message-ID: <1286468003-8558-1-git-send-email-oleonard@myacpl.org>
- Adding inline preview/import menu to match cataloging z39.50 search
- Improving behavior of inline menu on both pages
- Adding white space to ISBN/ISSN output on both pages to allow
line breaks, improving table width and horizontal scrolling.
---
acqui/z3950_search.pl | 9 ++++-
cataloguing/z3950_search.pl | 11 ++++-
.../prog/en/modules/acqui/z3950_search.tmpl | 42 ++++++++++++++++----
.../prog/en/modules/cataloguing/z3950_search.tmpl | 17 ++++----
4 files changed, 60 insertions(+), 19 deletions(-)
diff --git a/acqui/z3950_search.pl b/acqui/z3950_search.pl
index 0215873..182e121 100755
--- a/acqui/z3950_search.pl
+++ b/acqui/z3950_search.pl
@@ -254,7 +254,14 @@ sub displayresults {
##Add necessary encoding changes to here -TG
my $oldbiblio = TransformMarcToKoha( $dbh, $marcrecord, "" );
$oldbiblio->{isbn} =~ s/ |-|\.//g if $oldbiblio->{isbn};
- $oldbiblio->{issn} =~ s/ |-|\.//g if $oldbiblio->{issn};
+ # pad | and ( with spaces to allow line breaks in the HTML
+ $oldbiblio->{isbn} =~ s/\|/ \| /g if $oldbiblio->{isbn};
+ $oldbiblio->{isbn} =~ s/\(/ \(/g if $oldbiblio->{isbn};
+
+ $oldbiblio->{issn} =~ s/ |-|\.//g if $oldbiblio->{issn};
+ # pad | and ( with spaces to allow line breaks in the HTML
+ $oldbiblio->{issn} =~ s/\|/ \| /g if $oldbiblio->{issn};
+ $oldbiblio->{issn} =~ s/\(/ \(/g if $oldbiblio->{issn};
my (
$notmarcrecord, $alreadyindb, $alreadyinfarm,
$imported, $breedingid
diff --git a/cataloguing/z3950_search.pl b/cataloguing/z3950_search.pl
index 9b6c8f1..6311c0b 100755
--- a/cataloguing/z3950_search.pl
+++ b/cataloguing/z3950_search.pl
@@ -237,8 +237,15 @@ warn "query ".$query if $DEBUG;
# In rel2_2 i am not sure what encoding is so no character conversion is done here
##Add necessary encoding changes to here -TG
my $oldbiblio = TransformMarcToKoha( $dbh, $marcrecord, "" );
- $oldbiblio->{isbn} =~ s/ |-|\.//g,
- $oldbiblio->{issn} =~ s/ |-|\.//g,
+ $oldbiblio->{isbn} =~ s/ |-|\.//g if $oldbiblio->{isbn};
+ # pad | and ( with spaces to allow line breaks in the HTML
+ $oldbiblio->{isbn} =~ s/\|/ \| /g if $oldbiblio->{isbn};
+ $oldbiblio->{isbn} =~ s/\(/ \(/g if $oldbiblio->{isbn};
+
+ $oldbiblio->{issn} =~ s/ |-|\.//g if $oldbiblio->{issn};
+ # pad | and ( with spaces to allow line breaks in the HTML
+ $oldbiblio->{issn} =~ s/\|/ \| /g if $oldbiblio->{issn};
+ $oldbiblio->{issn} =~ s/\(/ \(/g if $oldbiblio->{issn};
my (
$notmarcrecord, $alreadyindb, $alreadyinfarm,
$imported, $breedingid
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tmpl
index f9f96ae..2219dfa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tmpl
@@ -14,6 +14,7 @@ $.tablesorter.addParser({
});
$(document).ready(function(){
+ $.tablesorter.defaults.widgets = ['zebra'];
$("#CheckAll").click(function(){
$(".checkboxed").checkCheckboxes();
return false;
@@ -22,23 +23,48 @@ $.tablesorter.addParser({
$(".checkboxed").unCheckCheckboxes();
return false;
});
+
+ $("#closemenu").click(function(e){
+ $(".linktools").hide();
+ $("tr").removeClass("selected");
+ });
+
$("#resultst").tablesorter({
sortList: [[1,0]],
- headers: { 0: {sorter:false}, 1: { sorter: 'articles' },5: { sorter: false },6: { sorter: false }}
+ headers: { 1: { sorter: 'articles' },5: { sorter: false },6: { sorter: false }}
});
+ /* Inline edit/delete links */
+ $("td").click(function(event){
+ var $tgt = $(event.target);
+ $(".linktools").hide();
+ $("tr").removeClass("selected");
+ if($tgt.is("a")||$tgt.is(":nth-child(5)")||$tgt.is(":nth-child(6)")||$tgt.is(":nth-child(7)")||$tgt.is(":nth-child(8)")){
+ return true;
+ } else {
+ var position = $(this).offset();
+ var top = position.top+5;
+ var left = position.left+5;
+ $(".linktools",row).show().css("position","absolute").css("top",top).css("left",left);
+ }
+ var row = $(this).parent();
+ row.addClass("selected");
+ });
});
//]]>
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl
index 55859c7..f0b11f8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl
@@ -38,18 +38,19 @@ $(document).ready(function(){
});
/* Inline edit/delete links */
$("td").click(function(event){
+ var $tgt = $(event.target);
$(".linktools").hide();
$("tr").removeClass("selected");
+ if($tgt.is("a")||$tgt.is(":nth-child(7)")||$tgt.is(":nth-child(8)")||$tgt.is(":nth-child(9)")||$tgt.is(":nth-child(10)")){
+ return true;
+ } else {
+ var position = $(this).offset();
+ var top = position.top+5;
+ var left = position.left+5;
+ $(".linktools",row).show().css("position","absolute").css("top",top).css("left",left);
+ }
var row = $(this).parent();
row.addClass("selected");
-
- var $tgt = $(event.target);
- if($tgt.is("a")||$tgt.is(":nth-child(7)")||$tgt.is(":nth-child(8)")||$tgt.is(":nth-child(9)")||$tgt.is(":nth-child(10)")){ return true; } else {
- var position = $(this).offset();
- var top = position.top+5;
- var left = position.left+5;
- $(".linktools",row).show().css("position","absolute").css("top",top).css("left",left);
- }
});
});
--
1.7.0.4
From nengard at bywatersolutions.com Wed Oct 6 18:12:26 2010
From: nengard at bywatersolutions.com (Nicole Engard)
Date: Wed, 6 Oct 2010 12:12:26 -0400
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 5254 - no need to
scroll left to right on acq z search
Message-ID: <1286381546-7017-1-git-send-email-nengard@bywatersolutions.com>
From: Owen Leonard
- Adding inline preview/import menu to match cataloging z39.50 search
- Improving behavior of inline menu on both pages
- Adding white space to ISBN/ISSN output on both pages to allow
line breaks, improving table width and horizontal scrolling.
---
acqui/z3950_search.pl | 9 ++++-
cataloguing/z3950_search.pl | 11 ++++-
.../prog/en/modules/acqui/z3950_search.tmpl | 42 ++++++++++++++++----
.../prog/en/modules/cataloguing/z3950_search.tmpl | 17 ++++----
4 files changed, 60 insertions(+), 19 deletions(-)
diff --git a/acqui/z3950_search.pl b/acqui/z3950_search.pl
index 0215873..182e121 100755
--- a/acqui/z3950_search.pl
+++ b/acqui/z3950_search.pl
@@ -254,7 +254,14 @@ sub displayresults {
##Add necessary encoding changes to here -TG
my $oldbiblio = TransformMarcToKoha( $dbh, $marcrecord, "" );
$oldbiblio->{isbn} =~ s/ |-|\.//g if $oldbiblio->{isbn};
- $oldbiblio->{issn} =~ s/ |-|\.//g if $oldbiblio->{issn};
+ # pad | and ( with spaces to allow line breaks in the HTML
+ $oldbiblio->{isbn} =~ s/\|/ \| /g if $oldbiblio->{isbn};
+ $oldbiblio->{isbn} =~ s/\(/ \(/g if $oldbiblio->{isbn};
+
+ $oldbiblio->{issn} =~ s/ |-|\.//g if $oldbiblio->{issn};
+ # pad | and ( with spaces to allow line breaks in the HTML
+ $oldbiblio->{issn} =~ s/\|/ \| /g if $oldbiblio->{issn};
+ $oldbiblio->{issn} =~ s/\(/ \(/g if $oldbiblio->{issn};
my (
$notmarcrecord, $alreadyindb, $alreadyinfarm,
$imported, $breedingid
diff --git a/cataloguing/z3950_search.pl b/cataloguing/z3950_search.pl
index 9b6c8f1..6311c0b 100755
--- a/cataloguing/z3950_search.pl
+++ b/cataloguing/z3950_search.pl
@@ -237,8 +237,15 @@ warn "query ".$query if $DEBUG;
# In rel2_2 i am not sure what encoding is so no character conversion is done here
##Add necessary encoding changes to here -TG
my $oldbiblio = TransformMarcToKoha( $dbh, $marcrecord, "" );
- $oldbiblio->{isbn} =~ s/ |-|\.//g,
- $oldbiblio->{issn} =~ s/ |-|\.//g,
+ $oldbiblio->{isbn} =~ s/ |-|\.//g if $oldbiblio->{isbn};
+ # pad | and ( with spaces to allow line breaks in the HTML
+ $oldbiblio->{isbn} =~ s/\|/ \| /g if $oldbiblio->{isbn};
+ $oldbiblio->{isbn} =~ s/\(/ \(/g if $oldbiblio->{isbn};
+
+ $oldbiblio->{issn} =~ s/ |-|\.//g if $oldbiblio->{issn};
+ # pad | and ( with spaces to allow line breaks in the HTML
+ $oldbiblio->{issn} =~ s/\|/ \| /g if $oldbiblio->{issn};
+ $oldbiblio->{issn} =~ s/\(/ \(/g if $oldbiblio->{issn};
my (
$notmarcrecord, $alreadyindb, $alreadyinfarm,
$imported, $breedingid
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tmpl
index f9f96ae..2219dfa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tmpl
@@ -14,6 +14,7 @@ $.tablesorter.addParser({
});
$(document).ready(function(){
+ $.tablesorter.defaults.widgets = ['zebra'];
$("#CheckAll").click(function(){
$(".checkboxed").checkCheckboxes();
return false;
@@ -22,23 +23,48 @@ $.tablesorter.addParser({
$(".checkboxed").unCheckCheckboxes();
return false;
});
+
+ $("#closemenu").click(function(e){
+ $(".linktools").hide();
+ $("tr").removeClass("selected");
+ });
+
$("#resultst").tablesorter({
sortList: [[1,0]],
- headers: { 0: {sorter:false}, 1: { sorter: 'articles' },5: { sorter: false },6: { sorter: false }}
+ headers: { 1: { sorter: 'articles' },5: { sorter: false },6: { sorter: false }}
});
+ /* Inline edit/delete links */
+ $("td").click(function(event){
+ var $tgt = $(event.target);
+ $(".linktools").hide();
+ $("tr").removeClass("selected");
+ if($tgt.is("a")||$tgt.is(":nth-child(5)")||$tgt.is(":nth-child(6)")||$tgt.is(":nth-child(7)")||$tgt.is(":nth-child(8)")){
+ return true;
+ } else {
+ var position = $(this).offset();
+ var top = position.top+5;
+ var left = position.left+5;
+ $(".linktools",row).show().css("position","absolute").css("top",top).css("left",left);
+ }
+ var row = $(this).parent();
+ row.addClass("selected");
+ });
});
//]]>
-
+
> ? ? ? ?
> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl
> index 55859c7..f0b11f8 100644
> --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl
> +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl
> @@ -38,18 +38,19 @@ $(document).ready(function(){
> ? ? });
> ? ? ? ? /* Inline edit/delete links */
> ? ? ? ? $("td").click(function(event){
> + ? ? ? ? ? ?var $tgt = $(event.target);
> ? ? ? ? ? ? $(".linktools").hide();
> ? ? ? ? ? ? $("tr").removeClass("selected");
> + ? ? ? ? ? ?if($tgt.is("a")||$tgt.is(":nth-child(7)")||$tgt.is(":nth-child(8)")||$tgt.is(":nth-child(9)")||$tgt.is(":nth-child(10)")){
> + ? ? ? ? ? ? ? ?return true;
> + ? ? ? ? ? ?} else {
> + ? ? ? ? ? ? ? ?var position = $(this).offset();
> + ? ? ? ? ? ? ? ?var top = position.top+5;
> + ? ? ? ? ? ? ? ?var left = position.left+5;
> + ? ? ? ? ? ? ? ?$(".linktools",row).show().css("position","absolute").css("top",top).css("left",left);
> + ? ? ? ? ? ?}
> ? ? ? ? ? ? var row = $(this).parent();
> ? ? ? ? ? ? row.addClass("selected");
> -
> - ? ? ? ? ? ?var $tgt = $(event.target);
> - ? ? ? ? ? ?if($tgt.is("a")||$tgt.is(":nth-child(7)")||$tgt.is(":nth-child(8)")||$tgt.is(":nth-child(9)")||$tgt.is(":nth-child(10)")){ return true; } else {
> - ? ? ? ? ? ?var position = $(this).offset();
> - ? ? ? ? ? ?var top = position.top+5;
> - ? ? ? ? ? ?var left = position.left+5;
> - ? ? ? ? ? ?$(".linktools",row).show().css("position","absolute").css("top",top).css("left",left);
> - ? ? ? ? ? ?}
> ? ? ? ? });
> ?});
>
> --
> 1.5.6.5
>
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
>
From lrea at nekls.org Thu Oct 7 21:53:28 2010
From: lrea at nekls.org (Liz Rea)
Date: Thu, 7 Oct 2010 14:53:28 -0500
Subject: [Koha-patches] [PATCH] Added example/instructions on what to do to
ParserDetails.ini for XML::LibXML::SAX::Parser
Message-ID: <1C70F59C-E1D5-4E0C-A899-799403605A65@nekls.org>
for debian-lenny (this may not apply anymore)
---
INSTALL.debian-lenny | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/INSTALL.debian-lenny b/INSTALL.debian-lenny
index da6c023..1cbb498 100644
--- a/INSTALL.debian-lenny
+++ b/INSTALL.debian-lenny
@@ -134,6 +134,10 @@ You can test your SAX parser by running:
/etc/perl/XML/SAX/ParserDetails.ini
+ Example (in most cases, this example would be the correct entry to have at the bottom of the file):
+ [XML::LibXML::SAX::Parser]
+
+ The parser you are using should be at the bottom of the file, the last listed entry. Otherwise, you may get errors.
3. Run the Koha installer
--
1.5.6.5
From lrea at nekls.org Thu Oct 7 21:54:20 2010
From: lrea at nekls.org (Liz Rea)
Date: Thu, 7 Oct 2010 14:54:20 -0500
Subject: [Koha-patches] [PATCH] Left off a line of instructions re:
ParserDetails.ini instructions/example.
Message-ID: <8DB91C0B-0D36-4485-B5F8-B703119D0BF6@nekls.org>
For debian-lenny. May not apply.
---
INSTALL.debian-lenny | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/INSTALL.debian-lenny b/INSTALL.debian-lenny
index 1cbb498..f822ee8 100644
--- a/INSTALL.debian-lenny
+++ b/INSTALL.debian-lenny
@@ -128,7 +128,6 @@ You can test your SAX parser by running:
You should see something like::
XML::LibXML::SAX::Parser=HASH(0x81fe220)
-
If you're using PurePerl or Expat, you'll need to edit your
ini file, typically located at:
@@ -136,6 +135,7 @@ You can test your SAX parser by running:
Example (in most cases, this example would be the correct entry to have at the bottom of the file):
[XML::LibXML::SAX::Parser]
+ http://xml.org/sax/features/namespaces = 1
The parser you are using should be at the bottom of the file, the last listed entry. Otherwise, you may get errors.
--
1.5.6.5
From lrea at nekls.org Thu Oct 7 21:52:37 2010
From: lrea at nekls.org (Liz Rea)
Date: Thu, 7 Oct 2010 14:52:37 -0500
Subject: [Koha-patches] [PATCH] Added XML::LibXML::SAX::Parser example and
instructions on how to edit the ParserDetails.ini file.
Message-ID:
---
INSTALL.debian | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/INSTALL.debian b/INSTALL.debian
index bfb94e2..bc15d23 100644
--- a/INSTALL.debian
+++ b/INSTALL.debian
@@ -188,6 +188,12 @@ When the configuration is completed CPAN will install the Perl modules.
/etc/perl/XML/SAX/ParserDetails.ini
+ Example (in most cases, this example would be the correct entry to have at the bottom of the file):
+ [XML::LibXML::SAX::Parser]
+ http://xml.org/sax/features/namespaces = 1
+
+ The parser you are using should be at the bottom of the file, the last listed entry. Otherwise, you may get errors.
+
2.4 Install DBD::mysql Perl module
In order to handle UTF-8 correctly, Koha requires at least version 4.004
--
1.5.6.5
From robin at catalyst.net.nz Fri Oct 8 03:56:16 2010
From: robin at catalyst.net.nz (Robin Sheat)
Date: Fri, 8 Oct 2010 14:56:16 +1300
Subject: [Koha-patches] [PATCH] Bug 5294 - Unescape vendor name when pushing
back
Message-ID: <1286502977-5825-1-git-send-email-robin@catalyst.net.nz>
From: Srdjan Jankovic
Signed-off-by: Robin Sheat
---
.../en/modules/serials/acqui-search-result.tmpl | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl
index bacd1a9..f5a1577 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl
@@ -6,7 +6,7 @@
function GetIt(aqbooksellerid,name)
{
opener.document.f.aqbooksellerid.value = aqbooksellerid;
- opener.document.f.aqbooksellername.value = name;
+ opener.document.f.aqbooksellername.value = unescape(name);
window.close();
}
--
1.7.1
From robin at catalyst.net.nz Fri Oct 8 03:56:17 2010
From: robin at catalyst.net.nz (Robin Sheat)
Date: Fri, 8 Oct 2010 14:56:17 +1300
Subject: [Koha-patches] [PATCH] bug5027: skip unticked checkboxes when
submitting in the background.
In-Reply-To: <1286502977-5825-1-git-send-email-robin@catalyst.net.nz>
References: <1286502977-5825-1-git-send-email-robin@catalyst.net.nz>
Message-ID: <1286502977-5825-2-git-send-email-robin@catalyst.net.nz>
From: Srdjan Jankovic
Signed-off-by: Robin Sheat
---
.../prog/en/includes/background-job.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background-job.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background-job.inc
index 9d257f4..46922e1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/background-job.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background-job.inc
@@ -47,7 +47,7 @@
// gather up form submission
var inputs = [];
$(':input', f).each(function() {
- if (this.type == 'radio') {
+ if (this.type == 'radio' || this.type == 'checkbox') {
if (this.checked) {
inputs.push(this.name + '=' + escape(this.value));
}
--
1.7.1
From nengard at gmail.com Fri Oct 8 17:15:21 2010
From: nengard at gmail.com (Nicole Engard)
Date: Fri, 8 Oct 2010 11:15:21 -0400
Subject: [Koha-patches] Fwd: [PATCH] Bug 5292 Google Preview Option for OPAC
In-Reply-To:
References: <1286477904-20782-1-git-send-email-darrellulm@smfpl.org>
Message-ID:
---------- Forwarded message ----------
From: Darrell Ulm
Date: Fri, Oct 8, 2010 at 9:47 AM
Subject: Fwd: [PATCH] Bug 5292 Google Preview Option for OPAC
To: Nicole Engard
Nicole,
Below is the patch, and it should have arrived at:
koha-patches at lists.koha-community.org unless the email is down.
---
?installer/data/mysql/en/mandatory/sysprefs.sql ? ? | ? ?1 +
?.../admin/preferences/enhanced-content.pref ? ? ? ?| ? ?6 ++++++
?.../opac-tmpl/prog/en/modules/opac-detail.tmpl ? ? | ? 10 ++++++++++
?opac/opac-detail.pl ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?| ? ?2 ++
?4 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql
b/installer/data/mysql/en/mandatory/sysprefs.sql
index 8bfed37..e2fe020 100644
--- a/installer/data/mysql/en/mandatory/sysprefs.sql
+++ b/installer/data/mysql/en/mandatory/sysprefs.sql
@@ -286,3 +286,4 @@ INSERT INTO `systempreferences`
(variable,value,explanation,options,type) VALUES
?INSERT INTO `systempreferences`
(variable,value,explanation,options,type)
VALUES('ILS-DI:Authorized_IPs','','.','Restricts usage of ILS-DI to
some IPs','Free');
?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
('GooglePreview','1','Display the ability to place multiple holds or
not','','YesNo');
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced-content.pref
b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced-content.pref
index cecb7a6..0650808 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced-content.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced-content.pref
@@ -130,6 +130,12 @@ Enhanced Content:
? ? ? ? ? ? ? ? ? yes: Add
? ? ? ? ? ? ? ? ? no: "Don't add"
? ? ? ? ? ? - cover images from Google Books to search results and
item detail pages on the OPAC.
+ ? ? ? ?-
+ ? ? ? ? ? ?- pref: GooglePreview
+ ? ? ? ? ? ? ?choices:
+ ? ? ? ? ? ? ? ? ?yes: Add
+ ? ? ? ? ? ? ? ? ?no: "Don't add"
+ ? ? ? ? ? ?- add link to detail page to Google preview when it
exists for a biblio (by isbn)
? ? Library Thing:
? ? ? ? # Awkward syntax below, due to quoting conflicts
? ? ? ? -
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 b1fdf84..36cd7bb 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
@@ -70,6 +70,16 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
? ?
? ?
+
+ ?
+ ?
+ ?
+ ?
+ ?
+ ?
+
? ? /gp/reader//ref=sib_dp_pt/002-7879865-0184864#reader-link"
target="_blank">.01.MZZZZZZZ.jpg" alt="Cover Image"
/>/gp/reader//ref=sib_dp_pt/002-7879865-0184864#reader-link">.01.MZZZZZZZ.jpg" alt="Cover Image"
/>
? ?
diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index 629ebd2..cec8e15 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -62,6 +62,8 @@ my ( $template, $borrowernumber, $cookie ) =
get_template_and_user(
?my $biblionumber = $query->param('biblionumber') || $query->param('bib');
+$template->param( 'GooglePreview' =>
C4::Context->preference('GooglePreView') );
+
?$template->param( 'AllowOnShelfHolds' =>
C4::Context->preference('AllowOnShelfHolds') );
?$template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) );
--
1.5.6.5
From nengard at gmail.com Fri Oct 8 17:15:37 2010
From: nengard at gmail.com (Nicole Engard)
Date: Fri, 8 Oct 2010 11:15:37 -0400
Subject: [Koha-patches] Fwd: [PATCH] BUG 5283 NEWS ITEM FOR RECEIPT SLIP
In-Reply-To:
References: <1286550003-31752-1-git-send-email-darrellulm@smfpl.org>
Message-ID:
---------- Forwarded message ----------
From: Darrell Ulm
Date: Fri, Oct 8, 2010 at 11:08 AM
Subject: Fwd: [PATCH] BUG 5283 NEWS ITEM FOR RECEIPT SLIP
To: Nicole Engard
---------- Forwarded message ----------
From:
Date: Fri, Oct 8, 2010 at 11:00 AM
Subject: [PATCH] BUG 5283 NEWS ITEM FOR RECEIPT SLIP
To: darrellulm at smfpl.org
Cc: koha
From: koha
There is no on-off global parameter for it since if a library does not want to
use it, then the library will not use the "slip" category in news - this is
similar to the OPAC news and Staff news categories in the news feature.
We have been using this for months in Koha 3.0 and the librarians like it and
so does PR as it gives a way to advertise events and news to patrons with every
checkout.
The files modified are:
koha-news.tmpl
moremember-receipt.tmpl
moremember.pl
Darrell Ulm
---
?.../en/modules/members/moremember-receipt.tmpl ? ? | ? 16 +++++++++++++++-
?.../prog/en/modules/tools/koha-news.tmpl ? ? ? ? ? | ? 10 +++++++++-
?members/moremember.pl ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?| ? 10 ++++++++++
?3 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl
index a63e15d..1d097a1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl
@@ -2,7 +2,8 @@
?Print Receipt for
?
?/includes/favicon.ico" type="image/x-icon" />
-/css/print.css" />
+ /css/print.css" />
+
?
+
+
+
+
/gp/reader//ref=sib_dp_pt/002-7879865-0184864#reader-link" target="_blank">.01.MZZZZZZZ.jpg" alt="Cover Image" />/gp/reader//ref=sib_dp_pt/002-7879865-0184864#reader-link">.01.MZZZZZZZ.jpg" alt="Cover Image" />
diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index 629ebd2..cec8e15 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -62,6 +62,8 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
my $biblionumber = $query->param('biblionumber') || $query->param('bib');
+$template->param( 'GooglePreview' => C4::Context->preference('GooglePreView') );
+
$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
$template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) );
--
1.5.6.5
From tajoli at cilea.it Fri Oct 8 17:54:56 2010
From: tajoli at cilea.it (Zeno Tajoli)
Date: Fri, 8 Oct 2010 17:54:56 +0200
Subject: [Koha-patches] [PATCH] Bug 5128 [3.2] Unimarc default for holdings.
Written with French default
In-Reply-To: tajoli@cilea.it
References: tajoli@cilea.it
Message-ID: <1286553296-4720-1-git-send-email-tajoli@cilea.it>
---
etc/zebradb/marc_defs/unimarc/biblios/record.abs | 5 +-
.../mandatory/unimarc_framework_DEFAULT.sql | 153 ++++++--------------
2 files changed, 48 insertions(+), 110 deletions(-)
diff --git a/etc/zebradb/marc_defs/unimarc/biblios/record.abs b/etc/zebradb/marc_defs/unimarc/biblios/record.abs
index 586b60c..2a4258b 100644
--- a/etc/zebradb/marc_defs/unimarc/biblios/record.abs
+++ b/etc/zebradb/marc_defs/unimarc/biblios/record.abs
@@ -329,9 +329,10 @@ melm 995$d holdingbranch,Record-Source,item
melm 995$e location,item
melm 995$f barcode,item
melm 995$h ccode,item
-melm 995$j LC-card-number:s,item
melm 995$k Call-Number,Local-Classification,lcn,Call-Number:p,Local-Classification:p,lcn:p,item
-melm 995$s popularity:n,popularity:s,item
melm 995$n onloan:d,onloan:n,onloan:s,onloan:w,item
melm 995$u Note,Note:p,item
melm 995 item # just to index every subfield
+
+### 942 local info
+melm 942$0 popularity:n,popularity:s,item
diff --git a/installer/data/mysql/en/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql b/installer/data/mysql/en/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql
index 16340c4..e03e58d 100644
--- a/installer/data/mysql/en/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql
+++ b/installer/data/mysql/en/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql
@@ -20,6 +20,17 @@
-- 2000. It includes the changes published in Update 3." -
-- http://www.ifla.org/VI/3/p1996-1/sec-uni.htm .
-- 2006-03-15 a
+
+-- From Zeno Tajoli (2010-08-12):
+--
+-- Improved default id Koha field (090) and koha date field (099).
+-- Insert link to sql coloum biblio.biblionumber in tag 001
+-- Insert the use of 942, local data
+-- Insert a standard minimun on 995 (holding field)
+-- ***********************************************************************
+
+
+
-- ***********************************************************************
@@ -49,46 +60,38 @@
-- ******************************************************
--- Current Record ID Field/Subfields
-
-INSERT INTO `marc_tag_structure` (`tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`, `frameworkcode`) VALUES
- ('999', 'System Control Numbers (Koha)', 'System Control Numbers (Koha)', 0, 0, '', '');
-
-INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `kohafield`, `tab`, `authorised_value`, `authtypecode`, `value_builder`, `isurl`, `hidden`, `frameworkcode`, `seealso`, `link`, `defaultvalue`) VALUES
- ('999', '9', 'Koha biblio number (autogenerated)', 'Koha biblio number', 0, 0, 'biblio.biblionumber', -1, '', '', '', 0, -5, '', '', '', NULL),
- ('999', 'a', 'Koha biblioitem number (autogenerated)', 'Koha biblioitem number', 0, 0, 'biblioitems.biblioitemnumber', -1, '', '', '', 0, -5, '', '', '', NULL);
-
-
--- ******************************************************
+-- Current Record ID Field/Subfields (090)
+insert into `marc_tag_structure`(`tagfield`,`liblibrarian`,`libopac`,`repeatable`,`mandatory`,`authorised_value`,`frameworkcode`) values
+ ('090','System Control Numbers (Koha)','System Control Numbers (Koha)',0,0,'','');
--- Plugins which need to be written for primary biblioitems Field/Subfields.
+insert into `marc_subfield_structure`(`tagfield`,`tagsubfield`,`liblibrarian`,`libopac`,`repeatable`,`mandatory`,`kohafield`,`tab`,`authorised_value`,`authtypecode`,`value_builder`,`isurl`,`hidden`,`frameworkcode`,`seealso`,`link`,`defaultvalue`) values
+ ('090','a','Koha biblioitem number (autogenerated)','Koha biblioitem number (autogenerated)',0,0,'biblioitems.biblioitemnumber',9,'','','',0,-5,'',NULL,'','');
+-- Local date field/Subfields (099)
--- ('990', '2', 'Source of classification or shelving scheme', 'Source of classification or shelving scheme', 0, 0, 'biblioitems.cn_source', 9, '', '', 'unimarc_en_classcodes.pl', NULL, 0, '', '', '', NULL),
--- ('990', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', 'unimarc_callnumber.pl', NULL, 0, '', '', '', NULL),
+insert into `marc_tag_structure`(`tagfield`,`liblibrarian`,`libopac`,`repeatable`,`mandatory`,`authorised_value`,`frameworkcode`) values
+ ('099','local dates','',0,0,'','');
+insert into `marc_subfield_structure`(`tagfield`,`tagsubfield`,`liblibrarian`,`libopac`,`repeatable`,`mandatory`,`kohafield`,`tab`,`authorised_value`,`authtypecode`,`value_builder`,`isurl`,`hidden`,`frameworkcode`,`seealso`,`link`,`defaultvalue`) values
+ ('099','c','Date of creation (bib. record)','Date of creation (bib. record)',0,0,'biblio.datecreated',0,'','','',0,-5,'',NULL,'','');
+
+insert into `marc_subfield_structure`(`tagfield`,`tagsubfield`,`liblibrarian`,`libopac`,`repeatable`,`mandatory`,`kohafield`,`tab`,`authorised_value`,`authtypecode`,`value_builder`,`isurl`,`hidden`,`frameworkcode`,`seealso`,`link`,`defaultvalue`) values
+ ('099','d','Last modified date (bib. record)','Last modified data (bib. record)',0,0,'biblio.timestamp',0,'','','',0,-5,'',NULL,'','');
--- Current primary biblioitems Field/Subfields
+-- Current primary biblioitems Field/Subfields (942)
INSERT INTO `marc_tag_structure` (`tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`, `frameworkcode`) VALUES
- ('990', 'ADDED ENTRY ELEMENTS (KOHA)', 'ADDED ENTRY ELEMENTS (KOHA)', 0, 0, '', '');
+ ('942', 'ADDED ENTRY ELEMENTS (KOHA)', 'ADDED ENTRY ELEMENTS (KOHA)', 0, 0, '', '');
INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `kohafield`, `tab`, `authorised_value`, `authtypecode`, `value_builder`, `isurl`, `hidden`, `frameworkcode`, `seealso`, `link`, `defaultvalue`) VALUES
- ('990', '0', 'Koha issues (borrowed), all copies', 'Koha issues (borrowed), all copies', 0, 0, 'biblioitems.totalissues', 9, '', '', '', NULL, -5, '', '', '', NULL),
- ('990', '2', 'Source of classification or shelving scheme', 'Source of classification or shelving scheme', 0, 0, 'biblioitems.cn_source', 9, '', '', '', NULL, 0, '', '', '', NULL),
- ('990', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, '', '', '', NULL),
- ('990', 'a', 'Koha item type [OBSOLETE]', 'Koha item type [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, '', '', '', NULL),
- ('990', 'c', 'Koha item type', 'Koha item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, '', '', '', NULL),
- ('990', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, '', '', '', NULL),
- ('990', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, '', '', '', NULL),
- ('990', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, '', '', '', NULL),
- ('990', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, '', '', '', NULL),
- ('990', 'm', 'Call number suffix', 'Call number suffix', 0, 0, 'biblioitems.cn_suffix', 9, '', '', '', 0, 0, '', '', '', NULL),
- ('990', 'n', 'Suppress in OPAC', 'Suppress in OPAC', 0, 0, NULL, 9, '', '', '', 0, 0, '', '', '', NULL),
- ('990', 's', 'Serial record flag', 'Serial record', 0, 0, 'biblio.serial', 9, '', '', '', NULL, -5, '', '', '', NULL);
+ ('942', '0', 'Koha issues (borrowed), all copies', 'Koha issues (borrowed), all copies', 0, 0, 'biblioitems.totalissues', 9, '', '', '', NULL, -5, '', '', '', NULL),
+ ('942', '2', 'Source of classification or shelving scheme', 'Source of classification or shelving scheme', 0, 0, 'biblioitems.cn_source', 9, '', '', '', NULL, 0, '', '', '', NULL),
+ ('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, '', '', '', NULL),
+ ('942', 'c', 'Koha item type', 'Koha item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, '', '', '', NULL),
+ ('942', 's', 'Serial record flag', 'Serial record', 0, 0, 'biblio.serial', 9, '', '', '', NULL, -5, '', '', '', NULL);
-- ******************************************************
@@ -112,59 +115,6 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
--- Recommended items Field/Subfields
-
--- INSERT INTO `marc_tag_structure` (`tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`, `frameworkcode`) VALUES
--- ('995', 'Location and Item Information (Koha)', 'Location and Item Information (Koha)', 0, 0, '', '');
-
--- INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `kohafield`, `tab`, `authorised_value`, `authtypecode`, `value_builder`, `isurl`, `hidden`, `frameworkcode`, `seealso`, `link`, `defaultvalue`) VALUES
--- ('995', '0', 'Withdrawn status', 'Withdrawn status', 0, 0, 'items.wthdrawn', 10, 'WTHDRAWN', '', '', 0, 0, '', '', '', NULL),
--- ('995', '1', 'Lost status', 'Lost status', 0, 0, 'items.itemlost', 10, 'LOST', '', '', 0, 0, '', '', '', NULL),
--- ('995', '2', 'System code (specific classification or other scheme and edition)', 'System code (specific classification or other scheme and edition)', 0, 0, '', 10, '', '', 'unimarc_en_classcodes.pl', NULL, 0, '', '', '', NULL),
--- ('995', '3', 'Classification part', 'Classification part', 0, 0, '', 10, '', '', '', NULL, 0, '', '', '', NULL),
--- ('995', '4', 'Item part', 'Item part', 1, 0, '', 10, '', '', '', NULL, 0, '', '', '', NULL),
--- ('995', '5', 'Use restrictions', 'Use restrictions', 0, 0, 'items.restricted', 10, 'RESTRICTED', '', '', 0, 0, '', '', '', NULL),
--- ('995', '6', 'Coded location qualifier', 'Coded location qualifier', 1, 0, '', 10, '', '', 'marc21_locationqualifier.pl', NULL, 0, '', '', '', NULL),
--- ('995', '7', 'Copy number', 'Copy number', 0, 0, 'items.copynumber', 10, '', '', '', NULL, 0, '', '', '', NULL),
--- ('995', '8', 'Uniform Resource Identifier', 'Uniform Resource Identifier', 1, 0, 'items.uri', 10, '', '', '', 1, 0, '', '', '', NULL),
--- ('995', '9', 'Internal item number (Koha itemnumber, autogenerated)', 'Internal itemnumber (Koha itemnumber)', 0, 0, 'items.itemnumber', -1, '', '', '', 0, -5, '', '', '', NULL),
--- ('995', 'a', 'Origin of the item (home branch) (free text)', 'Origin of item (home branch) (free text)', 0, 1, 'items.homebranch', 10, 'branches', '', '', 0, 0, '', '', '', NULL),
--- ('995', 'b', 'Origin of item (home branch) (coded)', 'Origin of item (home branch (coded)', 0, 0, '', 10, '', '', '', 0, -1, '', '', '', NULL),
--- ('995', 'c', 'Lending or holding organisation (holding branch) (free text)', 'Lending or holding organisation (holding branch) (free text)', 0, 1, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, '', '', '', NULL),
--- ('995', 'd', 'Lending or holding organisation (holding branch) code', 'Lending or holding organisation (holding branch) code', 0, 0, '', 10, '', '', '', 0, -1, '', '', '', NULL),
--- ('995', 'e', 'Genre detail', 'Genre', 0, 0, '', 10, '', '', '', 0, -1, '', '', '', NULL),
--- ('995', 'f', 'Barcode', 'Barcode', 0, 0, 'items.barcode', 10, '', '', 'barcode.pl', 0, 0, '', '', '', NULL),
--- ('995', 'g', 'Barcode prefix', 'Barcode prefix', 0, 0, '', 10, '', '', '', 0, -1, '', '', '', NULL),
--- ('995', 'h', 'Barcode incrementation', 'Barcode incrementation', 0, 0, '', 10, '', '', '', 0, -1, '', '', '', NULL),
--- ('995', 'i', 'Barcode suffix', 'Barcode suffix', 0, 0, '', 10, '', '', '', 0, -1, '', '', '', NULL),
--- ('995', 'j', 'Section', 'Section', 0, 0, '', 10, '', '', '', 0, 0, '', '', '', NULL),
--- ('995', 'k', 'Call number (full call number)', 'Call number (full call number)', 0, 0, 'items.itemcallnumber', 10, '', '', 'unimarc_itemcallnumber.pl', 0, 0, '', '', '', NULL),
--- ('995', 'l', 'Numbering (volume or other part)', 'Numbering (bound volume or other part)', 0, 0, 'items.materials', 10, '', '', '', 0, 0, '', '', '', NULL),
--- ('995', 'm', 'Date of loan or deposit', 'Date of loan or deposit', 0, 0, 'items.datelastborrowed', 10, '', '', '', 0, -5, '', '', '', NULL),
--- ('995', 'n', 'Expiration of loan date', 'Expiration of loan date', 0, 0, '', 10, '', '', '', 0, -1, '', '', '', NULL),
--- ('995', 'o', 'Circulation type (not for loan)', 'Circulation type (not for loan)', 1, 0, 'items.notforloan', 10, '', '', '', 0, 0, '', '', '', NULL),
--- ('995', 'p', 'Serial', 'Serial', 0, 0, '', 10, '', '', '', 0, -1, '', '', '', NULL),
--- ('995', 'q', 'Intended audience (age level)', 'Intended audience (age level)', 0, 0, '', 10, '', '', '', 0, -1, '', '', '', NULL),
--- ('995', 'r', 'Type of item and material', 'Type of item and material', 0, 1, '', 10, '', '', '', 0, 0, '', '', '', NULL),
--- ('995', 's', 'Acquisition mode', 'Acquisition mode', 0, 0, '', 10, '', '', '', 0, -1, '', '', '', NULL),
--- ('995', 't', 'Genre', 'Genre', 0, 0, '', 10, '', '', '', 0, -1, '', '', '', NULL),
--- ('995', 'u', 'Copy note', 'Copy note', 0, 0, 'items.itemnotes', 10, '', '', '', 0, 0, '', '', '', NULL),
--- ('995', 'v', 'Periodical number', 'Periodical number', 0, 0, '', 10, '', '', '', 0, -1, '', '', '', NULL),
--- ('995', 'w', 'Recipient organisation code', 'Recipient organisation code', 0, 0, '', 10, '', '', '', 0, -1, '', '', '', NULL),
--- ('995', 'x', 'Recipient organisation, free text', 'Recipient organisation, free text', 0, 0, '', 10, '', '', '', 0, -1, '', '', '', NULL),
--- ('995', 'y', 'Recipient parent organisation code', 'Recipient parent organisation code', 0, 0, '', 10, '', '', '', 0, -1, '', '', '', NULL),
--- ('995', 'z', 'Recipient parent organisation, free text', 'Recipient parent organisation, free text', 0, 0, '', 10, '', '', '', 0, -1, '', '', '', NULL);
-
-
-
--- Plugins which need to be written for items Field/Subfields
-
-
--- ('995', '2', 'System code (specific classification or other scheme and edition)', 'System code (specific classification or other scheme and edition)', 0, 0, '', 10, '', '', 'unimarc_en_classcodes.pl', NULL, 0, '', '', '', NULL),
--- ('995', 'k', 'Call number (full call number)', 'Call number (full call number)', 0, 0, 'items.itemcallnumber', 10, '', '', 'unimarc_itemcallnumber.pl', 0, 0, '', '', '', NULL),
-
-
-
-- Current items Field/Subfields
INSERT INTO `marc_tag_structure` (`tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`, `frameworkcode`) VALUES
@@ -172,42 +122,29 @@ INSERT INTO `marc_tag_structure` (`tagfield`, `liblibrarian`, `libopac`, `repeat
INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `kohafield`, `tab`, `authorised_value`, `authtypecode`, `value_builder`, `isurl`, `hidden`, `frameworkcode`, `seealso`, `link`, `defaultvalue`) VALUES
('995', '0', 'Withdrawn status', 'Withdrawn status', 0, 0, 'items.wthdrawn', 10, 'WTHDRAWN', '', '', 0, 0, '', '', '', NULL),
- ('995', '1', 'Lost status', 'Lost status', 0, 0, 'items.itemlost', 10, 'LOST', '', '', 0, 0, '', '', '', NULL),
- ('995', '2', 'System code (specific classification or other scheme and edition)', 'System code (specific classification or other scheme and edition)', 0, 0, '', 10, '', '', '', NULL, 0, '', '', '', NULL),
+i ('995', '2', 'Lost status', 'Lost status', 0, 0, 'items.itemlost', 10, 'LOST', '', '', 0, 0, '', '', '', NULL),
('995', '3', 'Use restrictions', 'Use restrictions', 0, 0, 'items.restricted', 10, 'RESTRICTED', '', '', 0, 0, '', '', '', NULL),
- ('995', '4', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'items.cn_sort', -1, '', '', '', 0, 7, '', '', '', NULL),
- ('995', '5', 'Coded location qualifier', 'Coded location qualifier', 0, 0, '', 10, '', '', 'marc21_locationqualifier.pl', NULL, 0, '', '', '', NULL),
+ ('995', '5', 'Date acquired', 'Coded location qualifier', 0, 0, 'items.dateaccessioned', 10, '', '', '', NULL, 0, '', '', '', NULL),
('995', '6', 'Copy number', 'Copy number', 0, 0, 'items.copynumber', 10, '', '', '', NULL, 0, '', '', '', NULL),
('995', '7', 'Uniform Resource Identifier', 'Uniform Resource Identifier', 0, 0, 'items.uri', 10, '', '', '', 0, 0, '', '', '', NULL),
- ('995', '8', 'Koha collection', 'Koha collection', 0, 0, 'items.ccode', 10, 'CCODE', '', '', 0, 0, '', '', '', NULL),
('995', '9', 'Internal item number (Koha itemnumber, autogenerated)', 'Internal itemnumber (Koha itemnumber)', 0, 0, 'items.itemnumber', -1, '', '', '', 0, -5, '', '', '', NULL),
- ('995', 'a', 'Origin of the item (home branch) (free text)', 'Origin of item (home branch) (free text)', 0, 1, 'items.homebranch', 10, 'branches', '', '', 0, 0, '', '', '', NULL),
- ('995', 'b', 'Origin of item (home branch) (coded)', 'Origin of item (home branch (coded)', 0, 0, '', 10, '', '', '', 0, -1, '', '', '', NULL),
- ('995', 'c', 'Lending or holding organisation (holding branch) (free text)', 'Lending or holding organisation (holding branch) (free text)', 0, 1, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, '', '', '', NULL),
- ('995', 'd', 'Lending or holding organisation (holding branch) code', 'Lending or holding organisation (holding branch) code', 0, 0, '', 10, '', '', '', 0, -1, '', '', '', NULL),
- ('995', 'e', 'Genre detail', 'Genre', 0, 0, '', 10, '', '', '', 0, -1, '', '', '', NULL),
+ ('995', 'a', 'Origin of the item (home branch) (free text)', 'Origin of item (home branch) (free text)', 0, 1, '', 10, '', '', '', 0, 0, '', '', '', NULL),
+ ('995', 'b', 'Origin of item (home branch) (coded)', 'Origin of item (home branch (coded)', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, -1, '', '', '', NULL),
+ ('995', 'c', 'Lending or holding organisation (holding branch) code', 'Lending or holding organisation (holding branch) code ', 0, 1, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, '', '', '', NULL),
+ ('995', 'd', 'Lending or holding organisation (holding branch) (free text)', 'Lending or holding organisation (holding branch) (free text)', 0, 0, '', 10, '', '', '', 0, -1, '', '', '', NULL),
+ ('995', 'e', 'Shelving location', 'Shelving location', 0, 0, 'items.location', 10, 'LOC', '', '', 0, 0, '', '', '', NULL),
('995', 'f', 'Barcode', 'Barcode', 0, 0, 'items.barcode', 10, '', '', 'barcode.pl', 0, 0, '', '', '', NULL),
- ('995', 'g', 'Barcode prefix', 'Barcode prefix', 0, 0, '', 10, '', '', '', 0, -1, '', '', '', NULL),
- ('995', 'h', 'Barcode incrementation', 'Barcode incrementation', 0, 0, '', 10, '', '', '', 0, -1, '', '', '', NULL),
- ('995', 'i', 'Barcode suffix', 'Barcode suffix', 0, 0, '', 10, '', '', '', 0, -1, '', '', '', NULL),
- ('995', 'j', 'Section', 'Section', 0, 0, '', 10, '', '', '', 0, 0, '', '', '', NULL),
+ ('995', 'h', 'Koha collection', 'Koha collection', 0, 0, 'items.ccode', 10, 'CCODE', '', '', 0, 0, '', '', '', NULL),
+ ('995', 'j', 'Inventory number', 'Inventory number', 0, 0, 'items.stocknumber ', 10, '', '', '', 0, 0, '', '', '', NULL),
('995', 'k', 'Call number (full call number)', 'Call number (full call number)', 0, 0, 'items.itemcallnumber', 10, '', '', '', 0, 0, '', '', '', NULL),
('995', 'l', 'Numbering (volume or other part)', 'Numbering (bound volume or other part)', 0, 0, 'items.materials', 10, '', '', '', 0, 0, '', '', '', NULL),
('995', 'm', 'Date of loan or deposit', 'Date of loan or deposit', 0, 0, 'items.datelastborrowed', 10, '', '', '', 0, -5, '', '', '', NULL),
- ('995', 'n', 'Expiration of loan date', 'Expiration of loan date', 0, 0, '', 10, '', '', '', 0, -1, '', '', '', NULL),
+ ('995', 'n', 'Expiration of loan date', 'Expiration of loan date', 0, 0, 'items.onloan', 10, '', '', '', 0, -1, '', '', '', NULL),
('995', 'o', 'Circulation type (not for loan)', 'Circulation type (not for loan)', 0, 0, 'items.notforloan', 10, '', '', '', 0, 0, '', '', '', NULL),
- ('995', 'p', 'Serial', 'Serial', 0, 0, '', 10, '', '', '', 0, -1, '', '', '', NULL),
- ('995', 'q', 'Intended audience (age level)', 'Intended audience (age level)', 0, 0, '', 10, '', '', '', 0, -1, '', '', '', NULL),
- ('995', 'r', 'Type of item and material', 'Type of item and material', 0, 1, '', 10, '', '', '', 0, 0, '', '', '', NULL),
- ('995', 's', 'Acquisition mode', 'Acquisition mode', 0, 0, '', 10, '', '', '', 0, -1, '', '', '', NULL),
- ('995', 't', 'Genre', 'Genre', 0, 0, '', 10, '', '', '', 0, -1, '', '', '', NULL),
++ ('995', 'r', 'Type of item and material', 'Type of item and material', 0, 1, 'items.itype', 10, 'itemtypes', '', '', 0, 0, '', '', '', NULL),
('995', 'u', 'Copy note', 'Copy note', 0, 0, 'items.itemnotes', 10, '', '', '', 0, 0, '', '', '', NULL),
- ('995', 'v', 'Periodical number', 'Periodical number', 0, 0, '', 10, '', '', '', 0, -1, '', '', '', NULL),
- ('995', 'w', 'Recipient organisation code', 'Recipient organisation code', 0, 0, '', 10, '', '', '', 0, -1, '', '', '', NULL),
- ('995', 'x', 'Recipient organisation, free text', 'Recipient organisation, free text', 0, 0, '', 10, '', '', '', 0, -1, '', '', '', NULL),
- ('995', 'y', 'Recipient parent organisation code', 'Recipient parent organisation code', 0, 0, '', 10, '', '', '', 0, -1, '', '', '', NULL),
- ('995', 'z', 'Recipient parent organisation, free text', 'Recipient parent organisation, free text', 0, 0, '', 10, '', '', '', 0, -1, '', '', '', NULL);
-
+ ('995', 'v', 'Serial Enumeration / chronology', 'Serial Enumeration / chronology', 0, 0, 'items.enumchron', 10, '', '', '', 0, -1, '', '', '', NULL);
+
-- *******************************************************
@@ -385,7 +322,7 @@ INSERT INTO `marc_tag_structure` (`tagfield`, `liblibrarian`, `libopac`, `repeat
INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `kohafield`, `tab`, `authorised_value`, `authtypecode`, `value_builder`, `isurl`, `hidden`, `frameworkcode`, `seealso`, `link`, `defaultvalue`) VALUES
('000', '@', 'fixed length control field', 'fixed length control field', 0, 1, '', 0, '', '', 'unimarc_leader.pl', 0, 0, '', '', '', NULL),
- ('001', '@', 'control field', 'control field', 0, 1, '', 0, '', '', '', 0, 0, '', '', '', NULL),
+ ('001', '@', 'control field', 'control field', 0, 1, 'biblio.biblionumber', -1, '', '', '', 0, 0, '', '', '', NULL),
('005', '@', 'control field', 'control field', 0, 0, '', 0, '', '', 'marc21_field_005.pl', 0, 0, '', '', '', NULL),
('010', 'a', 'Number (ISBN)', 'Number (ISBN)', 0, 0, 'biblioitems.isbn', 0, '', '', '', 0, 0, '', '', '', NULL),
('010', 'b', 'Qualification', 'Qualification', 0, 0, '', 0, '', '', '', 0, 0, '', '', '', NULL),
--
1.5.3.7
From koha at smfpl.org Fri Oct 8 17:52:38 2010
From: koha at smfpl.org (Darrell Ulm)
Date: Fri, 8 Oct 2010 11:52:38 -0400
Subject: [Koha-patches] [PATCH] BUG 5283 NEWS ITEM FOR RECEIPT SLIP
Message-ID: <1286553158-827-1-git-send-email-koha@smfpl.org>
From: koha
There is no on-off global parameter for it since if a library does not want to
use it, then the library will not use the "slip" category in news - this is
similar to the OPAC news and Staff news categories in the news feature.
We have been using this for months in Koha 3.0 and the librarians like it and
so does PR as it gives a way to advertise events and news to patrons with every
checkout.
The files modified are:
koha-news.tmpl
moremember-receipt.tmpl
moremember.pl
Darrell Ulm
---
.../en/modules/members/moremember-receipt.tmpl | 16 +++++++++++++++-
.../prog/en/modules/tools/koha-news.tmpl | 10 +++++++++-
members/moremember.pl | 10 ++++++++++
3 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl
index a63e15d..1d097a1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl
@@ -2,7 +2,8 @@
Print Receipt for
/includes/favicon.ico" type="image/x-icon" />
-/css/print.css" />
+ /css/print.css" />
+
+
+
+
+
/gp/reader//ref=sib_dp_pt/002-7879865-0184864#reader-link" target="_blank">.01.MZZZZZZZ.jpg" alt="Cover Image" />/gp/reader//ref=sib_dp_pt/002-7879865-0184864#reader-link">.01.MZZZZZZZ.jpg" alt="Cover Image" />
diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index 629ebd2..cec8e15 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -62,6 +62,8 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
my $biblionumber = $query->param('biblionumber') || $query->param('bib');
+$template->param( 'GooglePreview' => C4::Context->preference('GooglePreView') );
+
$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
$template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) );
--
1.5.6.5
From koha at smfpl.org Fri Oct 8 17:56:44 2010
From: koha at smfpl.org (Darrell Ulm)
Date: Fri, 8 Oct 2010 11:56:44 -0400
Subject: [Koha-patches] [PATCH] BUG 5283 NEWS ITEM FOR RECEIPT SLIP
Message-ID: <1286553404-920-1-git-send-email-koha@smfpl.org>
From: koha
There is no on-off global parameter for it since if a library does not want to
use it, then the library will not use the "slip" category in news - this is
similar to the OPAC news and Staff news categories in the news feature.
We have been using this for months in Koha 3.0 and the librarians like it and
so does PR as it gives a way to advertise events and news to patrons with every
checkout.
The files modified are:
koha-news.tmpl
moremember-receipt.tmpl
moremember.pl
Darrell Ulm
---
.../en/modules/members/moremember-receipt.tmpl | 16 +++++++++++++++-
.../prog/en/modules/tools/koha-news.tmpl | 10 +++++++++-
members/moremember.pl | 10 ++++++++++
3 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl
index a63e15d..1d097a1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl
@@ -2,7 +2,8 @@
Print Receipt for
/includes/favicon.ico" type="image/x-icon" />
-/css/print.css" />
+ /css/print.css" />
+
+
+
+
+
/gp/reader//ref=sib_dp_pt/002-7879865-0184864#reader-link" target="_blank">.01.MZZZZZZZ.jpg" alt="Cover Image" />/gp/reader//ref=sib_dp_pt/002-7879865-0184864#reader-link">.01.MZZZZZZZ.jpg" alt="Cover Image" />
diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index 629ebd2..cec8e15 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -62,6 +62,8 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
my $biblionumber = $query->param('biblionumber') || $query->param('bib');
+$template->param( 'GooglePreview' => C4::Context->preference('GooglePreView') );
+
$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
$template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) );
--
1.5.6.5
From koha at smfpl.org Fri Oct 8 18:02:41 2010
From: koha at smfpl.org (Darrell Ulm)
Date: Fri, 8 Oct 2010 12:02:41 -0400
Subject: [Koha-patches] [PATCH] Bug 5283 NEWS ITEM FOR RECEIPT SLIP
Message-ID: <1286553761-1765-1-git-send-email-koha@smfpl.org>
From: koha
There is no on-off global parameter for it since if a library does not want to
use it, then the library will not use the "slip" category in news - this is
similar to the OPAC news and Staff news categories in the news feature.
We have been using this for months in Koha 3.0 and the librarians like it and
so does PR as it gives a way to advertise events and news to patrons with every
checkout.
The files modified are:
koha-news.tmpl
moremember-receipt.tmpl
moremember.pl
Darrell Ulm
---
.../en/modules/members/moremember-receipt.tmpl | 16 +++++++++++++++-
.../prog/en/modules/tools/koha-news.tmpl | 10 +++++++++-
members/moremember.pl | 10 ++++++++++
3 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl
index a63e15d..1d097a1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl
@@ -2,7 +2,8 @@
Print Receipt for
/includes/favicon.ico" type="image/x-icon" />
-/css/print.css" />
+ /css/print.css" />
+
+
+
+
+
/gp/reader//ref=sib_dp_pt/002-7879865-0184864#reader-link" target="_blank">.01.MZZZZZZZ.jpg" alt="Cover Image" />/gp/reader//ref=sib_dp_pt/002-7879865-0184864#reader-link">.01.MZZZZZZZ.jpg" alt="Cover Image" />
diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index 629ebd2..cec8e15 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -62,6 +62,8 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
my $biblionumber = $query->param('biblionumber') || $query->param('bib');
+$template->param( 'GooglePreview' => C4::Context->preference('GooglePreView') );
+
$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
$template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) );
--
1.5.6.5
From koha at smfpl.org Fri Oct 8 19:46:16 2010
From: koha at smfpl.org (Darrell Ulm)
Date: Fri, 8 Oct 2010 13:46:16 -0400
Subject: [Koha-patches] [PATCH] Bug 5298 OPAC change password option for
patron
Message-ID: <1286559976-2927-1-git-send-email-koha@smfpl.org>
This is an enhancement to allow a patron to change the password of their
account saving librarian time and effort.
The current password is required as well as two tries with an existing
password.
Darrell Ulm
---
koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc b/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc
index 26bf502..34d2a5f 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc
@@ -29,7 +29,6 @@
--
1.5.6.5
From koha at smfpl.org Fri Oct 8 19:47:18 2010
From: koha at smfpl.org (Darrell Ulm)
Date: Fri, 8 Oct 2010 13:47:18 -0400
Subject: [Koha-patches] [PATCH] Bug 5298 OPAC change password option for
patron
Message-ID: <1286560038-2995-1-git-send-email-koha@smfpl.org>
This is an enhancement to allow a patron to change the password of their
account saving librarian time and effort.
The current password is required as well as two tries with an existing
password.
Darrell Ulm
---
koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc b/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc
index 26bf502..34d2a5f 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc
@@ -29,7 +29,6 @@
> ?
> --
> 1.5.6.5
>
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
>
From koha at smfpl.org Fri Oct 8 21:36:12 2010
From: koha at smfpl.org (Darrell Ulm)
Date: Fri, 8 Oct 2010 15:36:12 -0400
Subject: [Koha-patches] [PATCH] Bug 5299 Allow patron to update email if
they are allowed to update password
Message-ID: <1286566572-4456-1-git-send-email-koha@smfpl.org>
The update email option is in a separate opac menu option.
To update or add an email requires the patron to type in their password as well
as the email address to change their email to.
This is the patch I meant to send!
Darrell Ulm
---
koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc | 5 +-
.../prog/en/modules/opac-changeemail.tmpl | 87 +++++++++++++++
opac/opac-changeemail.pl | 115 ++++++++++++++++++++
3 files changed, 206 insertions(+), 1 deletions(-)
create mode 100644 koha-tmpl/opac-tmpl/prog/en/modules/opac-changeemail.tmpl
create mode 100755 opac/opac-changeemail.pl
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc b/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc
index 34d2a5f..3b1a901 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc
@@ -12,6 +12,9 @@
's account l../../images/caret.gif" width="16" height="16" alt=">" border="0" /> Change your Email or Add an Email
+
+
+
There was a problem with your submission
+
+
+ Your current password was entered incorrectly. If this problem persists, please ask a librarian to re-set your password for you.
+
+
+ When you tried to change your email, your current password was entered incorrectly. If this problem persists, please ask a librarian to re-set your password for you.
+
+
+ Your email was not changed because you did not provide your login password to verify. If you wish to
+ change your email then you need to include your password also.
+
+
+ You did not provide an email address to either add or change. Please provide an email address
+ if you wish to update your email.
+
+
+
+
+
+
+
Current Email:
+
+
Prior Email:
+
+
+
+
+
+
+
You can't change your email.
+
+
+
+
+
Email Updated
+ Your Email has been changed to:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/opac/opac-changeemail.pl b/opac/opac-changeemail.pl
new file mode 100755
index 0000000..3eec937
--- /dev/null
+++ b/opac/opac-changeemail.pl
@@ -0,0 +1,115 @@
+#!/usr/bin/perl
+# This script lets the users change their email by themselves.
+#
+# (c) 2005 Universidad ORT Uruguay.
+#
+# This file is part of the extensions and enhacments made to koha by Universidad ORT Uruguay
+#
+# Modification of Passwd.pl code by Darrell Ulm
+#
+# 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 Digest::MD5 qw(md5_base64);
+use C4::Circulation;
+use C4::Members;
+use C4::Output;
+
+my $query = new CGI;
+my $dbh = C4::Context->dbh;
+
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+ {
+ template_name => "opac-changeemail.tmpl",
+ query => $query,
+ type => "opac",
+ authnotrequired => 0,
+ flagsrequired => { borrow => 1 },
+ debug => 1,
+ }
+);
+
+# get borrower information ....
+my ( $borr ) = GetMemberDetails( $borrowernumber );
+my $sth = $dbh->prepare("UPDATE borrowers SET password = ? WHERE borrowernumber=?");
+my $minpasslen = C4::Context->preference("minPasswordLength");
+
+my $oldemail = $borr->{'email'};
+my $oldemailpro = $borr->{'emailpro'};
+
+if ( $query->param('Oldkey')
+ && $query->param('Newemail') )
+ {
+ if ( goodkey( $dbh, $borrowernumber, $query->param('Oldkey') ) )
+ {
+ my $sthemail = $dbh->prepare("UPDATE borrowers SET email = ? WHERE borrowernumber=?");
+ $sthemail->execute( $query->param('Newemail'), $borrowernumber );
+ $template->param( 'email_updated' => '1' );
+ if ($oldemailpro =~ /^$/)
+ {
+ my $sthemail2 = $dbh->prepare("UPDATE borrowers SET emailpro = ? WHERE borrowernumber=?");
+ $sthemail2->execute( $oldemail, $borrowernumber );
+ }
+ }
+ else {
+ $template->param( 'Error_messages' => '1' );
+ $template->param( 'EmailPassMismatch' => '1' );
+ }
+ }
+elsif ( $query->param('Newemail')
+ && ! $query->param('Oldkey') )
+ {
+ $template->param( 'EmailNotChanged' => '1' );
+ $template->param( 'Error_messages' => '1' );
+ }
+elsif ( ! $query->param('Newemail')
+ && $query->param('Oldkey') )
+ {
+ $template->param( 'NoEmailAddress' => '1' );
+ $template->param( 'Error_messages' => '1' );
+ }
+else {
+ $template->param( 'Ask_data' => '1' );
+ $template->param( emailchangeview => 1 );
+ }
+
+$template->param( firstname => $borr->{'firstname'},
+ oldemail => $borr->{'email'},
+ oldemailpro => $borr->{'emailpro'},
+ surname => $borr->{'surname'},
+ minpasslen => $minpasslen,
+ newemail => $query->param('Newemail'),
+ emailview => 1,
+ );
+
+output_html_with_http_headers $query, $cookie, $template->output;
+
+sub goodkey {
+ my ( $dbh, $borrowernumber, $key ) = @_;
+
+ my $sth =
+ $dbh->prepare("SELECT password FROM borrowers WHERE borrowernumber=?");
+ $sth->execute($borrowernumber);
+ if ( $sth->rows ) {
+ my ($md5password) = $sth->fetchrow;
+ if ( md5_base64($key) eq $md5password ) { return 1; }
+ else { return 0; }
+ }
+ else { return 0; }
+}
\ No newline at end of file
--
1.5.6.5
From koha at smfpl.org Fri Oct 8 21:36:21 2010
From: koha at smfpl.org (Darrell Ulm)
Date: Fri, 8 Oct 2010 15:36:21 -0400
Subject: [Koha-patches] [PATCH] Bug 5299 Allow patron to update email if
they are allowed to update password
Message-ID: <1286566581-4488-1-git-send-email-koha@smfpl.org>
The update email option is in a separate opac menu option.
To update or add an email requires the patron to type in their password as well
as the email address to change their email to.
This is the patch I meant to send!
Darrell Ulm
---
koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc | 5 +-
.../prog/en/modules/opac-changeemail.tmpl | 87 +++++++++++++++
opac/opac-changeemail.pl | 115 ++++++++++++++++++++
3 files changed, 206 insertions(+), 1 deletions(-)
create mode 100644 koha-tmpl/opac-tmpl/prog/en/modules/opac-changeemail.tmpl
create mode 100755 opac/opac-changeemail.pl
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc b/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc
index 34d2a5f..3b1a901 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc
@@ -12,6 +12,9 @@
's account l../../images/caret.gif" width="16" height="16" alt=">" border="0" /> Change your Email or Add an Email
+
+
+
There was a problem with your submission
+
+
+ Your current password was entered incorrectly. If this problem persists, please ask a librarian to re-set your password for you.
+
+
+ When you tried to change your email, your current password was entered incorrectly. If this problem persists, please ask a librarian to re-set your password for you.
+
+
+ Your email was not changed because you did not provide your login password to verify. If you wish to
+ change your email then you need to include your password also.
+
+
+ You did not provide an email address to either add or change. Please provide an email address
+ if you wish to update your email.
+
+
+
+
+
+
+
Current Email:
+
+
Prior Email:
+
+
+
+
+
+
+
You can't change your email.
+
+
+
+
+
Email Updated
+ Your Email has been changed to:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/opac/opac-changeemail.pl b/opac/opac-changeemail.pl
new file mode 100755
index 0000000..3eec937
--- /dev/null
+++ b/opac/opac-changeemail.pl
@@ -0,0 +1,115 @@
+#!/usr/bin/perl
+# This script lets the users change their email by themselves.
+#
+# (c) 2005 Universidad ORT Uruguay.
+#
+# This file is part of the extensions and enhacments made to koha by Universidad ORT Uruguay
+#
+# Modification of Passwd.pl code by Darrell Ulm
+#
+# 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 Digest::MD5 qw(md5_base64);
+use C4::Circulation;
+use C4::Members;
+use C4::Output;
+
+my $query = new CGI;
+my $dbh = C4::Context->dbh;
+
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+ {
+ template_name => "opac-changeemail.tmpl",
+ query => $query,
+ type => "opac",
+ authnotrequired => 0,
+ flagsrequired => { borrow => 1 },
+ debug => 1,
+ }
+);
+
+# get borrower information ....
+my ( $borr ) = GetMemberDetails( $borrowernumber );
+my $sth = $dbh->prepare("UPDATE borrowers SET password = ? WHERE borrowernumber=?");
+my $minpasslen = C4::Context->preference("minPasswordLength");
+
+my $oldemail = $borr->{'email'};
+my $oldemailpro = $borr->{'emailpro'};
+
+if ( $query->param('Oldkey')
+ && $query->param('Newemail') )
+ {
+ if ( goodkey( $dbh, $borrowernumber, $query->param('Oldkey') ) )
+ {
+ my $sthemail = $dbh->prepare("UPDATE borrowers SET email = ? WHERE borrowernumber=?");
+ $sthemail->execute( $query->param('Newemail'), $borrowernumber );
+ $template->param( 'email_updated' => '1' );
+ if ($oldemailpro =~ /^$/)
+ {
+ my $sthemail2 = $dbh->prepare("UPDATE borrowers SET emailpro = ? WHERE borrowernumber=?");
+ $sthemail2->execute( $oldemail, $borrowernumber );
+ }
+ }
+ else {
+ $template->param( 'Error_messages' => '1' );
+ $template->param( 'EmailPassMismatch' => '1' );
+ }
+ }
+elsif ( $query->param('Newemail')
+ && ! $query->param('Oldkey') )
+ {
+ $template->param( 'EmailNotChanged' => '1' );
+ $template->param( 'Error_messages' => '1' );
+ }
+elsif ( ! $query->param('Newemail')
+ && $query->param('Oldkey') )
+ {
+ $template->param( 'NoEmailAddress' => '1' );
+ $template->param( 'Error_messages' => '1' );
+ }
+else {
+ $template->param( 'Ask_data' => '1' );
+ $template->param( emailchangeview => 1 );
+ }
+
+$template->param( firstname => $borr->{'firstname'},
+ oldemail => $borr->{'email'},
+ oldemailpro => $borr->{'emailpro'},
+ surname => $borr->{'surname'},
+ minpasslen => $minpasslen,
+ newemail => $query->param('Newemail'),
+ emailview => 1,
+ );
+
+output_html_with_http_headers $query, $cookie, $template->output;
+
+sub goodkey {
+ my ( $dbh, $borrowernumber, $key ) = @_;
+
+ my $sth =
+ $dbh->prepare("SELECT password FROM borrowers WHERE borrowernumber=?");
+ $sth->execute($borrowernumber);
+ if ( $sth->rows ) {
+ my ($md5password) = $sth->fetchrow;
+ if ( md5_base64($key) eq $md5password ) { return 1; }
+ else { return 0; }
+ }
+ else { return 0; }
+}
\ No newline at end of file
--
1.5.6.5
From nengard at bywatersolutions.com Mon Oct 11 22:31:10 2010
From: nengard at bywatersolutions.com (Nicole Engard)
Date: Mon, 11 Oct 2010 16:31:10 -0400
Subject: [Koha-patches] [PATCH] Updates to INSTALL.debian documentation for
3.2.
Message-ID: <1286829070-3177-1-git-send-email-nengard@bywatersolutions.com>
From: Liz Rea
Signed-off-by: Nicole Engard
---
INSTALL.debian | 190 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 121 insertions(+), 69 deletions(-)
diff --git a/INSTALL.debian b/INSTALL.debian
index cb38921..f0dac4d 100644
--- a/INSTALL.debian
+++ b/INSTALL.debian
@@ -7,7 +7,7 @@ Some parts copyright 2010 Chris Nighswonger
Feedback/bug reports: Koha Developer's List:
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-devel
-This document last modified: 19 May 2010
+This document last modified: October 8, 2010
Installation Instructions
=============================
@@ -19,9 +19,9 @@ as indicated or by running the command directly as root.
1.1 Install Debian Lenny via Businesscard CD
-See http://www.debian.org/releases/lenny/debian-installer/
+ See http://www.debian.org/releases/lenny/debian-installer/
-1.3 Set up Indexdata apt sources for Yaz and Zebra packages
+1.2 Set up Indexdata apt sources for Yaz and Zebra packages
Edit your /etc/apt/sources.list file and add the following:
@@ -31,30 +31,33 @@ Edit your /etc/apt/sources.list file and add the following:
The Index Data packages are signed with a key you can install as follows:
- $ wget http://ftp.indexdata.dk/debian/indexdata.asc
- $ sudo apt-key add indexdata.asc
+ $ wget -O- http://ftp.indexdata.dk/debian/indexdata.asc | sudo apt-key add
-1.4 Get Koha
+Finally, update your apt sources:
+ $ sudo apt-get update
-1.4.1 Option A: Download Koha via Git (optional)
+1.3 Get Koha
+Choose one of these options:
+
+1.3.1 Option A: Download Koha via Git (optional)
$ sudo apt-get install git-core git-email
- $ git clone git://git.koha-community.org/pub/scm/koha.git kohaclone
- $ cd kohaclone
+ $ git clone git://git.koha-community.org/koha.git koha
+ $ cd koha
$ git checkout -b myinstall origin
Note: for more information about Git, please see the Koha Git Usage Guide:
http://wiki.koha-community.org/wiki/Version_Control_Using_Git
-1.4.2 Option B: Download Koha from http://download.koha-community.org
+1.3.2 Option B: Download Koha from http://download.koha-community.org
Find the latest Koha stable version on http://download.koha-community.org
and get it:
$ wget found on download.koha-community.org
-1.5 Install additional Debian dependencies
+1.4 Install additional Debian dependencies
IMPORTANT: You should only use CPAN for Perl dependencies which are NOT
available from the package maintainer. You have been warned!
@@ -64,20 +67,21 @@ Zebra and all Debian packaged Perl module required by Koha:
$ sudo install_misc/apt-get-debian-lenny.sh
-1.6 Install Perl dependencies that aren't packaged into Debian Lenny
+1.5 Install Perl dependencies that aren't packaged into Debian Lenny
sources
Run the following command:
$ sudo cpan Algorithm::CheckDigits SMS::Send HTTP::OAI IPC::Cmd \
Memoize::Memcached PDF::API2::Simple PDF::Table Storable Test::More \
- Locale::Currency::Format
+ Locale::Currency::Format DateTime Lingua::Stem::Snowball Text::CSV::Encoded \
+ UNIVERSAL::require YAML Authen::CAS::Client
Note: you may need to run CPAN initialization if you've not run cpan
before:
/etc/perl/CPAN/Config.pm initialized.
-
+
CPAN is the world-wide archive of perl resources. It consists of about
100 sites that all replicate the same contents all around the globe.
Many countries have at least one CPAN site already. The resources
@@ -94,23 +98,20 @@ When the configuration is completed CPAN will install the Perl modules.
2. Configuration of dependencies
-2.1 Update root MySQL password (if dselect didn't do it for you already)
+2.1 Create the Koha database
- $ sudo mysqladmin password
-
-2.2 Create the Koha database
-
- Create the database and user with associated privileges:
+ Create the database and user with associated privileges (information inside <> brackets is
+ data you assign specifically to your installation. Do not include the <>'s when entering the commands):
$ mysqladmin -uroot -p create
$ mysql -uroot -p
-
+
Welcome to the MySQL monitor. Commands end with ; or \g.
Your MySQL connection id is 22
Server version: 5.0.51a-24 (Debian)
-
+
Type 'help;' or '\h' for help. Type '\c' to clear the buffer.
-
+
mysql> grant all on .* to ''@'localhost' identified by '';
Query OK, 0 rows affected (0.00 sec)
@@ -119,37 +120,64 @@ When the configuration is completed CPAN will install the Perl modules.
mysql> quit
-2.3 Test your SAX Parser and correct where necessary
+You may want to document the database name, the database username, and the database password you just set.
+Step 3 will require them.
-You must be sure you're using the XML::LibXML SAX parser, not Expat or
-PurePerl, both of which have outstanding bugs with pre-composed characters.
+2.2 Test your SAX Parser and correct where necessary
+
+You must be sure you're using the XML::LibXML SAX parser, not Expat or
+PurePerl, both of which have outstanding bugs with pre-composed characters.
You can test your SAX parser by running:
$ cd koha
$ misc/sax_parser_print.pl
- You should see something like::
+You should see something like:
XML::LibXML::SAX::Parser=HASH(0x81fe220)
- If you're using PurePerl or Expat, you'll need to edit your
- ini file, typically located at:
+If you are configured to use PurePerl or Expat, the script will say you have a problem and
+you'll need to edit your ini file to correct it.
+
+The file is typically located at:
/etc/perl/XML/SAX/ParserDetails.ini
+The correct parser entry will need to be moved to the bottom of the file.
+The following is the entry you are looking for:
+
+ [XML::LibXML::SAX::Parser]
+ http://xml.org/sax/features/namespaces = 1
+
+2.3 Create your Koha system user (if you haven't created one already)
+
+ $ sudo adduser koha
+
+You can substitute any username for "koha," just be sure to write it down, you will need to know what it is in step 3.
3. Run the Koha installer
$ perl Makefile.PL
- ( answer questions )
+ ( answer questions )
$ make
$ make test
$ sudo make install
+3.1 Export the environment variables
+Make install will tell you what the proper path for these environment variables is.
+In case you missed it at the end of make install, here are some examples:
+
+Example (for standard install):
+ $ export KOHA_CONF=/etc/koha/koha-conf.xml
+ $ export PERL5LIB=/usr/share/koha/lib
+
+Example (for dev install. These paths are set during Makefile.PL.):
+ $ export KOHA_CONF=/path/to/your/koha-conf.xml
+ $ export PERL5LIB=/path/to/koha/lib
+
4. Configure and start Apache
$ sudo ln -s /etc/koha/koha-httpd.conf /etc/apache2/sites-available/koha
- (note that the path to koha-httpd.conf may be different depending on your
- installation choices)
+(note that the path to koha-httpd.conf may be different if you chose a dev install)
Add the following lines to /etc/apache2/ports.conf:
@@ -163,75 +191,98 @@ Run the following commands:
$ sudo apache2ctl restart
Note: you may still see the usual Apache default site if your VirtualHost
-configuration isn't correct. The command "sudo a2dissite default" may be a
-quick fix, but may have side-effects. See the Apache HTTPD manual section on
-virtual hosts for full instructions.
+ configuration isn't correct. If Koha is the only web application running on the server,
+ the command "sudo a2dissite default" may be a quick fix. For servers running other sites
+ alongside Koha, see the Apache HTTPD manual section on virtual hosts for full
+ instructions (http://httpd.apache.org/docs/2.0/vhosts/).
+
+5. Run the Web Installer, populate the database, initial configuration of settings
+
+Point your browser to http://:8080/
+
+Note: is (usually) the IP of your server, or localhost (if you are connecting
+ from the same machine Koha is installed on. You can verify the location by checking
+ the VirtualHost settings for both the opac and intranet virtual hosts in koha-httpd.conf
-5. Configure and start Zebra
+Koha will redirect you to the Web Installer where you can continue the setup. You will be prompted to enter in your DATABASE username and password. It is through this interface
+that
+you can install the sample data for libraries, patrons, and much more.
+
+Be aware that removing sample data at a later time (when you may want to take the
+server into production) may not be easy, and if your intent is to take this
+install from testing to production, go with minimal sample data (no patrons or bibliographic records).
+
+6. Configure and start Zebra
Note: it's recommended that you daemonize the Zebra process and add it to your
-startup profile. For a non-production test/development installation, running
-Zebra from the command line can be useful. Pick from the two available options
-below, or roll your own :-)
+ startup profile. For a non-production test/development installation, running
+ Zebra from the command line can be useful. Pick one of the options below (or roll your own).
Note: it's also recommended that you create a Koha system user, which you will
-have specified during the install process. Alternatively, Zebra can be
-configured to run as the root user.
+ have specified during the install process. Alternatively, Zebra can be
+ configured to run as the root user.
-Option 1: run the Zebra processes from the command line:
+Option 1: run the Zebra processes from the command line (manual indexing):
-1.1 Zebra Search Server
+6.1.1 Zebra Search Server
This process send responses to search requests sent by Koha or
Z39.50/SRU/SRW clients.
- $ sudo -u ${KOHA_USER} zebrasrv -f /etc/koha/koha-conf.xml
- (note that the path to koha-conf.xml may be different depending on your
- installation choices)
+ $ sudo -u zebrasrv -f /etc/koha/koha-conf.xml
+ (note that the path to koha-conf.xml may be different if you chose a dev install, and that
+ refers to the user you set up in step 2.3)
Note: the user you run Zebra as will be the only user with write permission
on the Zebra index; in development mode, you may wish to use your
system user.
-1.2 Zebra Indexer
+
+6.1.2 Zebra Indexer
Added/updated/deleted records in Koha MySQL database must be indexed
into Zebra. A specific script must be launched each time a bibliographic
or an authority record is edited.
- $ sudo -u ${KOHA_USER} misc/migration_tools/rebuild_zebra -z -b -a
- NOTE: This script should be run as the kohauser (the default is 'koha').
+ $ sudo -u misc/migration_tools/rebuild_zebra.pl -z -b -a
+
+Note: This script should be run as the kohauser (the default is 'koha', but
+this is the user you set up in step 2.3).
-Option 2: run automatically Zebra process as a daemon:
+Option 2: run the Zebra process as a daemon (automatic indexing):
-Note that references to $SCRIPT_DIR refer to the directory where
-Koha's command-line scripts are installed, e.g., /usr/share/koha/bin.
+Note: References to refer to the directory where
+ Koha's command-line scripts are installed, the path
+ is /usr/share/koha/bin/ by default in a standard install.
-1.1 Zebra Search Server
+6.2.1 Zebra Search Server
- $ sudo ln -s ${SCRIPT_DIR}/koha-zebra-ctl.sh /etc/init.d/koha-zebra-daemon
- (Note: ${SCRIPT_DIR} is /usr/share/koha/bin/ by default in a standard install)
+ $ sudo ln -s /koha-zebra-ctl.sh /etc/init.d/koha-zebra-daemon
+ (Note: is /usr/share/koha/bin/ by default in a standard install)
$ sudo update-rc.d koha-zebra-daemon defaults
- ( Note: see man chkconfig(8) on other distros )
- $ sudo ${SCRIPT_DIR}/koha-zebra-ctl.sh start
+ $ sudo /koha-zebra-ctl.sh start
+ (Note: is /usr/share/koha/bin/ by default in a standard install)
-1.2 Zebra Indexer
-Add an entry in Koha user crontab to scheduled added/updated/deleted records
-indexing by Zebra with this command:
+6.2.2 Zebra Indexer
- /misc/migration_tools/rebuild_zebra -z -b -a
+Add an entry in Koha user crontab to process scheduled added/updated/deleted records
+indexing by Zebra. cronjobs/crontab.example contains examples for these cron jobs (and many more).
-See check misc/cronjobs/crontab.example for usage examples.
-NOTE: This job should be setup under the kohauser (the default is 'koha').
+NOTE: The cronjobs should be setup under the kohauser (the default is 'koha', but
+this is the user you set up in step 2.3).
-6. Run the Web Installer, populate the database, initial configuration of settings
+Edit the crontab for the koha user by running
+ $ sudo -u crontab -e
- Point your browser to http://:8080/
+For Zebra indexing, you are looking for the example that begins with
+
+ # ZEBRA INDEX UPDATES with -z option, incremental index updates throughout the day
+ # for both authorities and bibs
+
+It may be easiest to copy/paste the example into your own crontab and modify as necessary.
- It should redirect you to the Web Installer where you can continue the setup.
- You can install the sample data for libraries, patrons, etc. via the Web Installer
7. What next?
@@ -256,12 +307,12 @@ Authority data in MARC21 format
$ misc/migration_tools/rebuild_zebra.pl -b -w
Once the indexing has completed, you will be able to search for records in your system.
- NOTE: This script should be run as the kohauser (the default is 'koha').
+ NOTE: This script should be run as the kohauser (the default is 'koha', this is the user we set up in step 2.3).
7.3 Schedule regular index updates
You need to run rebuild_zebra.pl -b -a -z as a regular cron job in orde to pick up new bibs
and items as you add them. Check misc/cronjobs/crontab.example for usage examples. See 7.0 above.
- NOTE: This job should be setup under the kohauser (the default is 'koha').
+ NOTE: This job should be setup under the kohauser (the default is 'koha', this is the user we set up in step 2.3).
7.4 To enable public Z39.50/SRU servers, you'll need to edit your koha-conf.xml and
change the options to listen on a TCP port; then restart the zebra daemon.
@@ -318,3 +369,4 @@ 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
+
--
1.5.6.5
From lrea at nekls.org Tue Oct 12 16:19:17 2010
From: lrea at nekls.org (Liz Rea)
Date: Tue, 12 Oct 2010 09:19:17 -0500
Subject: [Koha-patches] [PATCH] add new lenny dependency
libmodule-install-perl to the apt-get-debian-lenny.sh script
Message-ID: <1286893157-14327-1-git-send-email-lrea@nekls.org>
---
install_misc/apt-get-debian-lenny.sh | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/install_misc/apt-get-debian-lenny.sh b/install_misc/apt-get-debian-lenny.sh
index 4e48f59..015a32d 100755
--- a/install_misc/apt-get-debian-lenny.sh
+++ b/install_misc/apt-get-debian-lenny.sh
@@ -61,6 +61,7 @@ libmarc-crosswalk-dublincore-perl \
libmarc-record-perl \
libmarc-xml-perl \
libmime-lite-perl \
+libmodule-install-perl \
libmysqlclient15-dev \
libnet-ldap-perl \
libnet-z3950-zoom-perl \
--
1.5.6.5
From ian.walls at bywatersolutions.com Tue Oct 12 17:32:44 2010
From: ian.walls at bywatersolutions.com (Ian Walls)
Date: Tue, 12 Oct 2010 11:32:44 -0400
Subject: [Koha-patches] [PATCH] [SIGNED OFF] bug 5293 remove references to
email on suggestions
Message-ID: <1286897564-26169-1-git-send-email-ian.walls@bywatersolutions.com>
From: Nicole Engard
The purchase suggestions form in the opac says it will
send an email to the patron, but there is no such functionality
so I've removed that reference.
Signed-off-by: Ian Walls
---
.../prog/en/modules/opac-suggestions.tmpl | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl
index ab5b753..3c8dd47 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl
@@ -74,8 +74,8 @@ $.tablesorter.addParser({
Enter a new purchase suggestion
-
Please fill out this form to make a purchase suggestion. You will receive an email when the library processes your suggestion
-
Only the title is required, but the more information you enter the easier it will be for the librarians to find title you're requesting. The "Notes" field can be used to provide any additional information.
+
Please fill out this form to make a purchase suggestion. You can follow the progress of your suggestion by going to 'my purchase suggestions' once you are logged in.
+
Only the title is required, but the more information you enter the easier it will be for the librarians to find title you're requesting. The 'Notes' field can be used to provide any additional information.