From colin.campbell at ptfs-europe.com Fri Jun 1 09:15:37 2012
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Fri, 1 Jun 2012 08:15:37 +0100
Subject: [Koha-patches] [PATCH] Bug 8176 Assign an intial value to $sqlwhere
Message-ID: <1338534937-4852-1-git-send-email-colin.campbell@ptfs-europe.com>
warnings in log because of undefined value in
string concatenation
variable should be initialized to empty string rather
than left undefined
---
C4/Serials.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/C4/Serials.pm b/C4/Serials.pm
index 20ad706..af5c833 100644
--- a/C4/Serials.pm
+++ b/C4/Serials.pm
@@ -566,7 +566,7 @@ sub GetSubscriptions {
LEFT JOIN biblioitems ON biblio.biblionumber = biblioitems.biblionumber
);
my @bind_params;
- my $sqlwhere;
+ my $sqlwhere = q{};
if ($biblionumber) {
$sqlwhere = " WHERE biblio.biblionumber=?";
push @bind_params, $biblionumber;
--
1.7.11.rc0
From dpavlin at rot13.org Fri Jun 1 15:27:22 2012
From: dpavlin at rot13.org (Dobrica Pavlinusic)
Date: Fri, 1 Jun 2012 15:27:22 +0200
Subject: [Koha-patches] [PATCH] Bug 8178 - circ/circulation.pl under plack
duplicates checkout rows
Message-ID: <1338557242-19145-1-git-send-email-dpavlin@rot13.org>
Bug 7851 introduced our scoping for vairables, unfortunatly it has
side-effect that checkout rows accumulate on page reloads instead
of being initialized to empty array (which this patch fixes)
Test scenario:
1. start intranet under plack
2. open /cgi-bin/koha/circ/circulation.pl and reload page few time
confirming that rows gets duplicated
3. apply patch and reload page to verify that it works
---
circ/circulation.pl | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/circ/circulation.pl b/circ/circulation.pl
index c89abff..fdad5f2 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -417,10 +417,10 @@ if ($borrowernumber) {
# make the issued books table.
my $todaysissues = '';
my $previssues = '';
-our @todaysissues;
-our @previousissues;
-our @relissues;
-our @relprevissues;
+our @todaysissues = ();
+our @previousissues = ();
+our @relissues = ();
+our @relprevissues = ();
my $displayrelissues;
our $totalprice = 0;
--
1.7.2.5
From dpavlin at rot13.org Fri Jun 1 15:40:26 2012
From: dpavlin at rot13.org (Dobrica Pavlinusic)
Date: Fri, 1 Jun 2012 15:40:26 +0200
Subject: [Koha-patches] [PATCH] Bug 7844 - plack intranet tooling for
developers
Message-ID: <1338558026-22809-1-git-send-email-dpavlin@rot13.org>
koha.psgi example and plackup.sh script to run any Koha site
intranet or opac interface under plack with optional multi-process
Starman server
plackup.sh site-name [intranet]
site-name is used to find config /etc/koha/sites/site-name/koha-conf.xml
All configuration is specified in koha.psgi, which you are welcomed to edit
and tune according to your development needs.
When you are happy with it, rename it to site name and save it for safe-keeping.
Test scenario:
1. install plack and dependencies, as documented at
http://wiki.koha-community.org/wiki/Plack
2. start ./plackup.sh sitename
3. open intranet page http://localhost:5001/cgi-bin/koha/mainpage.pl
and verify that it works
4. start ./plackup.sh sitename i[ntranet]
5. open OPAC http://localhost:5000/cgi-bin/koha/opac-main.pl
and verify that it works
6. next step is to take a look into koha.psgi and enable additional
debug modules, save file and reload page (plackup will reload
code automatically)
---
misc/plack/README.plack | 32 +++++++++++++++++++
misc/plack/koha.psgi | 78 +++++++++++++++++++++++++++++++++++++++++++++++
misc/plack/plackup.sh | 53 ++++++++++++++++++++++++++++++++
3 files changed, 163 insertions(+), 0 deletions(-)
create mode 100644 misc/plack/README.plack
create mode 100644 misc/plack/koha.psgi
create mode 100755 misc/plack/plackup.sh
diff --git a/misc/plack/README.plack b/misc/plack/README.plack
new file mode 100644
index 0000000..71593f4
--- /dev/null
+++ b/misc/plack/README.plack
@@ -0,0 +1,32 @@
+Bug 7844 - plack intranet tooling for developers
+
+koha.psgi example and plackup.sh script to run any Koha site
+intranet or opac interface under plack with optional multi-process
+Starman server
+
+ plackup.sh site-name [intranet]
+
+site-name is used to find config /etc/koha/sites/site-name/koha-conf.xml
+
+All configuration is specified in koha.psgi, which you are welcomed to edit
+and tune according to your development needs.
+
+When you are happy with it, rename it to site name and save it for safe-keeping.
+
+Test scenario:
+1. install plack and dependencies, as documented at
+ http://wiki.koha-community.org/wiki/Plack
+
+2. start ./plackup.sh sitename
+
+3. open intranet page http://localhost:5001/cgi-bin/koha/mainpage.pl
+ and verify that it works
+
+4. start ./plackup.sh sitename i[ntranet]
+
+5. open OPAC http://localhost:5000/cgi-bin/koha/opac-main.pl
+ and verify that it works
+
+6. next step is to take a look into koha.psgi and enable additional
+ debug modules, save file and reload page (plackup will reload
+ code automatically)
diff --git a/misc/plack/koha.psgi b/misc/plack/koha.psgi
new file mode 100644
index 0000000..e388dae
--- /dev/null
+++ b/misc/plack/koha.psgi
@@ -0,0 +1,78 @@
+#!/usr/bin/perl
+use Plack::Builder;
+use Plack::App::CGIBin;
+use lib qw( ./lib );
+use Plack::Middleware::Debug;
+use Plack::App::Directory;
+
+BEGIN {
+
+# override configuration from startup script below:
+# (requires --reload option)
+
+$ENV{PLACK_DEBUG} = 1; # toggle debugging
+
+# memcache change requires restart
+$ENV{MEMCACHED_SERVERS} = "localhost:11211";
+#$ENV{MEMCACHED_DEBUG} = 0;
+
+$ENV{PROFILE_PER_PAGE} = 1; # reset persistant and profile counters after each page, like CGI
+#$ENV{INTRANET} = 1; # usually passed from script
+
+#$ENV{DBI_AUTOPROXY}='dbi:Gofer:transport=null;cache=DBI::Util::CacheMemory'
+
+} # BEGIN
+
+use C4::Context;
+use C4::Languages;
+use C4::Members;
+use C4::Dates;
+use C4::Boolean;
+use C4::Letters;
+use C4::Koha;
+use C4::XSLT;
+use C4::Branch;
+use C4::Category;
+=for preload
+use C4::Tags; # FIXME
+=cut
+
+use Devel::Size 0.77; # 0.71 doesn't work for Koha
+my $watch_capture_regex = '(C4|Koha)';
+
+sub watch_for_size {
+ my @watch =
+ map { s/^.*$watch_capture_regex/$1/; s/\//::/g; s/\.pm$//; $_ } # fix paths
+ grep { /$watch_capture_regex/ }
+ keys %INC
+ ;
+ warn "# watch_for_size ",join(' ', at watch);
+ return @watch;
+};
+
+my $CGI_ROOT = $ENV{INTRANET} ? $ENV{INTRANETDIR} : $ENV{OPACDIR};
+warn "# using Koha ", $ENV{INTRANET} ? 'intranet' : 'OPAC', " CGI from $CGI_ROOT\n";
+my $app=Plack::App::CGIBin->new(root => $CGI_ROOT);
+
+builder {
+
+ enable_if { $ENV{PLACK_DEBUG} } 'Debug', panels => [
+ qw(Koha Persistant),
+ qw(Environment Response Timer Memory),
+ # optional plugins (uncomment to enable) are sorted according to performance implact
+# [ 'Devel::Size', for => \&watch_for_size ], # https://github.com/dpavlin/p5-plack-devel-debug-devel-size
+# [ 'DBIProfile', profile => 2 ],
+# [ 'DBITrace', level => 1 ], # a LOT of fine-graded SQL trace
+# [ 'Profiler::NYTProf', exclude => [qw(.*\.css .*\.png .*\.ico .*\.js .*\.gif)] ],
+ ];
+
+ enable_if { $ENV{PLACK_DEBUG} } 'StackTrace';
+
+ enable_if { $ENV{INTRANETDIR} } "Plack::Middleware::Static",
+ path => qr{^/(intranet|opac)-tmpl/},
+ root => "$ENV{INTRANETDIR}/koha-tmpl/";
+
+ mount "/cgi-bin/koha" => $app;
+
+};
+
diff --git a/misc/plack/plackup.sh b/misc/plack/plackup.sh
new file mode 100755
index 0000000..35fcf0f
--- /dev/null
+++ b/misc/plack/plackup.sh
@@ -0,0 +1,53 @@
+#!/bin/sh -xe
+
+# This is plack startup script for Koha
+
+# ./plackup.sh [site] [intranet]
+
+site=$1
+test ! -z "$site" && shift || site=srvgit # default
+
+export KOHA_CONF=/etc/koha/sites/$site/koha-conf.xml
+export LOGDIR="$( sudo -u $site-koha xmlstarlet sel -t -v 'yazgfs/config/logdir' $KOHA_CONF )"
+export INTRANETDIR="$( sudo -u $site-koha xmlstarlet sel -t -v 'yazgfs/config/intranetdir' $KOHA_CONF )"
+export OPACDIR="$( sudo -u $site-koha xmlstarlet sel -t -v 'yazgfs/config/opacdir' $KOHA_CONF | sed 's,/cgi-bin/opac,,' )"
+
+dir=`dirname $0`
+
+# enable memcache - it's safe even on installation which don't have it
+# since Koha has check on C4::Context
+#export MEMCACHED_SERVERS=localhost:11211
+# pass site name as namespace to perl code
+export MEMCACHED_NAMESPACE=$site
+#export MEMCACHED_DEBUG=1
+
+if [ ! -e "$INTRANETDIR/C4" ] ; then
+ echo "intranetdir in $KOHA_CONF doesn't point to Koha git checkout"
+ exit 1
+fi
+
+if [ -z "$1" ] ; then # type anything after site name for intranet!
+ INTRANET=0
+ PORT=5000
+else
+ INTRANET=1
+ PORT=5001
+ shift # pass rest of arguments to plackup
+fi
+export INTRANET # pass to plack
+
+# uncomment to enable logging
+#opt="$opt --access-log $LOGDIR/opac-access.log --error-log $LOGDIR/opac-error.log"
+
+# --max-requests 50 decreased from 1000 to keep memory usage sane
+# --workers 4 number of cores on machine
+#test "$INTRANET" != 1 && \ # don't use Starman for intranet
+opt="$opt --server Starman -M FindBin --max-requests 50 --workers 4"
+
+# -E deployment turn off access log on STDOUT
+opt="$opt -E deployment"
+
+# comment out reload in production!
+opt="$opt --reload -R $INTRANETDIR/C4 -R $INTRANETDIR/Koha"
+
+sudo -E -u $site-koha plackup --port $PORT -I $INTRANETDIR -I $INTRANETDIR/installer $opt $* $dir/koha.psgi
--
1.7.2.5
From christophe.croullebois at biblibre.com Fri Jun 1 16:10:50 2012
From: christophe.croullebois at biblibre.com (Christophe Croullebois)
Date: Fri, 1 Jun 2012 16:10:50 +0200
Subject: [Koha-patches] [PATCH 1/1] Bug 7351 : Patch for minor visual changes
Message-ID: <1338559850-10238-1-git-send-email-christophe.croullebois@biblibre.com>
I have just put a space between the radio button and the text for the new lines..
And I have replaced tabulations by space.
You must have applied before :
"[SIGN OFF]Bug 7351 : feature that allows to delete a range of dates"
"Patch for minor textual changes"
---
.../prog/en/modules/tools/holidays.tt | 66 +++++++++++---------
1 files changed, 36 insertions(+), 30 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
index aa578cf..1cf239c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
@@ -215,36 +215,42 @@
-
-
You can make an exception for this holiday rule. This means that you will be able to say that for a repeatable holiday there is one day which is going to be an exception.
This will delete this holiday rule. If it is a repeatable holiday, this option checks for possible exceptions. If an exception exists, this option will remove the exception and set the date to a regular holiday.
This will save changes to the holiday's title and description. If the information for a repeatable holiday is modified, it affects all of the dates on which the holiday is repeated.
You can make an exception for this holiday rule. This means that you will be able to say that for a repeatable holiday there is one day which is going to be an exception.
This will delete this holiday rule. If it is a repeatable holiday, this option checks for possible exceptions. If an exception exists, this option will remove the exception and set the date to a regular holiday.
This will save changes to the holiday's title and description. If the information for a repeatable holiday is modified, it affects all of the dates on which the holiday is repeated.