Commit graph

263 commits

Author SHA1 Message Date
Paul POULAIN
0e2b065219 NoZebra : removing . and : before indexing
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-02-19 20:27:36 -06:00
Paul POULAIN
e78f1f8bd2 BUGFIX NoZebra search (removal of adv zebra keyword bugguy)
This patch also add some if $DEBUG on warns

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-02-19 20:27:25 -06:00
Paul POULAIN
aeb0e1988b bugfixing scan index for UNIMARC
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-02-16 11:18:30 -06:00
Galen Charlton
70dccacee5 FRBR: configure PazPar2 during installation
Also added koha-pazpar2-ctl.sh to start and stop
PazPar2.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-02-11 16:35:18 -06:00
Galen Charlton
94f32e2873 FRBR: fixed paging through grouped results
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-02-11 16:35:17 -06:00
Galen Charlton
84233f4b6d FRBR: added OPAC search result grouping option
Because this feature is experimental, the syspref will
not be added to the list just yet.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-02-11 16:35:17 -06:00
Galen Charlton
35249f48e4 more experimental work on grouping with pazpar2
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-02-11 16:35:14 -06:00
Paul POULAIN
1262c3b341 switching home and holdingbranch (rewritten)
This is an improvement of a patch that has previously been rejected: I wanted to display holdingbranch, kados prefer homebranch
(and in fact it depends on the library choice...)
now, the library can choose, thanks to HomeOrHoldingBranch syspref.

Note that I have changed the description of the syspref to reflect this new use

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-02-11 06:05:54 -06:00
Galen Charlton
d92eb0373e experiment: use PazPar2 to group related works
The approach is to use PazPar2 to search just one
target, the biblio Zebra database.  The results
of each set are merged by PazPar2 to generate a
hitlist that combines related bibs together; as an
example, if a library has the first Harry Potter
book in three languages and an audiobook format,
the hitlist should ideally return one result
for the work that includes links to the individual
bibs.

The new module C4::Search::PazPar2 implements a
simple client for PazPar2's XML-over-HTTP API.  It is
designed to be generic, and thus may end up getting
moved out of Koha to become a stand-alone CPAN module.

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-02-08 06:01:39 -06:00
Galen Charlton
ed6131ccbd quell warnings for SimpleSearch under 'use warnings'
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-02-08 05:48:55 -06:00
Henri-Damien LAURENT
f91a41970d Adding OpacHighlightedWords system preference
Disable or Enable the display of query terms in the biblio.

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-01-25 16:52:15 -06:00
Joshua Ferraro
d205be1ba2 fix for bug 1736: Zebra searching, " " quotes cannot access second page when used
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-01-03 23:29:04 -06:00
Galen Charlton
6a903c85b9 removed extra 'my' that was causing a masking warning
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-01-03 16:25:47 -06:00
Galen Charlton
b7c35853f2 item rework: do not allow bulkedit to update items
This patch is meant to guarantee that a bulkedit
does not try to edit an item tag embedded in a MARC
biblio without updating the items feature.  It is
not a comprehensive fix of the bulkedit feature, which
currently does not appear to be functional and
needs some thought:

* The general search results is probably not the
  best place to put this feature -- it should
  probably be in tools.
* A bulk edit of something like items is desireable,
  but needs to be designed so that it respects
  business logic for circulation and acquisitions.

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-01-03 16:23:47 -06:00
Joshua Ferraro
5c23369af2 Fixing Database Definitions for Statuses *PARTIAL*
Prior to this fix, the status fields had three 'off' values, NULL, "",
and 0. I've reduced it to two in the db, removing the option for NULL, and
setting the default value to 0, however, we need to verify that we don't ever
write out as "" as this needlessly complicates the indexing process,
critical for searching or limiting by status (e.g., availability). Also,
queries that attempt to write a NULL value to one of these fields will fail
(based on my tests).

This patch includes the following changes:

* Updated the database definition for notforloan, damaged, itemlost, and
wthdrawn in kohastructure.sql to forbid NULL and default to 0; MySQL
can't forbid other values (such as empty ""), so this has to be handled
at the application layer and REQUIRES further patching.

* Fixed the 'limit by availability' query node in Search.pm to use a
much less confusing definition of 'available'

