Commit graph

103 commits

Author SHA1 Message Date
Frère Sébastien Marie
0ad7e76cb7 Bug 7282 - invalid language selection
- ensure that without cookie, language selection is based on browser
  preferences
- refactor function to obtain langugage for stem in search (opac + intranet)

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

To reproduce the bug:

- Activate en and fr-FR for OPAC
- Clear your browser cookies
- Select your language preference in your browser: fr, fr-fr, en
- Load OPAC main page
- OPAC is displayed in English, rather than French as asked by browser
  preferences

  Apply the patch and test:

  - Clear your browser cookies
  - Load OPAC main page
  - Pages are displayed in French

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-16 14:20:11 +01:00
Paul Poulain
37902b25a7 Bug 6840 warning in logs
In staff interface, in search (catalogue/search.pl), there is a warning saying:
[Fri Sep  2 18:20:24 2011] search.pl: Use of uninitialized value $key in hash
element at /home/paul/koha.dev/koha-community/C4/Templates.pm line 227.

The problem happens when searching from the quick search toolbar, not when you
search from advanced search.
Investigating, it seems it's because the sort_by is not defined in this case.

This patch
* fixes the problem in Search.pl by setting the parameter only if there is a sort_by field
* modify te Template->param sub to get a better error message. Instead of having just "use of uninitia..." get the value you try to set to an empty key. Much easier to understand which line causes the problem

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-10-13 16:17:33 +13:00
6b8be20497 Bug 6755 Problems with switching languages
This patch solves the situation that news is in another language than
the Koha interface AND makes that themelanguage routine is always called
the same way in order to prevent mixed display.

It fixes also a bug related to language preselection based on web
browser prefered language.

September 9: Adjusted with input of Frederic Demians.

Septembre 10: Avoid circular dependency, as pointed by Chris Cormack.
Templates related functions are moved from C4::Output to C4::Templates

Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-23 09:47:09 +12:00
Chris Cormack
5a2fc683d8 Bug 6656 : Fix for advanced search not respecting default sort order
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-01 21:06:12 +12:00
Colin Campbell
129d97df97 Bug 5453: Move declarations from within conditionals in catalogue/search.pl
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-15 15:50:21 +12:00
Magnus Enger
9efdfa1ba2 Bug 6510 - [REVISED] Sort by in intranet search alters search and number of hits
This patch uses .*? instead of .*

To test:
- In advanced search in the intranet choose Author as the search index
- Do a search for an author, check the number of hits
- Choose another value than the default from Sort by
- Check that the number of hits is the same as for the original search, once
  the hits have been re-ordered

Signed-off-by: MJ Ray <mjr@phonecoop.coop>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-26 08:23:21 +12:00
Fridolyn SOMERS
a8f5bf93f9 BUG6091 Remove undeclared syspref OPACAdvSearchInputCount
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-05-28 19:03:33 +12:00
Chris Cormack
1e7c5166aa Merge remote branch 'kc/master' into new/enh/bug_5917 2011-04-08 14:29:21 +12:00
Colin Campbell
0cf2eccfe9 Bug 5529 Absence or Presence of lists not being reliably returned
C4::VirtualShelves::GetRecentShelves contained some rather confused
code The contents of the requested list are returned in an arrayref
which was in its turn being wrapped needlessly in an array
As a result the returned array always consisted of a single element
irrespective of the number of lists.
Made the routine return the arrayref, which can now be tested directly
Unfortunately rather than fixing this we had previously coded around it
assuming it to be a "design" decision. Have amended other calls of
the subroutine resulting in some hopefully less obscure code

Fixed logic error in the results template which displayed new list
within a test for the presence of lists

Removed the offset parameter from the sql in the routine as it was hardcoded
to 0 i.e. the default value

Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 10:51:47 +12:00
Chris Cormack
fe331a0209 Merge remote branch 'kc/master' into new/enh/bug_5917
Conflicts:
	installer/data/mysql/updatedatabase.pl
