contrib/Conifer.git
15 years agoBackport r18514 from trunk, more circ speedups when booking not in play
senator [Wed, 27 Oct 2010 21:21:30 +0000 (21:21 +0000)]
Backport r18514 from trunk, more circ speedups when booking not in play

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18515 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agomore micro-optimization of checkin code; protect against undef var warning in info...
erickson [Wed, 27 Oct 2010 20:21:16 +0000 (20:21 +0000)]
more micro-optimization of checkin code; protect against undef var warning in info message; removed unused sub

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18512 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoMove towards unnest (faster than explode_array); bring upgrade script up to speed
miker [Wed, 27 Oct 2010 20:08:52 +0000 (20:08 +0000)]
Move towards unnest (faster than explode_array); bring upgrade script up to speed

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18509 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agosince they typically repeat, cache the org and requestor objects in the permit loop...
erickson [Wed, 27 Oct 2010 19:19:26 +0000 (19:19 +0000)]
since they typically repeat, cache the org and requestor objects in the permit loop of the find-best-hold calculation

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18506 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoBackport of r18494, r18500 and r18501 from trunk: split fine generation
miker [Wed, 27 Oct 2010 19:13:54 +0000 (19:13 +0000)]
Backport of r18494, r18500 and r18501 from trunk: split fine generation

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18504 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoBackport r18502 from trunk: make booking avoidable in circ service (speedup!)
senator [Wed, 27 Oct 2010 19:09:14 +0000 (19:09 +0000)]
Backport r18502 from trunk: make booking avoidable in circ service (speedup!)

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18503 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoremove unused settings and permission
gmc [Wed, 27 Oct 2010 16:57:05 +0000 (16:57 +0000)]
remove unused settings and permission