* Added code to set values to 0 where they are NULL or empty ( "" ) for
notforloan, damaged, itemlost or wthdrawn in both the MARC and the items
table:

  * Biblio.pm -> AddBiblioAndItems
  * catalogue/updateitem.pl
  * SEE NOTE BELOW, REQUIRES UPDATE TO THE REST OF KOHA'S ITEM MGT!

* Removed code in bulkmarcimport.pl that sets notforloan status depending
  on item-level or bib-level itemtype -- that flag is designed to be set
  only to override the notforloan setting for the item's (or bib's,
  depending on the syspref) assigned itemtype (it doesn't need to override
  to 'for loan', only to 'not for loan').

  added $dbh->do("truncate zebraqueue"); when operation is 'delete'

* I updated some notes in catalogue/updateitem.pl as to why ModItem can't be
used -- we don't have _a_ place where we can change the item and marc :/

  I've tested the following:

  bulkmarcimport.pl..........................MARC/items OK
  Staged Records Import......................NOT OK
  updateitem.pl (via moredetail.pl)..........MARC/items OK
  circulation.pl.............................NOT OK
  returns.pl.................................NOT OK
  addbiblio.pl...............................NOT OK
  additem.pl.................................NOT OK

Basically, there isn't a single place to apply this patch that will
update both item data and MARC data in one place ... a future patch
needs to address this issue.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-01-03 16:23:04 -06:00
Joshua Ferraro
05290bb1b5 Improving searchhighlightblob, similar to Paul's patch:
1. doesn't remove author_nospan, and <span>s around bib fields for
display, perhaps they should just get a separate style?

2. using subfields now

3. improved ability to highlight small words (3 chars and less)

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-01-03 01:39:13 -06:00
Henri-Damien LAURENT
ee252ad5af NZSearch debugging
Adding NZoperatorAND NZoperatorOR NZoperatorNOT
Using NZOperatorAND NOT in NZanalyse
Some problem solved.

Please test.

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-01-03 00:48:26 -06:00
Joshua Ferraro
07349a7c2f fix to enable separate imageurls for item-level itypes
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-30 17:00:55 -06:00
Joshua Ferraro
c70df80694 Search.pm Bugfixing
Getting Search.pm air tight ... cleaned up some local variables
that were declared global

fix to asynchronous federated searching lost since dev_week, immediate
use is authority search

template fixes to item-level itemtypes and bib-level itemtypes

temp workaround to javascript problems preventing item edits

fix to installer

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-28 08:32:24 -06:00
Joshua Ferraro
1a7a650ea2 improve embedded documentation and perldoc
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-28 08:32:15 -06:00
Paul POULAIN
d46958af51 replacing SHELF_LOC by LOC, as decided with kados on the chat
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-26 14:33:02 -06:00
Paul POULAIN
a553ea88b1 fix to handle notforloan authorised values (we now handle wthdrawn, itemlost, damaged AND notforloan fields)
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-26 14:32:59 -06:00
Joshua Ferraro
8903f62102 fix for bug 1688
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-23 15:01:06 -06:00
Joshua Ferraro
d17f7e8ab0 expandtab, retab, tabstop=4
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-23 15:00:57 -06:00
Joshua Ferraro
1647ab1874 Revert "Merging hdl's Search.pm changes"
This reverts commit 51ec728f7b.