2011-04-08 07:12:06 +12:00
Henri-Damien LAURENT
700de9664d (Bug 4049) Searching itemtypes returning noise
Fix the problem of searching on partial itemtypes strings
for instance, itemtype="ARTICLE DE PERIODIQUE", itemtype="PERIODIQUE"
searching on itemtype="PERIODIQUE" would also get "ARTICLE DE PERIODIQUE"

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 15:54:00 +12:00
Chris Cormack
eb4ad6e44e Merge remote branch 'kc/master' into new/enh/bug_5917 2011-04-03 22:35:24 +12:00
ruth@bywatersolutions.com
8548b804f4 Bug 5305: CCL query, then resort, loses reults.
If you did a CCL query, then attempted resort, you would get the advanced-search page,
because of wonky URL escaping of the q= clause.  This patch fixes that.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-31 21:18:29 +13:00
Chris Cormack
a3e59f3bf2 Bug 5917 : FIxing problem with comma in variable names 2011-03-30 21:53:13 +13:00
Jared Camins-Esakov
51604b5487 Bug 4393: Scan Indexes results cannot be sorted
Because of the way Scan Indexes works, the results cannot be sorted. Previously
when any sort other than relevance (or in some cases popularity) was used, the
search failed. This patch disables sorting on Scan results. This patch also
fixes the index selection dropdown on the results page, which was not being
populated correctly from the Advanced Search screen.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-30 19:51:52 +13:00
Paul POULAIN
091d310016 Bug 3629 : search limit by group is not OK
MT4491 : limitation by library group

