Commit graph

8937 commits

Author SHA1 Message Date
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
Jesse Weaver
e957b3d3c7 fix for bug 2488: OPACItemsResultsDisplay/singlebranchmode
This patch changes the template slighly so that these two system preferences do not conflict.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-21 16:50:23 -05:00
Jesse Weaver
adc5d83421 Fix for minor error in shelfbrowser queries
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-21 16:50:11 -05:00
Jesse Weaver
c77969022b fix for bug 2477: Improve Speed of the Shelf Browser
This patch updates the queries for the shelf browser in opac-detail.pl for a
slight performance gain. It also adds a param for dateformat to C4::Auth to
fix a warning.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-21 16:49:49 -05:00
Vincent Danjean
5879ead901 Removing strange dot file
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-20 20:23:54 -05:00
Vincent Danjean
c52357edc6 Still fixing permission and first line of scripts
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-20 20:23:54 -05:00
Vincent Danjean
2a9d85eade No 'BOM' marker for a script file
'#!' must be the first characters

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-20 20:23:54 -05:00
Vincent Danjean
d9ac3b3d33 Shebang line must be the first of the file
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-20 20:23:53 -05:00
Vincent Danjean
908724984a Add support for DESTDIR
Distributions (such as Debian) needs a staging area when building the package

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-20 20:23:53 -05:00
Galen Charlton
98dc396b9b bug 2503: fix minor XHTML errors
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-20 19:27:48 -05:00
Galen Charlton
41af135b31 bug 2503: comment out unneeded warns
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-20 19:27:48 -05:00
Galen Charlton
7c646bbaa6 bug 2503: fix call to AddIssue()
The due date parameter must be a C4::Dates object,
not a date string.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-20 19:27:48 -05:00
Andrew Moore
556d9cc43d bug 2503: refactoring and bugfixing on create_koc_db.pl
This is the script that generates the patron and holdings database for the offline circ module. I
touched up a few parts of it:

* fixed the database syntax to squash a bug or two
* extracted some methods for readability and reuse
* added some documentation
* added a --file and --force command line argument
* made it die if DBD::SQLite is not present. That module is required for this feature.

Here's an example crontab line that will generate the borrowers.db file each midnight.

0 0 * * * create_koc_db.pl --file /tmp/borrowers.db

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-20 17:05:25 -05:00
Andrew Moore
8c4a44ed67 bug 2503: moving offline circulation db generator to misc/cronjobs directory
This script generates a sqlite database of patron and holdings data for the offline circulation tool.
It's a cronjob, so it should go into misc/cronjobs

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-20 17:05:25 -05:00
Kyle Hall
28594dd7dc Added offline circ sqlite database generator.
Signed-off-by: Andrew Moore <andrew.moore@liblime.com>
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-20 17:05:25 -05:00
Andrew Moore
2494108719 bug 2503: updating process_koc.pl to interpret new versions of import file
The file format for the .koc files has changed a few times, and this patch brings
us up to date with the current version.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-20 17:05:25 -05:00
Andrew Moore
fee8c60dc7 bug 2503: tests for C4::Circulation
I'm adding some tests for C4::Circulation methods that I'm altering
to allow the offline circulation tool to use C4::Circulation to upload
its data. These test a bit of the old functionality and try to show
that the new functionality does what I think it does.

C4::Circ::Addissue to tests issuedate
 these also test AddRenewal.
tests for C4::Circ::MarkIssueReturned

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-20 17:05:24 -05:00
Andrew Moore
3d323db1fe bug 2503: removing Force* subs and replacing them with calls to C4::Circulation subs
The offline circulation file processor originally used its own methods to
insert circulation data. This patch takes advantage of the updated
C4::Circulation methods that allow us to specify dates in the past.
This makes the offline circulation file processor use C4::Circulation
functions instead of its own and removes the deprecated subs.

moving from ForceIssue to AddIssue
replacing ForceRenewal with AddRenewal
moving from ForceReturn to MarkIssueReturned
removing deprecated Force* subs
fixing a few bugs in process_koc.pl

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-20 17:05:24 -05:00
Andrew Moore
1de1e05e23 bug 2503: adding dates to some C4:Circulation methods to allow offline circulation tool to specify dates other than today
When uploading an offline circulation file, some actions may need to take place
in the past. This patch adds date parameters to some C4::Circulation methods
to allow us to set dates on them

added issuedate to C4::Circulation::AddIssue
adding issuedate to C4::Circulation::AddRenewal
adding returdate to C4::Circulation::MarkIssueReturned

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-20 17:05:24 -05:00
Andrew Moore
816594bb7b bug 2503: documentation improvements in C4::Circulation
These are some documentation changes that I made to C4::Circulation as
I was writing tests for it.