circ.holds.alert_if_local_avail and circ.holds.deny_if_local_avail
are redundant; circ.holds.hold_has_copy_at.{alert|block} are the
settings that will actually be used.  Also remove a related,
redundant permission.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18496 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoadded grid autoHeight to distrib formula page to prevent the grid from consuming...
erickson [Wed, 27 Oct 2010 15:26:50 +0000 (15:26 +0000)]
added grid autoHeight to distrib formula page to prevent the grid from consuming the whole page

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18492 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoBackport r18489 from trunk: distribution formula UI paging
senator [Wed, 27 Oct 2010 14:53:29 +0000 (14:53 +0000)]
Backport r18489 from trunk: distribution formula UI paging

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18490 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agofix glitch in escaping call number labels
gmc [Wed, 27 Oct 2010 13:51:55 +0000 (13:51 +0000)]
fix glitch in escaping call number labels

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18488 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoView Source option for embedded browser (click on the Debug link)
phasefx [Wed, 27 Oct 2010 05:11:14 +0000 (05:11 +0000)]
View Source option for embedded browser (click on the Debug link)

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18486 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoBackport r18480 from trunk: copy template editor bugfix
senator [Tue, 26 Oct 2010 22:11:57 +0000 (22:11 +0000)]
Backport r18480 from trunk: copy template editor bugfix

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18481 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agofix NACO normalization of four letter modifier characters
gmc [Tue, 26 Oct 2010 19:36:35 +0000 (19:36 +0000)]
fix NACO normalization of four letter modifier characters

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18477 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoinclude more information in the debugging dump; correct the "back to index" link
miker [Tue, 26 Oct 2010 14:00:09 +0000 (14:00 +0000)]
include more information in the debugging dump; correct the "back to index" link

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18470 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoFloating field in alternate item details UI
phasefx [Mon, 25 Oct 2010 19:16:20 +0000 (19:16 +0000)]
Floating field in alternate item details UI

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18468 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoquickly, before anyone notices ... minor speed enhancement (aka, thinko)
miker [Mon, 25 Oct 2010 18:31:58 +0000 (18:31 +0000)]
quickly, before anyone notices ... minor speed enhancement (aka, thinko)

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18466 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoBackport r18462-r18463 from trunk: Remove some connectby() uses and update upgrade...
miker [Mon, 25 Oct 2010 18:23:44 +0000 (18:23 +0000)]
Backport r18462-r18463 from trunk: Remove some connectby() uses and update upgrade script

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18464 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoDump some debugging output from clark; may later make this optional, but we usually...
miker [Mon, 25 Oct 2010 16:25:36 +0000 (16:25 +0000)]
Dump some debugging output from clark; may later make this optional, but we usually need it when looking for the cause of problems.

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18458 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agofurther protection against dreaded opac bank page; wrap settimeout redetail bibtempla...
erickson [Fri, 22 Oct 2010 20:41:09 +0000 (20:41 +0000)]
further protection against dreaded opac bank page; wrap settimeout redetail bibtemplate loading in an onload to ensure it runs after dojo onload events

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18455 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoUse standard JS syntax; var [...] seems to be a Spidermonkey extension
miker [Fri, 22 Oct 2010 19:27:21 +0000 (19:27 +0000)]
Use standard JS syntax; var [...] seems to be a Spidermonkey extension

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18453 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agotypo in setTimeout spotted by dbs
miker [Fri, 22 Oct 2010 16:25:25 +0000 (16:25 +0000)]
typo in setTimeout spotted by dbs

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18451 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoBackport r18448 from trunk, minor acq glitch with view/place orders interface
senator [Fri, 22 Oct 2010 16:24:39 +0000 (16:24 +0000)]
Backport r18448 from trunk, minor acq glitch with view/place orders interface

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18449 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoMove dojo loading around to avoid the "white screen of death" in Firefox and xulrunne...
miker [Fri, 22 Oct 2010 16:21:07 +0000 (16:21 +0000)]
Move dojo loading around to avoid the "white screen of death" in Firefox and xulrunner (See: o.dojotoolkit.org/forum/dojo-foundation/general-discussion/firefox-3-fires-domcontentloaded-event-prematurely )

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18447 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoBackport r18442 from trunk, autogrid cut-off tweak
senator [Thu, 21 Oct 2010 19:33:46 +0000 (19:33 +0000)]
Backport r18442 from trunk, autogrid cut-off tweak

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18443 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoilsevent is no longer a number, but a string. I knew that, but missed this test
phasefx [Thu, 21 Oct 2010 16:12:31 +0000 (16:12 +0000)]
ilsevent is no longer a number, but a string.  I knew that, but missed this test

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18441 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoimprove call number sorting
gmc [Thu, 21 Oct 2010 14:48:12 +0000 (14:48 +0000)]
improve call number sorting

oils_text_as_bytea now does uppercasing in addition
to converting strings to bytea, working around
the limitation that json_query can't stack transforms

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18436 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agouse a transaction when searching for the nearest hold request
gmc [Wed, 20 Oct 2010 21:48:31 +0000 (21:48 +0000)]
use a transaction when searching for the nearest hold request