- the group list was not displayed in OPAC (even if everything else was here
- the group limit was not working due to a missing ()

author=jean et group=droit" resulted in:
author=jean and branch=b1 or branch=b2 or branch=b3
that is wrong (executed from left to right)

the fix add () to have :
author=jean and (branch=b1 or branch=b2 or branch=b3)
that is OK

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-30 12:37:50 +13:00
265ed53f12 3154 Preferences for building facets (functionality)
Based on patch from Fridolyn Somers with input of Frederic Demians.
Added new Searching preference maxRecordsForFacets.
This pref contains number of result records used in facet building.
Also added pref displayFacetCount (with thanks to Frederic).
Follow up patch takes care of install issues; functionality can already be tested with this patch only.

Updated on March 17 for changes in include files.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-22 20:53:28 +13:00
Paul Poulain
ddbedbfc2f Bug 4330 : Adding some copyright BibLibre statements 2011-03-21 10:57:20 +13:00
Chris Cormack
76d52d89e4 Merge remote branch 'kc/new/enh/bug_3659' into kcmaster 2011-03-15 15:58:26 +13:00
251e2c4d74 Fix for Bug 3659, Add place hold option from patron checkout tab
Adds a button on patron-related pages, "Search to hold"
Clicking search to hold sets a cookie with the patron's
borrowernumber and sends the user to the search page.

On subsequent search results pages the user will have
the option to place holds specifically for the remembered
patron. This works on the search results page (single
and multiple hold) and on the detail page.

The saved cookie will time out after 10 minutes or
be erased when a new patron is loaded by circulation.pl

New jQuery plugin added: jquery.cookie.min.js

Revision fixes some markup and corrects an error that would lead
to the hold being initiated for the remembered patron when this
was not intended.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-15 15:48:09 +13:00
ee3707d0de Bug 4103 In Pro Adv Search, superlibrarian search always all libraries
Now, when 'independantbranches' syspref is activated, 'Individual Libraries'
combo list is set by default to the current user branch. It shouldn't be the
case for superlibrarian user who is supposed to manage all libraries.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-05 20:32:56 +13:00
Chris Cormack
e1b1c43425 Revert "Fix for Bug 3659, Add place hold option from patron checkout tab"
This reverts commit da2040634e.

Wrong patch was applied
2011-01-25 06:24:32 +13:00
da2040634e Fix for Bug 3659, Add place hold option from patron checkout tab
Adds a button on patron-related pages, "Search to hold"
Clicking search to hold sets a cookie with the patron's
borrowernumber and sends the user to the search page.

On subsequent search results pages the user will have
the option to place holds specifically for the remembered
patron. This works on the search results page (single
and multiple hold) and on the detail page.

The saved cookie will time out after 10 minutes or
be erased when a new patron is loaded by circulation.pl

New jQuery plugin added: jquery.cookie.min.js

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-24 20:43:04 +13:00
Robin Sheat
13bc505c5f bug4891 - sort facets in search sidebar (OPAC and staff client)
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-19 07:24:16 +13:00
bd90bb02a4 Corrected patch for Bug 4520, facets "show more" doesn't work
Re-doing Nahuel's fix so that it applies to master

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-15 20:20:42 +13:00
Andrew Elwell
efa66f1f55 Bug 5385: POD Cleanups (part 2)
More podchecker cleanups to eliminate warnings / errors

Signed-off-by: Andrew Elwell <Andrew.Elwell@gmail.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-12 10:06:56 +13:00
b1ed3af633 bug 4311: respect OPACXSLTResultsDisplay
Check OPACXSLTResultsDisplay instead of XSLTResultsDisplay when
determining whether to use the XSLT bib results stylesheet for
OPAC search results.

In the process, added a new $search_context parameter to
C4::Search::searchResults() to specify whether results
are to be served up for the staff interface or for the
OPAC.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-25 11:22:47 -04:00
Jane Wagner
dc0b98eb9e Bug 3093 add syspref to turn off multiholds button
Having the place multiple holds button at the top of the OPAC and staff search results has caused problems for some sites with tight holds policies; this syspref allows those sites to turn off the button.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-11 07:44:17 -04:00
Donovan Jones
b31b5f3620 Bug 2505 - Add commented use warnings where missing in the catalogue/ directory 2010-04-21 20:25:13 +12:00
Lars Wirzenius
034e2c1cbb Fix FSF address in directory catalogue/
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 20:17:49 -04:00
Matthias Meusburger
f00a4a7cfb MT 1976 : Lists are directly displayed through VirtualShelves.pm
(and not through the session, like in opac)
2009-10-02 11:15:16 +02:00
Matthias Meusburger
2a81f0778e Ticket 1110 : Balance carts and lists
In Opac :
Print lists
Carts looks more like lists
Carts "More Details" And "Brief Display" toolbar looks more alike
In Admin :
Search results toolbar now have a "Add To" button for adding to a selected list with a confirmation pop-up, like in OPAC

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-30 11:30:41 +02:00
Jean-André Santoni
f7d5759a0d (bug #3555) This sets the default branch to the logged user branch when IndependantBranches is active
In the advanced search form, when IndependantBranches is activated, the default
branch should be set to the logged user branch.
2009-09-30 11:30:12 +02:00
Henri-Damien LAURENT
6e55d55f06 C4::Search :Enhancements
Stemming is now available for more languages

Adding also getDistinctValues which gets distinct values for a zebra index or for a Mysql field

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-09-30 11:29:24 +02:00
Nahuel ANGELINETTI
17c831399f Delete unused function
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-09-29 19:53:04 -04:00
Garry Collum
54dad0143c Bug 3428: Alphabetizes the collection codes in the Advanced Search.
If the advancedSearchTypes = CCODE, the code descriptions are not alphabetized, as opposed to itemtypes, which are alphabetized.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-07-20 21:24:54 -04:00
Joe Atzberger
af1fb6f0b4 Bug 2539. Remove unintegrated "spsuggest" code from search scripts.
The intent of kohaspsuggest is very confused.  It wanted to simultaneously
log every search query, and get spelling suggestions from a totally different
database_host:db_user:db_password:database.  The implementation seems
never have really made it into 3.0, however, since the only trace of the
tables it wants to query are in misc/migration_tools/22_to_30/phrase_log.sql

The job misc/spellcheck_suggest/make_spellcheck_suggest.pl does not even
target the same remote DB as the syspref tells the search code to do.  Instead, it hits the
local DB and, not finding the tables that have no way of existing in a 3.0
install, it CREATES its own tables spontaneously, using MyISAM storage, no less.
This script should be drastically overhauled, or more likely just removed.

Other fixes:
Commented out unconditional warn!
Also reduced bizarre whitespace amounts in catalogue/search.pl and
fixed warning as recommended by perl -wc:
    Scalar value @newresults[0] better written as $newresults[0]

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-07-14 21:20:25 -04:00
Galen Charlton
17ab0a7532 bug 3263: Staff Search Results Interface Changes
Coding by Rick Welykochy <rick@praxis.com.au>

[1] Three new system preferences to enable particular
bib record views in the staff interface:

viewMARC
viewLabeledMARC
viewISBD

Implements enhancement 2642.

[2] New button in the regular and cataloging search results
   pages in the staff interface to allow the operator to redo
   the search against Z39.50 targets instead of the Koha database.

[3] Added copyright date and edition to cataloging and Z39.50 search results.
    Implements enhancement 2640.

Feature sponsored by MassCat.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-28 06:42:20 -05:00
Galen Charlton
2e08f626f5 remove incomplete bib bulk editing code
Per discussion I had with Henri, removing experimental
bulk editing from the staff search results code, as
feature is incomplete and can be dangerous if
one tries to use it on a large search result
set.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-04-06 10:53:50 -05:00
Mason James
990e315471 The current searching in labels is a bit minimal, and current only does keyword searching.
there is some old 2.2 code for more complete labels-searching, thats been commented out

ive logged a 'bug' for this - 2777

http://bugs.koha.org/cgi-bin/bugzilla/show_bug.cgi?id=2777

this fix...
  - enables the index-searching functionality
  - adds date-ranges
  - uses the numSearchResults syspref, not a hardcoded '20'
  - rewrote old 2.2 page-num code, (didnt work for 3.x)
  - some indent and whitepages tidys.
  - unused 2.2 search-code removed.

Mason

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-12-31 11:15:44 -06:00
Nahuel ANGELINETTI
31c6cd032b (bug #2881) preselect default sorting
This patch just set a variable with the name of default sorting, and value 1

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-12-31 11:10:31 -06:00
Henri-Damien LAURENT
f55d783c25 bug fix 2590 :
seems that when itemtypeimagelocation returns undef, the hash is messed up.
put it at the end of the hash and everything is fine.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-09-08 18:50:29 -05:00
Jesse Weaver
7da895cda7 fix for bug 1771: Template errors with remote itemtype image
This adds a new function, getitemtypeimagelocation, that returns the image
unmodified for absolute urls and returns the proper intranet or opac path
otherwise. It also updates all of the relevant files to use that function.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-21 16:50:29 -05:00
Joshua Ferraro
ad368764e9 2487: Collection code select boxes in Adv search show both code and description 2008-08-09 12:06:04 -05:00
Joshua Ferraro
9f3e6b4a40 Fix for 1863: Result list for 'scan' index searches incorrect after first page 2008-07-14 11:33:13 -05:00
Joshua Ferraro
1e45b14714 Prior to this patch, XSL and scan indexes conflicted.
This patch resolves the issue by passing $scan to the
searchResults function to toggle XSL for scan results
2008-07-08 15:59:09 -05:00
Paul POULAIN
b94ddd6cd3 bugfixing scan index
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-07-08 15:33:36 -05:00
Joshua Ferraro
fee2ddc086 Fix for bug 2212: Searching with Itemtype limit doesn't work
The issue was that the index for itemtype is different depending
on whether you're using item-level or bib-level itemtypes. This
patch detects the system choice and sets the index properly
2008-06-18 13:57:22 -05:00
Joshua Ferraro
6c9b83fbdc Resolves bug 2250: RFC: New System Preference to Determine which 'Types' and associated icons to display in advanced Search
For documentation, please indicate that as part of profiling,
staff can refer to the AdvancedSearchTypes system preference to
choose where to draw the advanced search 'Types' from. Currently
this is implemented as a choice, between itemtypes and ccodes,
but it's been designed to work with any authorised value so long
as an index exists for searching by that authorised value.

By default, and if this syspref doesn't exist, it will pull from
itemtypes as before.
2008-06-18 13:01:20 -05:00
Ryan Higgins
fc98d228c2 Sort dropdowns for libraries by name instead of branchcode in several staff-side interfaces.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-02 00:50:33 -05:00