moved around the docs for CanBookBeIssued. It was in the wrong spot in the file.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-20 17:05:24 -05:00
Kyle Hall
38cf1fd318 Integrated version of the Koha Offline Circulation file uploader. It needs some testing and cleanup, but it works.
Signed-off-by: Andrew Moore <andrew.moore@liblime.com>
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-20 17:05:24 -05:00
Ryan Higgins
19781ab1b3 bug 2530 : create new date object in javascript function instead of modifying passed-in reference.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-20 16:56:25 -05:00
Jesse Weaver
4712745527 fix for bug 2528: installation fails with confusing error message
This makes the dns check happen earlier, and fail humanely if there is a problem.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-19 13:40:25 -05:00
Joe Atzberger
6e53a31357 Bug #2429, bad HTML from unclosed <head>.
Also some cleanup of opac-showmarc script including removing bogus
dependencies (DBI, CGI methods).  Should consider using C4::XSLT if
applicable.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-19 13:40:18 -05:00
092e474389 Fixing a couple of minor markup issues.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-19 13:40:11 -05:00
Galen Charlton
8588c7d79e bug 2527: avoid targeting of items on hold shelf
SQL fix to properly ensure that if an item is on
the hold shelf, it will not be used for request
targeting, which applies only to items that are
not already on the hold shelf.

Prior to this fix, when checking out an item on the
hold shelf that fills patron A's hold request, it
was possible for that request to not be marked as
filled if another patron had an item-level request
on the item; the second patron's request was
incorrectly targeted by that item.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-18 07:17:36 -05:00
Andrew Moore
daa2a04223 Bug 2524: improving the submitted test reports
switching from 'prove' to 'perl' to run the test scripts when we're preparing
them to be submitted to smolder. Prove adds an additional summary at the end
of the test run which confuses the TAP parser in smolder. It thinks that an
additional test has been run, and it fails it.

Then, I added a '-' before the command in the Makefile. THat's so that even
if 'perl' returns a failing code (because some tess failed), the rest of the
rules are run and a report gets submitted. Othewise, only passing reports
get sent.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-18 07:17:34 -05:00
Andrew Moore
481929bd5e bug 2525: fixing tests for misc/cronjobs/longoverdue.pl
This patch fixes the tests so that they include the new required parameters for longoverdues.pl.

This patch also doesn't include a test script that accidently got in the last one.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-18 07:17:25 -05:00
Andrew Moore
dff4d760f6 Bug 2524: Adding script to submit test reports to smolder server
This patch adds a target in the t/Makefile and a script in t/smolder_smoke_signal
to submit the results of test runs to a smolder server. It will allow users to submit
their own test results to a central location by running "make submit" from the t/
directory.

Smolder is a web-based application that aggregates and presents the output of
tests. We have an instance running at:
http://arwen.metavore.com:8000/app/public_projects/smoke_reports/1

More information about using smolder for Koha is available at:
http://wiki.koha.org/doku.php?id=en:development:smoke_reports

I intend to have the test suite run each night automatically and the results
sent to the smolder server. This will help us keep track of the current state
of the the code and possibly catch bugs introduced by changes. I encourge others
to submit their own test results if they want, especially if they are on an unusual
platform or are with a non-standard configuration.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-18 07:16:35 -05:00
Andrew Moore
7a80acb1e1 bug 2526: removing DEBUG flag from C4::Search
The DEBUG flag was left turned on.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-18 07:16:11 -05:00
Galen Charlton
4c037341e4 bug 2522 [1/3]: DB rev 3.1/001 - hold request targetting
For bug 2522, add a new table called hold_fill_targets to
implement hold request targeting.  This table
has the following columns:

  borrowernumber     - identify request
  biblionumber       - ditto
  itemnumber         - item targeted to fill request
  source_branchcode  - current location of item
  item_level_request - if 1, request is item-level

For bug 2331, adds a column called item_level_request
to tmp_holdsqueue.

Note: both of the item_level_request columns can
go away once reserves is modified so that
it is clear whether a request is item-level or
bib-level.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-18 07:16:08 -05:00
Galen Charlton
dee5f4945b bug 2523: add columns to holds queue report
* added author, ccode, location, and item enumchron
* sorted by collection, locatoin, call number, author, title

As part of this patch, commented out the JavaScript tablesorter,
which could cause the browerer to lock up if the picklist
contains more than a couple hundred items to pull.
Some sort of pagination is clearly required, but since
it is necessary for customers to be able to print out
the picklist, there still needs to be an option to
see the complete list for a branch.

This patch includes the final component of the fix
for bug 2331.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-18 07:15:58 -05:00
Galen Charlton
8b48780665 bug 2522 [2/3]: C4::Reserves support for request targeting
_Findgroupreserve, which identifies which hold request an
item should fill, is modified to check to see if
that item is targeted to fill a specific hold request.

It first checks for a targeted match with an item-level hold request,
then a targeted match with a title-level request.  If no
such targeted match exists, it then checks for the top entries
in the holds queue.