Solves the following problem in a setup that uses Slony - if
multiple items that can fulfill the same hold are checked
in one after another, occassionally two items will end up
being put in transit for the same hold request.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18433 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoadded some time diagnostics to checkin process; more org unit caching; do less user...
erickson [Wed, 20 Oct 2010 20:45:32 +0000 (20:45 +0000)]
added some time diagnostics to checkin process;  more org unit caching; do less user fleshing on hold user during checkin (only card and name is needed)

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18430 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoThese fields exist ... tell the IDL about them
miker [Wed, 20 Oct 2010 20:45:03 +0000 (20:45 +0000)]
These fields exist ... tell the IDL about them

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18429 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoadd start_date and end_date to scap serialization
miker [Wed, 20 Oct 2010 20:34:11 +0000 (20:34 +0000)]
add start_date and end_date to scap serialization

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18426 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agodon't allow inactive cards with web-selfcheck
phasefx [Wed, 20 Oct 2010 20:15:33 +0000 (20:15 +0000)]
don't allow inactive cards with web-selfcheck

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18424 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoBackport r18421 from trunk
senator [Wed, 20 Oct 2010 20:14:44 +0000 (20:14 +0000)]
Backport r18421 from trunk

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18422 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoBackport r18419 from trunk: supercat bugs on records with serials data attached
senator [Wed, 20 Oct 2010 19:52:20 +0000 (19:52 +0000)]
Backport r18419 from trunk: supercat bugs on records with serials data attached

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18420 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoPatch from tsbere to address backporting issue of hard due dates patch against trunk...
miker [Wed, 20 Oct 2010 19:49:16 +0000 (19:49 +0000)]
Patch from tsbere to address backporting issue of hard due dates patch against trunk (also, get rid of 3-space indentation..)

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18418 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoBackport r18416 from trunk: a/t use rstore to flesh if cstore not available
senator [Wed, 20 Oct 2010 19:36:34 +0000 (19:36 +0000)]
Backport r18416 from trunk: a/t use rstore to flesh if cstore not available

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18417 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoBackport r18414 from trunk
senator [Wed, 20 Oct 2010 17:33:51 +0000 (17:33 +0000)]
Backport r18414 from trunk

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18415 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years ago1.6.1-2.0 upgrade script needs to fall in line with reality, re 0442
miker [Wed, 20 Oct 2010 16:40:14 +0000 (16:40 +0000)]
1.6.1-2.0 upgrade script needs to fall in line with reality, re 0442

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18412 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoPrevent "Validate" from matching against deleted authority records
dbs [Wed, 20 Oct 2010 16:20:43 +0000 (16:20 +0000)]
Prevent "Validate" from matching against deleted authority records

2.0 introduces the ability to delete authority records. The routines in
OpenILS:Application:Storage:Publisher:authority check for matching values
of authority.full_rec without concern about whether the corresponding
entry in authority.record_entry has been deleted or not.

This change removes entries from authority.full_rec when an
authority.record_entry row is deleted, with the (possibly incorrect)
assumption that there won't be many cases where users will want to
search for deleted authority records and undelete them. If that
assumption turns out to be incorrect, then further changes can follow;
this change at least makes the current behaviour for user-visible
actions work as expected.

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18410 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoBackport r18407 from trunk: alt serials interface tweak
senator [Wed, 20 Oct 2010 16:00:28 +0000 (16:00 +0000)]
Backport r18407 from trunk: alt serials interface tweak

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18408 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoduring checkin, an item's hold may have a fleshed pickup_lib. added code to detect...
erickson [Wed, 20 Oct 2010 15:24:08 +0000 (15:24 +0000)]
during checkin, an item's hold may have a fleshed pickup_lib.  added code to detect and protect against treating a ref as an ID.  minor cleanup

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18403 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoBackporting r18396 from trunk: Patch from Thomas Berezansky providing an alternate...
miker [Wed, 20 Oct 2010 13:26:37 +0000 (13:26 +0000)]
Backporting r18396 from trunk: Patch from Thomas Berezansky providing an alternate implementation of Hard Due Dates

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18397 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoexpand the scope of BT on the result list page, allowing simpler slots
miker [Tue, 19 Oct 2010 20:37:34 +0000 (20:37 +0000)]
expand the scope of BT on the result list page, allowing simpler slots

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18393 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoupdate 1.6.1 to 2.0 upgrade script for 0441
gmc [Mon, 18 Oct 2010 23:02:43 +0000 (23:02 +0000)]
update 1.6.1 to 2.0 upgrade script for 0441

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18391 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agofix mapping of the crossed D character in naco_normalize
gmc [Mon, 18 Oct 2010 23:00:23 +0000 (23:00 +0000)]
fix mapping of the crossed D character in naco_normalize

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18389 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoBackport r18386 from trunk, asset.copy_template editing improvement
senator [Mon, 18 Oct 2010 21:54:18 +0000 (21:54 +0000)]
Backport r18386 from trunk, asset.copy_template editing improvement

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18387 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoBackport r18384 from trunk: serials previous issue copy location moving
senator [Mon, 18 Oct 2010 19:47:06 +0000 (19:47 +0000)]
Backport r18384 from trunk: serials previous issue copy location moving

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18385 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoProtect biblio.extract_located_uris() from a NULL uri_use value by using the href...
dbs [Mon, 18 Oct 2010 19:10:13 +0000 (19:10 +0000)]
Protect biblio.extract_located_uris() from a NULL uri_use value by using the href as a fallback