That commit basically reverted 95% of the status handling I'd done
last week ...

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-23 14:50:37 -06:00
Joshua Ferraro
dcb3858ffd Several important commits:
* adding zebra daemons for managing server and queue processes
  * improvements to the README.debian file
  * Fixes to Search.pm since last series of commits broke zebra-based
    searching (again)
  * moving some files to new misc/bin and misc/cronjobs

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-22 18:26:39 -06:00
Chris Nighswonger
51ec728f7b Merging hdl's Search.pm changes
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-21 19:47:37 -06:00
Chris Nighswonger
da9fdead92 Rolling back changes made to NZ search elements
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-21 11:11:58 -06:00
Joshua Ferraro
1dc6baabcc fixing zebra searching after recent commits 2007-12-20 21:45:55 -06:00
Chris Nighswonger
adab2825dc Initial fix for NoZebra advanced search problems when searching with no query and only limits (ie. itemtype)
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-20 19:21:30 -06:00
Henri-Damien LAURENT
065870272b BUG Fixing : NoZebra search
Bug fixing search on alphanumeral string such as EN0 couldnot work.
Bug fixing AND would be too much restrictive on results (required count of occurence of search criteria to be the same).

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-20 18:38:44 -06:00
Henri-Damien LAURENT
e84d4158a3 SearchNZ : multiple words AND was an OR
my $biblionumbers was badly placed
renaming operand into operator

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-20 18:37:47 -06:00
Joshua Ferraro
3edaba0cc0 fixes to search results list, ccl.properties tweak
patch updateitem.pl (was failing ... missing 'my')
update OPAC results
fix limit by availability

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-20 17:35:46 -06:00
Chris Nighswonger
64a4eddd44 2nd try:Fixed buggy NoZebra cataloguing search when search term does not exist in any record.
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-20 07:34:09 -06:00
Chris Nighswonger
6d13d44655 Fixed buggy NoZebra cataloguing search when search term does not exist in any record.
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-20 07:34:06 -06:00
Joshua Ferraro
de04e990f2 Merge branch 'master' of http://manage-gmc.dev.kohalibrary.com/koha-installer 2007-12-19 13:48:55 -06:00
Joshua Ferraro
b079651843 incorect syntax fix
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-18 19:34:48 -06:00
Galen Charlton
d579648df1 Merge git://git.koha.org/pub/scm/koha 2007-12-18 17:46:54 -06:00
Mason James
163d3f4bd6 index=kw searches now search all indexes for nozebra
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-18 16:39:17 -06:00
Joshua Ferraro
a65502ba1a case-insensitive match on query highlighting
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-18 04:47:17 -06:00
Joshua Ferraro
7a3e596813 fix for bug 1658: <span class="term"> in search terms
Also, adds google-style search query highlighting anywhere
in the record

Need to check if this fix is in the OPAC

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-18 04:47:16 -06:00
Joshua Ferraro
795463f55b fix for bug 1604: when doing a 'scan', "count" isn't displayed
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-17 22:28:59 -06:00
Joshua Ferraro
c9dabd5d22 improvements to query_desc and limit_desc
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-17 12:52:42 -06:00
Joshua Ferraro
fcc3986cfd Updates to date indexing and search processing
Summary of Koha 3.0 date indexing for MARC21:

Index                   Expected format         Notes
-----------------------------------------------------
date-entered-on-file    [yymmdd]                (008/0-5, indexed in word and sort indexes)
copydate                [yyyy]                  (260$c, indexed in word and sort indexes)
acqdate                 [yyyy-mm-dd]            (952$d, indexed in date,word,sort indexes)
pubdate                 [yyyy]                  (008/7-10, indexed in year,word,sort indexes)

Template Search Parameters Tested:
        limit-yr (either yyyy or yyyy-yyyy) (added processing for ge le, structure attribute st-numeric, etc.)
        yr pubdate (yyyy)
        acqdate,st-date-normalized (yyyy-mm-dd)

Template Sort Parameters Tested:
        pubdate_dsc
        pubdate_asc
        acqdate_dsc
        acqdate_asc

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-17 12:00:30 -06:00
Joshua Ferraro
bbe759bde6 fix to add wordlist default when QueryStemming is off
also, a fix to default behavior when QueryWeighting is off

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-17 12:00:18 -06:00
Galen Charlton
f5903fbbb5 installer: location of koha-conf.xml
* rewrite-config.PL now puts in installed location
  of koha-conf.xml in C4/Context.pm so that
  correct config can be found even when
  KOHA_CONF is not set.  Note that setting KOHA_CONF
  will still override path set by installer.
* changed references from koha.xml to koha-conf.xml
2007-12-17 09:13:53 -06:00
Mason James
0c254c1f1f quickfix for adv. searching in nozebra.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-14 23:05:36 -06:00
Paul POULAIN
6da5ad063f NoZera don't handle fuzzy/stemming/weight
so ignoring those sysprefs

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-13 17:57:03 -06:00
Joshua Ferraro
1cd20471ba fix for bug introduced recently if due_date is null, search failed 2007-12-13 04:28:35 -06:00
Joe Atzberger
12cf1799fe Search.pm -- Dates.pm (the correct way) and remove hard coded (on) DEBUG variable!
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-12 07:51:30 -06:00