Claire Hernandez [Thu, 29 Mar 2012 09:51:37 +0000 (11:51 +0200)]
Merge remote-tracking branch 'origin/dev/solr' into dev/limoges
Julian Maurice [Thu, 29 Mar 2012 09:50:26 +0000 (11:50 +0200)]
Merge remote-tracking branch 'origin/solr/ft/logger' into dev/solr
Sophie Meynieux [Tue, 20 Mar 2012 13:23:35 +0000 (14:23 +0100)]
MT9055 : Modify scheduler to run reports. Adding csv file output, and correct mail sending
(cherry picked from commit
008758f32e7abdd165cd6ccbd097b23f60fb9860)
Claire Hernandez [Thu, 29 Mar 2012 09:26:06 +0000 (11:26 +0200)]
Merge remote-tracking branch 'origin/dev/solr' into dev/limoges
Conflicts solved:
C4/Letters.pm
Julian Maurice [Wed, 28 Mar 2012 14:02:17 +0000 (16:02 +0200)]
[Logger] Take log level into account even if Log::LogLite fails to initialize
+ fix unit tests t/Logger.t
+ remove whitespace errors
Jonathan Druart [Wed, 28 Mar 2012 12:19:06 +0000 (14:19 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9200' into dev/solr
Jonathan Druart [Wed, 28 Mar 2012 12:18:03 +0000 (14:18 +0200)]
Merge remote-tracking branch 'origin/solr/ft/rpn2solr' into dev/solr
Jonathan Druart [Wed, 28 Mar 2012 12:17:38 +0000 (14:17 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9079' into dev/solr
Jonathan Druart [Wed, 28 Mar 2012 12:17:03 +0000 (14:17 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9183' into dev/solr
Jonathan Druart [Mon, 26 Mar 2012 10:10:36 +0000 (12:10 +0200)]
[SOLR][LOGGER] Display callback only if log level <= warning
FIX if logger is called by a script outside of koha (ie. rebuild_solr)
Jonathan Druart [Wed, 28 Mar 2012 07:10:50 +0000 (09:10 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT8894' into dev/solr
Conflicts solved:
C4/Search/Engine/Solr.pm
Jonathan Druart [Tue, 27 Mar 2012 14:44:59 +0000 (16:44 +0200)]
[SOLR][RPN2Solr] TMP: warning to prevent to loose logs
Jonathan Druart [Tue, 27 Mar 2012 14:40:43 +0000 (16:40 +0200)]
autoflushing stdout
Julian Maurice [Tue, 27 Mar 2012 11:53:58 +0000 (13:53 +0200)]
Merge remote-tracking branch 'origin/dev/solr' into dev/limoges
Solved conflicts:
C4/Charset.pm
admin/z3950servers.pl
cataloguing/z3950_search.pl
installer/data/mysql/kohastructure.sql
koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
Julian Maurice [Tue, 27 Mar 2012 11:16:54 +0000 (13:16 +0200)]
Revert "MT7563: Manage claims table with DataTables/Ajax"
This reverts commit
b81a35ad92be6bb1d7c66a662eaf8f977b097387.
Julian Maurice [Tue, 27 Mar 2012 11:16:39 +0000 (13:16 +0200)]
Revert "Merge remote-tracking branch 'origin/solr/ft/MT7563' into dev/solr"
This reverts commit
7ac77f57eab4b31992e2147c485f45a5c6256b06, reversing
changes made to
78f74922d814bc3abbfe2d55eae78d273dd688fd.
Jonathan Druart [Tue, 27 Mar 2012 07:19:04 +0000 (09:19 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9078' into dev/solr
Jonathan Druart [Tue, 27 Mar 2012 07:18:22 +0000 (09:18 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9092' into dev/solr
Julian Maurice [Mon, 26 Mar 2012 14:38:27 +0000 (16:38 +0200)]
Merge remote-tracking branch 'origin/dev/solr' into dev/limoges
Solved conflicts:
C4/Installer.pm
C4/Reserves.pm
C4/Search.pm
C4/XSLT.pm
cataloguing/z3950_search.pl
Jonathan Druart [Tue, 21 Feb 2012 15:37:16 +0000 (16:37 +0100)]
MT8894: FIX encoding in FindDuplicate + routine EscapeString for Solr
Jonathan Druart [Fri, 16 Mar 2012 14:24:46 +0000 (15:24 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8894' into dev/solr
Conflicts solved:
C4/Biblio.pm
Jonathan Druart [Fri, 16 Mar 2012 14:23:35 +0000 (15:23 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8894' into dev/solr
Jonathan Druart [Fri, 16 Mar 2012 14:23:04 +0000 (15:23 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT9218' into dev/solr
Jonathan Druart [Tue, 21 Feb 2012 15:37:16 +0000 (16:37 +0100)]
MT8894: FIX encoding in FindDuplicate + routine EscapeString for Solr
Jonathan Druart [Fri, 16 Mar 2012 09:40:24 +0000 (10:40 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT9045' into dev/solr
Jonathan Druart [Fri, 16 Mar 2012 09:39:45 +0000 (10:39 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT9081' into dev/solr
Jonathan Druart [Fri, 16 Mar 2012 08:56:10 +0000 (09:56 +0100)]
Merge remote-tracking branch 'origin/solr/ft/logger' into dev/solr
Jonathan Druart [Thu, 15 Mar 2012 09:32:47 +0000 (10:32 +0100)]
[SOLR]MT9078: Merging stetienne and limoges features for z3950 search
Jonathan Druart [Fri, 16 Mar 2012 08:27:45 +0000 (09:27 +0100)]
[SOLR][LOGGER] We can't use logger in C4::Context
Jonathan Druart [Thu, 15 Mar 2012 16:08:11 +0000 (17:08 +0100)]
MT9218: Fix Date format for a correct Solr search
Jonathan Druart [Tue, 21 Feb 2012 15:37:16 +0000 (16:37 +0100)]
MT8894: FIX encoding in FindDuplicate + routine EscapeString for Solr
Jonathan Druart [Wed, 14 Mar 2012 14:10:49 +0000 (15:10 +0100)]
Merge remote-tracking branch 'origin/solr/ft/logger' into dev/solr
Jonathan Druart [Thu, 8 Mar 2012 13:32:31 +0000 (14:32 +0100)]
MT9125: Hide biblio if hideatopac for each items and hidenoitems=1
Jonathan Druart [Mon, 5 Mar 2012 15:01:11 +0000 (16:01 +0100)]
MT4587,MT9125: Show biblio at opac if there is no item available.
Jonathan Druart [Wed, 14 Mar 2012 12:41:15 +0000 (13:41 +0100)]
[SOLR] FIX autocomplete in overdue
Julian Maurice [Tue, 13 Mar 2012 15:01:43 +0000 (16:01 +0100)]
Merge remote-tracking branch 'origin/solr/ft/rpn2solr' into dev/solr
Jonathan Druart [Mon, 12 Mar 2012 09:26:18 +0000 (10:26 +0100)]
[SOLR]MT9169: Followup FIX itypes: must be in the query, not in filters
Jonathan Druart [Fri, 9 Mar 2012 09:57:50 +0000 (10:57 +0100)]
[SOLR]MT9169: FIX itypes: must be in the query, not in filters
If these fields are in filters, Solr make an AND operator, we want OR
See the commit introduced this bug:
commit
54777892fd2b23ab6d59c77d7b6858d291852410
Author: Jonathan Druart <jonathan.druart@biblibre.com>
AuthorDate: Wed Jul 13 15:54:18 2011 +0200
[SOLR] Facets Multivalued
Jonathan Druart [Tue, 13 Mar 2012 11:52:54 +0000 (12:52 +0100)]
[SOLR] RPN2Solr: adds a logger function
Claire Hernandez [Thu, 8 Mar 2012 16:09:02 +0000 (17:09 +0100)]
Adds robots.txt.orig in apache DocumentRoot
- Rename it in robots.txt
- Must block main web crawlers
(cherry picked from commit
37cdfd103b70f1ef8caff01ddc78f1615a968d0f)
Jonathan Druart [Mon, 12 Mar 2012 16:26:38 +0000 (17:26 +0100)]
[SOLR] Logger
Replace warn with log
Remove useless warn
Replace syntax warnings
Stéphane Delaune [Fri, 9 Mar 2012 09:31:02 +0000 (10:31 +0100)]
(MT #9183) enable button Hide My Tags
Stéphane Delaune [Fri, 9 Mar 2012 16:54:45 +0000 (17:54 +0100)]
(MT #9079) fix C4::Members::GetMember call's in Letters.pm
Jonathan Druart [Mon, 12 Mar 2012 12:41:40 +0000 (13:41 +0100)]
[SOLR] MT9092: fix statisticvalue field on edit items
Jonathan Druart [Mon, 12 Mar 2012 10:53:13 +0000 (11:53 +0100)]
[SOLR] MT9081: update opac-topissues from the community version
commit
251d873b82bce4b869d2a6351b832e49e957d2c2
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date: Sat Oct 29 08:49:20 2011 +1300
Bug 6947 : opac-topissues.pl wasn't respecting item live itemtypes
commit
af3c7d4ce7af4bfd104c4dc94c5c2da9a7b1863a
Author: Colin Campbell <colin.campbell@ptfs-europe.com>
Date: Mon Nov 29 15:15:47 2010 +0000
Bug 5453 Move declarations out of conditionals in opac
commit
f45969422c55f34edec3145b7e2fa1a85222932f
Author: Owen Leonard <oleonard@myacpl.org>
Date: Thu Jan 13 22:53:51 2011 +0100
Fix for Bug 3459, topissues doesn't take care of ccode
Jonathan Druart [Mon, 12 Mar 2012 09:16:52 +0000 (10:16 +0100)]
Merge remote-tracking branch 'origin/solr/ft/rpn2solr' into dev/solr
Claire Hernandez [Mon, 12 Mar 2012 08:42:59 +0000 (09:42 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8780' into dev/solr
Jonathan Druart [Wed, 7 Mar 2012 14:42:25 +0000 (15:42 +0100)]
DataTables: FIX sort on date if there is no data in cell
(cherry picked from commit
7c4f8f03053442503e9039c26c65786c1f57ac46)
Jonathan Druart [Mon, 5 Mar 2012 16:15:45 +0000 (17:15 +0100)]
RPN2Solr: Simplify the ccl query if contains only @attr 1=1016 and @and
Claire Hernandez [Wed, 7 Mar 2012 14:09:57 +0000 (15:09 +0100)]
Merge remote-tracking branch 'origin/dev/solr' into dev/limoges
Jonathan Druart [Wed, 7 Mar 2012 14:05:49 +0000 (15:05 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8575' into dev/solr
Claire Hernandez [Wed, 7 Mar 2012 12:54:56 +0000 (13:54 +0100)]
Merge remote-tracking branch 'origin/dev/solr' into dev/limoges
Conflicts solved:
opac/opac-search.pl
Julian Maurice [Wed, 7 Mar 2012 10:05:21 +0000 (11:05 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT9103' into dev/solr
Julian Maurice [Wed, 7 Mar 2012 08:25:53 +0000 (09:25 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8362' into dev/solr
Solved conflicts:
authorities/blinddetail-biblio-search.pl
koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tmpl
Julian Maurice [Fri, 25 Nov 2011 12:41:18 +0000 (13:41 +0100)]
MT8362: Squash of 3 commits:
MT8362: auth_finder.pl: improve multiple subfields management
Before this patch, choosing an authority which have multiple subfields
with the same tag, values were joined in a single subfield, seperating
values with a pipe ('|').
Now, if an authority has for example two $x subfields, there will be two
$x subfields in the biblio too. The exception is when the subfield is
not repeatable in the biblio marc framework. In this case, only the
first subfield is copied.
----
MT8362: auth_finder: fix multiple subfields order
----
MT8362: auth_finder.pl: insert fields ordered
Two new javascript functions:
- clear_field: remove cloned subfield and blank all others
- add_subfield: add a new subfield to specified field
blinddetail-biblio-search.pl behaviour is modified to use these two
functions in order to have authority subfields inserted in correct order
(they are no more grouped by subfield tag)
Julian Maurice [Tue, 6 Mar 2012 09:04:30 +0000 (10:04 +0100)]
MT9103: DB connection loss: tools/batchMod.pl
Due to a fork and the end of parent before child end, dbh can be closed
by the parent in the middle of a query executed by the child, causing
connection problems.
The fix is to explicitly close db connection at beginning of child
process to force C4::Context->dbh to create a new handle
Julian Maurice [Tue, 6 Mar 2012 09:01:22 +0000 (10:01 +0100)]
MT9103: Modern::Perl for tools/batchMod.pl
Remove all noisy warnings from logs
Jonathan Druart [Mon, 5 Mar 2012 15:24:21 +0000 (16:24 +0100)]
RPN2Solr: Adds quotes support
Julian Maurice [Tue, 31 Jan 2012 14:06:59 +0000 (15:06 +0100)]
MT8831: Fix a hash key name in opac-search.pl
getItemsInfos returns a hash with a 'availablecount' key, not
'available_count'
When hidenoitems is ON, it hides everything since equality comparison
with 0 returns true
(cherry picked from commit
7b1d61b478a726f14cfefa0471d7781236d37e70)
Jonathan Druart [Wed, 29 Feb 2012 14:15:48 +0000 (15:15 +0100)]
[SOLR] FIX defaultSortOrder in opac and intranet advsearch
Julian Maurice [Mon, 5 Mar 2012 09:25:31 +0000 (10:25 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8884' into dev/solr
Claire Hernandez [Thu, 1 Mar 2012 12:37:17 +0000 (13:37 +0100)]
Merge remote-tracking branch 'remotes/origin/solr/ft/rpn2solr' into dev/solr
Julian Maurice [Wed, 29 Feb 2012 14:58:54 +0000 (15:58 +0100)]
MT9045: Follow up: remove deprecation warnings in suggestion.pl
"Use of qw(...) as parentheses is deprecated"
Julian Maurice [Wed, 15 Feb 2012 13:04:05 +0000 (14:04 +0100)]
MT8884: Fix merge_authority.pl
'use Storable' in merge_authority.pl, otherwise 'retrieve' does not
work.
Pass the full filepath to retrieve, otherwise it will only work if the
script is launched from tmp/modified_authorities directory
+ use warnings
+ warn if unlink fails
Claire Hernandez [Wed, 29 Feb 2012 10:21:56 +0000 (11:21 +0100)]
MT8636 display opac description in ccode limit
Jonathan Druart [Wed, 29 Feb 2012 10:15:32 +0000 (11:15 +0100)]
MT9045: BZ6043: SQL error when IndependantBranches=ON on suggestion
On suggestion page, when IndependantBranch=ON, the SQL built
is wrong:
branchcode is ambiguous
commit on BZ6043:
09e2ee605845e9cb03f21f2596404d60d1e9fc74
Jonathan Druart [Tue, 28 Feb 2012 14:32:11 +0000 (15:32 +0100)]
[SOLR] RPN2Solr: MT9041: FIX Z3950 crash
Now, the z3950 server raise an error when the query is not parsed in
15 seconds
Jonathan Druart [Tue, 28 Feb 2012 09:05:36 +0000 (10:05 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8981' into dev/solr
Jonathan Druart [Tue, 28 Feb 2012 09:00:49 +0000 (10:00 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8577' into dev/solr
Julian Maurice [Mon, 27 Feb 2012 09:40:07 +0000 (10:40 +0100)]
[SOLR] MT8577: Authorities search, 'order by' choice
- Remove 'None' option: when selected, results are order by relevance,
so it is useless
- Add 'Name desc' and 'Usage asc' (and rename 'Name' to 'Name asc' and
'Usage' to 'Usage desc') in "Search main heading" tab
Jonathan Druart [Wed, 22 Feb 2012 11:14:53 +0000 (12:14 +0100)]
[SOLR] Search: Followup Disable submit button after click
Move from .js to .inc for translate processing
Julian Maurice [Tue, 21 Feb 2012 16:49:46 +0000 (17:49 +0100)]
MT8720: Replace '&' by '%26' in redirect url (renewscript.pl)
'&' in JSON string can cause JSON parser errors
Jonathan Druart [Tue, 21 Feb 2012 13:31:42 +0000 (14:31 +0100)]
[SOLR]MT8577: auth search: select the name index by default
Jonathan Druart [Tue, 21 Feb 2012 09:13:33 +0000 (10:13 +0100)]
Merge remote-tracking branch 'origin/solr/ft/indexqueue' into dev/solr
Jonathan Druart [Mon, 20 Feb 2012 13:14:05 +0000 (14:14 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8735' into dev/solr
Jonathan Druart [Mon, 20 Feb 2012 12:43:07 +0000 (13:43 +0100)]
Merge remote-tracking branch 'origin/solr/ft/rpn2solr' into dev/solr
Jonathan Druart [Mon, 20 Feb 2012 12:42:10 +0000 (13:42 +0100)]
Merge remote-tracking branch 'origin/solr/ft/optim' into dev/solr
Jonathan Druart [Mon, 20 Feb 2012 10:13:27 +0000 (11:13 +0100)]
RPN2Solr: Adds logging for z3950 server
Jonathan Druart [Mon, 20 Feb 2012 10:10:04 +0000 (11:10 +0100)]
RPN2Solr: FIX Remove warnings
FIX Subroutine init_handler redefined
FIX Argument "th-en3s" isn't numeric in numeric eq (==) at C4/Search/Query.pm line 101.
Jonathan Druart [Mon, 20 Feb 2012 11:02:00 +0000 (12:02 +0100)]
Optim: Followup FIX Optim JS
FIX tags
Jonathan Druart [Mon, 20 Feb 2012 10:33:28 +0000 (11:33 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8907' into dev/solr
Conflicts solved:
installer/data/mysql/en/mandatory/sysprefs.sql
installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
installer/data/mysql/updatedatabase.pl
kohaversion.pl
Jonathan Druart [Wed, 15 Feb 2012 12:53:46 +0000 (13:53 +0100)]
(SOLR] IndexQueue: FIX mode on pid file
the pid file must be in mode 666 (www-data have to write into it else
caused an error from the App:Daemon module ("recordqueue.pid not writable
by user www-data"))
Claire Hernandez [Wed, 15 Feb 2012 17:23:40 +0000 (18:23 +0100)]
[SOLR] installer mappings config
Claire Hernandez [Wed, 15 Feb 2012 14:09:57 +0000 (15:09 +0100)]
Merge remote-tracking branch 'origin/dev/solr' into dev/limoges
Jonathan Druart [Wed, 15 Feb 2012 14:01:59 +0000 (15:01 +0100)]
[SOLR]MT8735: Followup Perfs disconnect mysql connections after end of script
If we call disconnect unless close all sth, we get a warning.
The doc say:
"This method disconnects the database from the database handle. Normally
called just before exiting the application. If you call this method
while there are active statement handles you will get a warning. Use the
finish method ($sth->finish) for each statement handle defined."
There is ~1000 sth without finish in Koha :-/
Jonathan Druart [Wed, 15 Feb 2012 10:47:18 +0000 (11:47 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT9006' into dev/solr
Julian Maurice [Wed, 15 Feb 2012 10:14:39 +0000 (11:14 +0100)]
Merge remote-tracking branch 'origin/solr/ft/indexqueue' into dev/solr
Julian Maurice [Tue, 14 Feb 2012 16:33:21 +0000 (17:33 +0100)]
Merge remote-tracking branch 'origin/dev/solr' into dev/limoges
Solved conflicts:
installer/data/mysql/en/mandatory/sysprefs.sql
Jonathan Druart [Tue, 14 Feb 2012 11:49:42 +0000 (12:49 +0100)]
[SOLR] IndexQueue: FIX exit if error in thread
Jonathan Druart [Tue, 14 Feb 2012 10:07:36 +0000 (11:07 +0100)]
[SOLR] Indexqueue : FIX add blocking
We can't wait on a "add" if Solr is indexing
Jonathan Druart [Tue, 14 Feb 2012 09:58:28 +0000 (10:58 +0100)]
Revert "[SOLR] IndexRecordQueue modification"
This reverts commit
529a024b3116c8113054571a0d3725884e42a349.
We have to sleep after read each line. Else we can't easily adjusting
with parameters max_delta, max_records and max_interval
Julian Maurice [Mon, 13 Feb 2012 13:10:00 +0000 (14:10 +0100)]
MT9006: DB connection loss: process_koc.pl
Due to a fork and the end of parent before child end, dbh can be closed
by the parent in the middle of a query executed by the child, causing
connection problems.
The fix is to explicitly close db connection at beginning of child
process to force C4::Context->dbh to create a new handle
Julian Maurice [Mon, 13 Feb 2012 13:05:44 +0000 (14:05 +0100)]
MT9006: DB connection loss: manage-marc-import.pl
Due to a fork and the end of parent before child end, dbh can be closed
by the parent in the middle of a query executed by the child, causing
connection problems.
The fix is to explicitly close db connection at beginning of child
process to force C4::Context->dbh to create a new handle
Jonathan Druart [Mon, 13 Feb 2012 12:49:16 +0000 (13:49 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8600' into dev/solr
Jonathan Druart [Mon, 13 Feb 2012 12:48:08 +0000 (13:48 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8745' into dev/solr
Jonathan Druart [Mon, 13 Feb 2012 12:47:00 +0000 (13:47 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8615' into dev/solr
Julian Maurice [Mon, 13 Feb 2012 12:44:14 +0000 (13:44 +0100)]
MT8691: Add syspref AuthSubfieldsToCheck
This syspref is used in BiblioAddAuthority, it contains a
space-separated list of subfields to check to determine if an authority
is equivalent to fields entered by user
Jonathan Druart [Mon, 13 Feb 2012 10:47:43 +0000 (11:47 +0100)]
Merge remote-tracking branch 'origin/solr/ft/optim' into dev/solr
Jonathan Druart [Mon, 13 Feb 2012 10:00:01 +0000 (11:00 +0100)]
MT8907: new OPACNoResultsFound pref
This patch adds a new preference to allow librarians to
add content to the no results found page if they want.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Changed surrounding <p> in template to <div id="noresultsfound">
Will send follow up patch adding sys pref to translated sql files
CF BZ1997
Julian Maurice [Fri, 10 Feb 2012 14:57:24 +0000 (15:57 +0100)]
MT9006: DB connection loss: stage-marc-import.pl
Due to a fork and the end of parent before child end, dbh can be closed
by the parent in the middle of a query executed by the child, causing
connection problems.
The fix is to explicitly close db connection at beginning of child
process to force C4::Context->dbh to create a new handle