If an 856 field contained a subfield "9" but did not contain a subfield
"z", "2", or "n", then ingest of the MARC record would fail as it attempted
to retrieve an asset.uri row where uri_use = NULL - which was never true.

This change adds the subfield "u" to fall back to for the uri_use variable,
just like we do for the uri_label variable, and prevents ugly ingest errors
from getting thrown back at the client.

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18383 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agostop sign page was incorrectly coming up for all penalties
phasefx [Mon, 18 Oct 2010 17:45:19 +0000 (17:45 +0000)]
stop sign page was incorrectly coming up for all penalties

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18381 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agomake Circulation -> Enter Offline Interface open a new window instead of a tab, like...
phasefx [Mon, 18 Oct 2010 16:19:08 +0000 (16:19 +0000)]
make Circulation -> Enter Offline Interface open a new window instead of a tab, like the button from the login window.  This works around a permission issue with loading the offline receipt templates

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18378 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agomerge r18374-18375 from trunk for bill receipt fixes
phasefx [Mon, 18 Oct 2010 15:37:23 +0000 (15:37 +0000)]
merge r18374-18375 from trunk for bill receipt fixes

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18376 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoBackporting r18364-r18366 from trunk: use a function to wrap up escaping of solidus...
miker [Sat, 16 Oct 2010 15:39:20 +0000 (15:39 +0000)]
Backporting r18364-r18366 from trunk: use a function to wrap up escaping of solidus and casting to bytea, propogate to indexing and where/order_by

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18367 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoPoked by scottmk to incorporate 0438 into the 1.6.1-2.0 upgrade script. This may...
miker [Fri, 15 Oct 2010 17:32:40 +0000 (17:32 +0000)]
Poked by scottmk to incorporate 0438 into the 1.6.1-2.0 upgrade script. This may duplicate effort if one is already on 1.6.1.3+ (when it exists) but there is no harm in it either.

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18356 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agotweak expanding search field aliases
gmc [Fri, 15 Oct 2010 13:10:13 +0000 (13:10 +0000)]
tweak expanding search field aliases