The hold targeting map (i.e., the hold_fill_targets table) is
populated by the build_holds_queue.pl batch job.  If that
job is not used, the behavior of _Findgroupreserve
is not changed.

This patch also

* adjusts ModReserveMinusPriority so that it calls
  _FixPriority().
* adjusts circ/returns.pl so that it
  correctly detects transfers.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-18 07:15:52 -05:00
Galen Charlton
516ba77b8b bug 2522 [3/3]: populate hold_fill_targets
This batch job now automatically populates the
holds request targeting table hold_fill_targets.

This patch is essentially a revamp of the job,
and includes fixes for the following bugs:

2281 (holds queue report including unavailable items)
2331 (holds queue report not working with item-level
      holds)
2332 (holds queue script should attempt to fill
      many requests as possible).

Several functions in this batch job are candidates
for being moved to C4::Reserves:

GetBibsWithPendingHoldRequests()
GetPendingHoldRequestsForBib()
GetItemsAvailableToFillHoldRequestsForBib()
MapItemsToHoldRequests()

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-18 07:15:49 -05:00
Jesse Weaver
c6e2bcf67d Fix for bug 2155: duplicate checkin box on returns screen
This changes some css and markup to make the return box at the top not show when one is on the checkin screen. It also moves the markup for the autocompleting search box to its own file.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-18 07:15:43 -05:00
Joe Atzberger
49bf046701 Prevent compilation errors from complex C4 import/export.
SIP code uses UNIVERSAL modules that do not tolerate the circular deps in
C4, specifically, in Auth.pm.  Changing the order so that UNIVERSAL follows
the other imports is important to avoiding failures like:
  perl -w -e 'use UNIVERSAL qw(can); use C4::Auth;'
    "MarkIssueReturned" is not exported by the C4::Circulation module

This patch should resolve the problem earlier seen with Shelves too.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-18 07:15:39 -05:00
Galen Charlton
1999d41392 bug 2341: OPAC title-level holds permitted when items are on-order
Changed so that the presence of an on-order item (items.notforloan =- -1)
permits a title-level hold request to be made.  Prior to this patch,
if all of the items linked to the bib were on-order, no title-level
request was permitted.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-18 07:15:32 -05:00
Galen Charlton
2450444c76 bug 2502: correctly check patron account expiration
When placing a hold request from the staff interface,
now correctly indicate if the patron account has expired.
Prior to this patch, would warn that the account
had expired even when the expiry date is in the future,
and vice versa.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-18 07:15:31 -05:00
Galen Charlton
26469d87a2 bug 2520: don't change item-level requests to bib-level
Prior to this fix, changing the priority of any hold requests
in the queue of requests for a bib would convert
all item-level requests to title-level requests.

As part of this fix, improved display of the holds queue
so that item-level and bib-level requests can be more
clearly distinguished.

Documentation note: new screenshot of list of requests for
a bib in the staff interface.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-18 07:15:28 -05:00
Galen Charlton
ac105c4a88 bug 2521: distinguish types of hold requests
Title-level and item-level requests are now more
clearly distinguished in the patron details page
and the patron checkout page.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-18 07:15:26 -05:00
Galen Charlton
80a7d712aa bug 2518: remove useless patron and branch lookups
AddIssue does not use the results of the lookup
of the patron whose hold request was preempted
by the issue.  This patch now leaves a no-op in
the '$restype eq "Waiting"' test, but I'm not going to
refactor the hold cancellation logic now.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-18 07:15:24 -05:00
Galen Charlton
c7bc867695 bug 2519: clear waitingdate if request is moved off waiting status
* Changed C4::Reserves::ModReserve so that if using it to take an
  item off the hold shelf, reserves.waitingdate is cleared.
* Improved POD.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-18 07:15:21 -05:00
Michael Hafen
f7c12ef49a Have zebrasrv log less
Better to fill the hard drive with biblio than with zebra logs ;)

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-13 16:37:07 -05:00
Chris Nighswonger
6eac5c7b1b kohabug 2507 Fixing labels search to indicate keyword rather than title search
Documentation may require an updated screen shot

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-13 16:35:21 -05:00
Joe Atzberger
18ced6629d masthead - realign terminology for Tag Cloud
Tag Cloud should link to user-generated tags, in a cloud display.
What used to be called "Tag Cloud" (ISBD subject links for UNIMARC libraries)
should be called a "Subject ...".  AFAICT it doesn't currently use a "cloudy"
display, so some other term might be more appropriate.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-13 16:09:37 -05:00
3f7b539444 Fixing a couple of bugs in the package
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-12 19:47:58 -05:00
fd5f22a699 Working on preconfiguring for the package
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-12 19:47:58 -05:00
c5f8fd9e56 Bumping patch number, new package release
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-12 19:47:58 -05:00
f2b92fe4d6 Starting work on the postinst file
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-12 19:47:58 -05:00
b70b86f36d More work on packaging
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-12 19:47:57 -05:00