Avoids a glitch that can occur if a search field alias
exists that happens to have the same name as a search field.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18354 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoIf an item is captured for a hold, but not in transit (i.e. on holds shelf), set...
erickson [Thu, 14 Oct 2010 22:17:50 +0000 (22:17 +0000)]
If an item is captured for a hold, but not in transit (i.e. on holds shelf), set the destination_location equal to the pickup library (i.e where it's supposedly on the shelf).  This is useful for autmated sorting so that the item will return to the branch whose shelf where it belongs.

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18352 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoBack-porting a number of action/trigger fixes from trunk:
erickson [Thu, 14 Oct 2010 20:48:58 +0000 (20:48 +0000)]
Back-porting a number of action/trigger fixes from trunk:

parallel collection and reaction with multisession
cut down xact begin/rollbacks to reduce call overhead during collection
force granularity-only when running w/ --granularity

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18350 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoupgrade version number fix
miker [Thu, 14 Oct 2010 20:07:32 +0000 (20:07 +0000)]
upgrade version number fix

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18348 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years ago"as" not "to" ... you pointed that out the first time, miker, what is your deal?
miker [Thu, 14 Oct 2010 20:04:47 +0000 (20:04 +0000)]
"as" not "to" ... you pointed that out the first time, miker, what is your deal?

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18344 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agobackward compat indexing for label instead of label_sortkey
miker [Thu, 14 Oct 2010 19:34:07 +0000 (19:34 +0000)]
backward compat indexing for label instead of label_sortkey

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18337 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agocast label_sortkey to bytea in order to get ascii-betical sorting in any locale,...
miker [Thu, 14 Oct 2010 19:18:58 +0000 (19:18 +0000)]
cast label_sortkey to bytea in order to get ascii-betical sorting in any locale, even C. stupid glibc ...

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18334 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agopatch from Steve Callendar to avoid resetting the passwd every time a phone number...
miker [Thu, 14 Oct 2010 18:35:54 +0000 (18:35 +0000)]
patch from Steve Callendar to avoid resetting the passwd every time a phone number changes

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18332 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agocorrect top-half ordering by label_sortkey
miker [Thu, 14 Oct 2010 18:13:49 +0000 (18:13 +0000)]
correct top-half ordering by label_sortkey

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18330 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agochange the Swap Editor button to a persisted checkbox
phasefx [Thu, 14 Oct 2010 15:31:37 +0000 (15:31 +0000)]
change the Swap Editor button to a persisted checkbox

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18327 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoChange the treatment of ORDER BY. Except as noted, these changes
scottmk [Wed, 13 Oct 2010 21:12:12 +0000 (21:12 +0000)]
Change the treatment of ORDER BY.  Except as noted, these changes
apply only to methods other than json_query.

1. Allow the use of array syntax for specifying an ORDER BY clause
as an array of field specifications, such as can be used in json_query.
The older syntax, using a hash based on class name, is still
available.

2. For json_query, using the array syntax: relax the requirement that a
class be in scope.  A field from an out-of-scope class will now be
silently ignored.  This change avoids certain problems with fleshing
queries, which use the same order_by array at multiple levels.

3. For the hash syntax: relax the requirement that the class be
referenced in the SELECT clause.  Now it suffices that it be in
scope in the generated SQL.  As a result, you can now sort by a
column in a joined class without artificially including that column
in the SELECT list.

4. When all or part of an ORDER BY clause is expressed as a string
literal: require that the string not contain any semicolons, in order
to block certain kinds of SQL injection.  This measure could create
problems if a semicolon appears within a quoted string -- which is
possible in theory but highly improbable in practice.

5. Don't include a virtual field in an ORDER BY clause.  If one is
specified, silently ignore it.

M    Open-ILS/src/c-apps/oils_sql.c

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18325 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoclean up duplicate system-controlled penalties during penalty calculation; perform...
erickson [Wed, 13 Oct 2010 20:18:23 +0000 (20:18 +0000)]
clean up duplicate system-controlled penalties during penalty calculation; perform penalty trigger event creation after the standalone commit occurs.  todo, handle non-standalone post-commit penalty trigger event creation

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18324 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agothinko supporting multiple rules of the same type in in-line merge rulesets
miker [Wed, 13 Oct 2010 02:35:01 +0000 (02:35 +0000)]
thinko supporting multiple rules of the same type in in-line merge rulesets

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18304 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoBackporting MARC js fixes from trunk
miker [Tue, 12 Oct 2010 17:43:14 +0000 (17:43 +0000)]
Backporting MARC js fixes from trunk

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18284 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoBe sure to copy new JS files from OpenSRF on a FULL update/install
atz [Tue, 12 Oct 2010 17:02:35 +0000 (17:02 +0000)]
Be sure to copy new JS files from OpenSRF on a FULL update/install

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18283 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoIncorporate upgrade # 0433 into the consolidated upgrade script.
scottmk [Tue, 12 Oct 2010 13:40:13 +0000 (13:40 +0000)]
Incorporate upgrade # 0433 into the consolidated upgrade script.

M    Open-ILS/src/sql/Pg/1.6.1-2.0-upgrade-db.sql

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18276 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoavoid race condition with post-save patron editor refresh and replicated databases
phasefx [Mon, 11 Oct 2010 21:43:26 +0000 (21:43 +0000)]
avoid race condition with post-save patron editor refresh and replicated databases

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18275 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoinitialize these lists just once to prevent display glitch
phasefx [Mon, 11 Oct 2010 20:40:04 +0000 (20:40 +0000)]
initialize these lists just once to prevent display glitch

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18270 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoTighter verbose format for skipped POs
atz [Mon, 11 Oct 2010 16:07:44 +0000 (16:07 +0000)]
Tighter verbose format for skipped POs

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18263 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agowait to run-pending if a specific granularity used
erickson [Mon, 11 Oct 2010 14:02:20 +0000 (14:02 +0000)]
wait to run-pending if a specific granularity used

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18257 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agomild fixes for a/t interface admin interface. sort by def name instead of hook,...
erickson [Fri, 8 Oct 2010 21:11:23 +0000 (21:11 +0000)]
mild fixes for a/t interface admin interface.  sort by def name instead of hook, which probably makes more sense to a human.  hide the opt-in and max-delay columns to free up some badly needed horizontal space.  use percentage width for name column, which acts a lot like 'auto', but allows the user to manually resize

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18254 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agotypo
phasefx [Fri, 8 Oct 2010 20:59:01 +0000 (20:59 +0000)]
typo

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18252 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoBackport r18249 from trunk: clear hold shelf work even on brokenish holds
senator [Fri, 8 Oct 2010 18:03:11 +0000 (18:03 +0000)]
Backport r18249 from trunk: clear hold shelf work even on brokenish holds

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18250 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agofix logic error where we were just testing for the presence of a user setting instead...
phasefx [Fri, 8 Oct 2010 17:38:54 +0000 (17:38 +0000)]
fix logic error where we were just testing for the presence of a user setting instead of its value

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18248 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agomoving users in and out of groups produced dialogs that expected vertical patron...
phasefx [Fri, 8 Oct 2010 17:29:52 +0000 (17:29 +0000)]
moving users in and out of groups produced dialogs that expected vertical patron summaries.  this fixes that

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18246 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoAvoid scary SSL / HTTPS errors in Apache configuration
dbs [Fri, 8 Oct 2010 03:29:30 +0000 (03:29 +0000)]
Avoid scary SSL / HTTPS errors in Apache configuration

When port 443 is the last listener port, Apache generates lots
of "unknown protocol speaking not SSL to HTTPS port!?" errors in
the logs - which are scary, but harmless. Putting port 80 last
avoids those errors entirely, per http://wiki.apache.org/httpd/InternalDummyConnection

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18238 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agodo not apply superpage limit inside bib search joins
gmc [Fri, 8 Oct 2010 01:35:25 +0000 (01:35 +0000)]
do not apply superpage limit inside bib search joins

Oddly, empirical evidence suggests that this might actually
be faster, and if this pans out, search results will definitely
be more complete.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18234 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoBackport r18230 and 18231, hold shelf clearer/printer
senator [Thu, 7 Oct 2010 22:48:12 +0000 (22:48 +0000)]
Backport r18230 and 18231, hold shelf clearer/printer

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18232 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agochoose the hold permit test variant correctly
gmc [Thu, 7 Oct 2010 21:40:48 +0000 (21:40 +0000)]
choose the hold permit test variant correctly

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18229 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoBackport r18226 from trunk
senator [Thu, 7 Oct 2010 19:12:28 +0000 (19:12 +0000)]
Backport r18226 from trunk

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18227 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoEDI template update for ORDERS
atz [Thu, 7 Oct 2010 18:54:23 +0000 (18:54 +0000)]
EDI template update for ORDERS

This template produces JSON for the edi translator to convert into
actual EDI lines.  It now handles vendor-specific requirements for
account and sub-account identification, and also transmits notes
of the vendor-public variety as FTX segments in the lineitem.

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18225 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoBackport r18222 from trunk: reasonable default sorting for expired holds list
senator [Thu, 7 Oct 2010 17:19:45 +0000 (17:19 +0000)]
Backport r18222 from trunk: reasonable default sorting for expired holds list

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18223 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agomerge r18220 from trunk for %destination_shelf% macro in hold and hold/transit slip...
phasefx [Thu, 7 Oct 2010 15:16:12 +0000 (15:16 +0000)]
merge r18220 from trunk for %destination_shelf% macro in hold and hold/transit slip templates

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18221 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoWarn but continue on skipped upgrade revs.
atz [Wed, 6 Oct 2010 22:13:20 +0000 (22:13 +0000)]
Warn but continue on skipped upgrade revs.

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18218 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoBackport r18215 from trunk: alternate printing for expired holds shelf lists
senator [Wed, 6 Oct 2010 21:04:29 +0000 (21:04 +0000)]
Backport r18215 from trunk: alternate printing for expired holds shelf lists

This is slim so that it supports bigger datasets than the usual interface for
this. Needs improvment: make the template more customizable

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18216 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoBackport spackling from trunk: db upgrade script dislikes holes -- spackle this one
miker [Wed, 6 Oct 2010 20:08:44 +0000 (20:08 +0000)]
Backport spackling from trunk: db upgrade script dislikes holes -- spackle this one

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18212 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoIncorporate upgrades 0427 and 0428 into the consolidated upgrade script.
scottmk [Wed, 6 Oct 2010 18:19:42 +0000 (18:19 +0000)]
Incorporate upgrades 0427 and 0428 into the consolidated upgrade script.

M    Open-ILS/src/sql/Pg/1.6.1-2.0-upgrade-db.sql

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18209 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoavoid retreiving/searching a linked object, when there is no object to retrieve ...
erickson [Wed, 6 Oct 2010 15:03:36 +0000 (15:03 +0000)]
avoid retreiving/searching a linked object, when there is no object to retrieve (i.e. ident value is null) and silence various warnings by skipping this scenario.  mild variable refactor for easy reading for feeble eyes.

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18206 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agohold/transit slips may want to use stat cats as well
phasefx [Wed, 6 Oct 2010 15:01:12 +0000 (15:01 +0000)]
hold/transit slips may want to use stat cats as well

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18204 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoBackporting a syntax correction; SQL functions cannot reference
scottmk [Wed, 6 Oct 2010 14:31:57 +0000 (14:31 +0000)]
Backporting a syntax correction; SQL functions cannot reference
their parameters by name.

M    Pg/upgrade/0428.schema.hold_retarget.sql
M    Pg/110.hold_matrix.sql

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18201 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agosuppress usr_grp field in hold matrix matchpoint; see also 18188
erickson [Wed, 6 Oct 2010 13:54:53 +0000 (13:54 +0000)]
suppress usr_grp field in hold matrix matchpoint;  see also 18188

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18200 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoBackport r18195 from trunk: Make retargetting check less lax by including appropriate...
miker [Wed, 6 Oct 2010 13:47:07 +0000 (13:47 +0000)]
Backport r18195 from trunk: Make retargetting check less lax by including appropriate patron-side test

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18197 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agofirst level of groups hash can be array or hash, leading to breakage; for now, keep...
erickson [Wed, 6 Oct 2010 13:28:37 +0000 (13:28 +0000)]
first level of groups hash can be array or hash, leading to breakage;  for now, keep it simple and return continue-status to keep the caller alive

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18194 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoBackport r18188 from trunk: usr_grp is entirely unused currently; hide it
miker [Wed, 6 Oct 2010 02:44:23 +0000 (02:44 +0000)]
Backport r18188 from trunk: usr_grp is entirely unused currently; hide it

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18190 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoBackport r18187 from trunk: Add a retargetting specific version of the hold-permit...
miker [Wed, 6 Oct 2010 02:43:41 +0000 (02:43 +0000)]
Backport r18187 from trunk: Add a retargetting specific version of the hold-permit function which skips user tests

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18189 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agohold matrix selection: treat root OU as just another OU
gmc [Tue, 5 Oct 2010 20:49:21 +0000 (20:49 +0000)]
hold matrix selection: treat root OU as just another OU

Treat the root OU as just another OU for the purpose of
calculating OU proximity adjustments when selecting a
matchpoint.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18186 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agobe quiet with errors retrieving remote column settings
phasefx [Tue, 5 Oct 2010 19:33:44 +0000 (19:33 +0000)]
be quiet with errors retrieving remote column settings

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18181 dcc99617-32d9-48b4-a31d-7c20da2025e4

15 years agoThe whole point of test mode, NOT actually committing actions.
atz [Tue, 5 Oct 2010 17:10:22 +0000 (17:10 +0000)]
The whole point of test mode, NOT actually committing actions.

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18178 dcc99617-32d9-48b4-a31d-7c20da2025e4