evergreen/bjwebb.git
14 years agoProtect biblio.extract_located_uris() from a NULL uri_use value by using the href...
dbs [Mon, 18 Oct 2010 19:05:19 +0000 (19:05 +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/trunk@18382 dcc99617-32d9-48b4-a31d-7c20da2025e4

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

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

14 years agomake Circulation -> Enter Offline Interface open a new window instead of a tab, like...
phasefx [Mon, 18 Oct 2010 16:18:40 +0000 (16:18 +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/trunk@18377 dcc99617-32d9-48b4-a31d-7c20da2025e4

14 years agofix billing interface so that %title% and %barcode% work in bill_payment template
phasefx [Mon, 18 Oct 2010 15:35:50 +0000 (15:35 +0000)]
fix billing interface so that %title% and %barcode% work in bill_payment template

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

14 years agocorrect default bills_historical template to use %mbts_id% instead of %id%. Also...
phasefx [Mon, 18 Oct 2010 15:35:46 +0000 (15:35 +0000)]
correct default bills_historical template to use %mbts_id% instead of %id%.  Also add in %title%

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

14 years agogo ahead and use the new index if we need to
miker [Sat, 16 Oct 2010 15:38:21 +0000 (15:38 +0000)]
go ahead and use the new index if we need to

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

14 years agoneed to update this index as well
miker [Sat, 16 Oct 2010 15:35:39 +0000 (15:35 +0000)]
need to update this index as well

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

14 years agouse a function to wrap up escaping of solidus and casting to bytea, propogate to...
miker [Sat, 16 Oct 2010 15:32:32 +0000 (15:32 +0000)]
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/trunk@18364 dcc99617-32d9-48b4-a31d-7c20da2025e4

14 years agotweak expanding search field aliases
gmc [Fri, 15 Oct 2010 13:08:52 +0000 (13:08 +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/trunk@18353 dcc99617-32d9-48b4-a31d-7c20da2025e4

14 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:21 +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/trunk@18351 dcc99617-32d9-48b4-a31d-7c20da2025e4

14 years agoforce granularity-only when any granularity is specified
miker [Thu, 14 Oct 2010 20:17:00 +0000 (20:17 +0000)]
force granularity-only when any granularity is specified

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

14 years ago"as" not "to" ... you pointed that out the first time, miker, what is your deal?
miker [Thu, 14 Oct 2010 20:04:05 +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/trunk@18343 dcc99617-32d9-48b4-a31d-7c20da2025e4

14 years agorepaired upgrade version
erickson [Thu, 14 Oct 2010 19:57:42 +0000 (19:57 +0000)]
repaired upgrade version

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

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

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

14 years agocast label_sortkey to bytea in order to get ascii-betical sorting in any locale,...
miker [Thu, 14 Oct 2010 19:18:11 +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/trunk@18333 dcc99617-32d9-48b4-a31d-7c20da2025e4

14 years agopatch from Steve Callendar to avoid resetting the passwd every time a phone number...
miker [Thu, 14 Oct 2010 18:35:27 +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/trunk@18331 dcc99617-32d9-48b4-a31d-7c20da2025e4

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

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

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

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

14 years agodefault to standard cstore instead of rstore for env building editor
erickson [Wed, 13 Oct 2010 20:16:58 +0000 (20:16 +0000)]
default to standard cstore instead of rstore for env building editor

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

14 years agoclean up duplicate system-controlled penalties during penalty calculation; perform...
erickson [Wed, 13 Oct 2010 20:16:57 +0000 (20:16 +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/trunk@18322 dcc99617-32d9-48b4-a31d-7c20da2025e4

14 years agoChanges to the treatment of ORDER BY:
scottmk [Wed, 13 Oct 2010 18:53:56 +0000 (18:53 +0000)]
Changes to the treatment of ORDER BY:

1. For json_query: when ORDER BY is expressed as an object keyed on class
(instead of an array of field specifications), and the class is not in
scope, error out instead of silently ignoring the class.

The other changes affect only methods other than json_query:

2. When the ORDER BY list is provided as a raw text string: block any
string containing a semicolon, in order to block simple SQL injections.
For now we make no exceptions for quoted semicolons, which are not
likely ever to appear an an ORDER BY clause.

3. Keep virtual fields out of the ORDER BY clause.  For now we silently
ignore them, as we ignore non-existent fields.  In both cases we should
perhaps error out.

4. Don't require that a class referenced in the ORDER BY clause also be
referenced in the SELECT clause.  Just make sure it's in scope.

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

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

14 years agooverzealous trimming of cat.properties
phasefx [Wed, 13 Oct 2010 16:30:38 +0000 (16:30 +0000)]
overzealous trimming of cat.properties

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

14 years agoUse just one transaction, and inside an rstore editor no less, for fleshing env paths
miker [Wed, 13 Oct 2010 16:17:14 +0000 (16:17 +0000)]
Use just one transaction, and inside an rstore editor no less, for fleshing env paths

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

14 years agowhen the target for an event is no longer around, immediately invalidate the event...
erickson [Wed, 13 Oct 2010 16:13:23 +0000 (16:13 +0000)]
when the target for an event is no longer around, immediately invalidate the event and prevent the event from bubbling up for further processing

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

14 years agomissing semicolon
phasefx [Wed, 13 Oct 2010 16:03:25 +0000 (16:03 +0000)]
missing semicolon

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

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

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

14 years agodouble-arg, backwards logic
miker [Wed, 13 Oct 2010 00:29:38 +0000 (00:29 +0000)]
double-arg, backwards logic

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

14 years agoarg, missing semicolon
miker [Wed, 13 Oct 2010 00:28:43 +0000 (00:28 +0000)]
arg, missing semicolon

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

14 years agodeduplicate bibs going into the merge queue
miker [Wed, 13 Oct 2010 00:27:46 +0000 (00:27 +0000)]
deduplicate bibs going into the merge queue

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

14 years agoentry points for miker_'s batch marc editor
phasefx [Tue, 12 Oct 2010 21:32:21 +0000 (21:32 +0000)]
entry points for miker_'s batch marc editor

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

14 years agowhen we have no target field, add the entire source field, even when we have a subfie...
miker [Tue, 12 Oct 2010 21:31:33 +0000 (21:31 +0000)]
when we have no target field, add the entire source field, even when we have a subfield designation

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

14 years agoGet rid of commas, apparently confusing; make action button label more generic /...
miker [Tue, 12 Oct 2010 20:31:31 +0000 (20:31 +0000)]
Get rid of commas, apparently confusing; make action button label more generic / less "developery"

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

14 years agomore terminology cleanup and inline documentation
miker [Tue, 12 Oct 2010 19:55:58 +0000 (19:55 +0000)]
more terminology cleanup and inline documentation

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

14 years agonew record merge UI. needs r18287, r18288. I'll backport them all together
phasefx [Tue, 12 Oct 2010 19:35:42 +0000 (19:35 +0000)]
new record merge UI.  needs r18287, r18288.  I'll backport them all together

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

14 years agovertical bib summary (mainly for use in the Merge Record interface). I tried using...
phasefx [Tue, 12 Oct 2010 19:34:50 +0000 (19:34 +0000)]
vertical bib summary (mainly for use in the Merge Record interface).  I tried using just bib_brief.xul with document.loadOverlay to choose between bib_brief_overlay_vertical.xul and bib_brief_overlay.xul based on a param, but was running into too much pain going that route.

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

14 years agoallow util.deck to be instantiated with either a xul deck object or a xul deck id
phasefx [Tue, 12 Oct 2010 19:34:39 +0000 (19:34 +0000)]
allow util.deck to be instantiated with either a xul deck object or a xul deck id

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

14 years agoadd option for hiding entire embedded browser toolbar
phasefx [Tue, 12 Oct 2010 19:34:35 +0000 (19:34 +0000)]
add option for hiding entire embedded browser toolbar

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

14 years agoimprove labeling and documentation
miker [Tue, 12 Oct 2010 19:23:22 +0000 (19:23 +0000)]
improve labeling and documentation

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

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

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

14 years agonow that we are working again, hush the warnings (osrfLogInternal to the rescue)
miker [Tue, 12 Oct 2010 16:02:31 +0000 (16:02 +0000)]
now that we are working again, hush the warnings (osrfLogInternal to the rescue)

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

14 years agoand ... use a function name that exists
miker [Tue, 12 Oct 2010 15:40:45 +0000 (15:40 +0000)]
and ... use a function name that exists

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

14 years agorearrangement for variable existance
miker [Tue, 12 Oct 2010 15:39:47 +0000 (15:39 +0000)]
rearrangement for variable existance

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

14 years agoskip unknown order_by entries instead of erroring
miker [Tue, 12 Oct 2010 15:19:54 +0000 (15:19 +0000)]
skip unknown order_by entries instead of erroring

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

14 years agoIncorporate upgrade # 0433 into the consolidated upgrade script.
scottmk [Tue, 12 Oct 2010 13:40:14 +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/trunk@18277 dcc99617-32d9-48b4-a31d-7c20da2025e4

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

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

14 years agomake the source selection less confusing, and improve some wording in the template...
miker [Mon, 11 Oct 2010 20:42:46 +0000 (20:42 +0000)]
make the source selection less confusing, and improve some wording in the template section (more to come)

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

14 years agodogfooding cleanup
miker [Mon, 11 Oct 2010 20:41:37 +0000 (20:41 +0000)]
dogfooding cleanup

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

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

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

14 years agoWorking template-based batch bib updater!
miker [Mon, 11 Oct 2010 16:07:47 +0000 (16:07 +0000)]
Working template-based batch bib updater!

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

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

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

14 years agosupply a dummy leader, as required by the Perl MARC modules
miker [Mon, 11 Oct 2010 16:06:52 +0000 (16:06 +0000)]
supply a dummy leader, as required by the Perl MARC modules

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

14 years agoMethod registration cleanup
atz [Mon, 11 Oct 2010 16:06:23 +0000 (16:06 +0000)]
Method registration cleanup

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

14 years agoClean up method registration sigs/descs
atz [Mon, 11 Oct 2010 15:21:12 +0000 (15:21 +0000)]
Clean up method registration sigs/descs

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

14 years agoPull out into a separate function: the code in SELECT() that builds a
scottmk [Mon, 11 Oct 2010 14:25:05 +0000 (14:25 +0000)]
Pull out into a separate function: the code in SELECT() that builds a
comma-separated list of ORDER BY expressions from a JSON_ARRAY.

Invoke that function, not only from SELECT(), but also from the
buildSELECT() function.

As a result, the select methods will be able to use the same array
syntax as json_query for ORDER BY clauses, as an alternative to the
existing hash syntax.

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

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

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

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

14 years agomod_perl handler to allow batch update bib records from an ephemeral template
miker [Sat, 9 Oct 2010 02:32:49 +0000 (02:32 +0000)]
mod_perl handler to allow batch update bib records from an ephemeral template

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

14 years agomild fixes for a/t interface admin interface. sort by def name instead of hook,...
erickson [Fri, 8 Oct 2010 21:10:43 +0000 (21:10 +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/trunk@18253 dcc99617-32d9-48b4-a31d-7c20da2025e4

14 years agotypo
phasefx [Fri, 8 Oct 2010 20:58:37 +0000 (20:58 +0000)]
typo

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

14 years agoBe a little more tolerant of aberrant data when clearing the holds shelf
senator [Fri, 8 Oct 2010 18:02:08 +0000 (18:02 +0000)]
Be a little more tolerant of aberrant data when clearing the holds shelf

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

14 years agofix logic error where we were just testing for the presence of a user setting instead...
phasefx [Fri, 8 Oct 2010 17:38:24 +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/trunk@18247 dcc99617-32d9-48b4-a31d-7c20da2025e4

14 years agomoving users in and out of groups produced dialogs that expected vertical patron...
phasefx [Fri, 8 Oct 2010 17:29:20 +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/trunk@18245 dcc99617-32d9-48b4-a31d-7c20da2025e4

14 years agoadd a method to overlay a special bib container full of records (or bucket + template)
miker [Fri, 8 Oct 2010 17:06:52 +0000 (17:06 +0000)]
add a method to overlay a special bib container full of records (or bucket + template)

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

14 years agoTidied up buildSELECT() a bit:
scottmk [Fri, 8 Oct 2010 14:16:19 +0000 (14:16 +0000)]
Tidied up buildSELECT() a bit:

1. Sprinkled the const qualifier here and there.

2. Moved some variable declarations to get them closer to the point of
first use, and to limit their scope.

3. Renamed some variables to better reflect their meaning.

4. Split a couple of variables into multiple variables, instead of using
them for multiple unrelated purposes.

5. Plugged a memory leak in the case of an error return.

6. Added comments, including a Doxygen-style comment at the top of the
function.

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

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

14 years agoAvoid scary SSL / HTTPS errors in Apache configuration
dbs [Fri, 8 Oct 2010 03:30:00 +0000 (03:30 +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/trunk@18239 dcc99617-32d9-48b4-a31d-7c20da2025e4

14 years agodo not apply superpage limit inside bib search joins
gmc [Fri, 8 Oct 2010 01:34:08 +0000 (01:34 +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/trunk@18233 dcc99617-32d9-48b4-a31d-7c20da2025e4

14 years agoprogress to ProgressDialog means total, not incremental
senator [Thu, 7 Oct 2010 22:46:24 +0000 (22:46 +0000)]
progress to ProgressDialog means total, not incremental

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

14 years agoExpired holds shelf printer needs to be a holds shelf *clearer* and printer
senator [Thu, 7 Oct 2010 22:37:45 +0000 (22:37 +0000)]
Expired holds shelf printer needs to be a holds shelf *clearer* and printer

This needs cleaned up and stuff, and made into something cooler.
Basically just does what XUL interfaces under the Circ menu can already do,
but streamlined to tolerate really big datasets.

Much of this code originates from berick and miker.

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

14 years agochoose the hold permit test variant correctly
gmc [Thu, 7 Oct 2010 21:39:05 +0000 (21:39 +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/trunk@18228 dcc99617-32d9-48b4-a31d-7c20da2025e4

14 years agoJust a minor thing on this shelf expired print interface,
senator [Thu, 7 Oct 2010 19:10:58 +0000 (19:10 +0000)]
Just a minor thing on this shelf expired print interface,
probably more changes coming.

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

14 years agoEDI template update for ORDERS
atz [Thu, 7 Oct 2010 18:48:45 +0000 (18:48 +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/trunk@18224 dcc99617-32d9-48b4-a31d-7c20da2025e4

14 years agoAdd some reasonable default sorting to this expired holds list
senator [Thu, 7 Oct 2010 17:18:58 +0000 (17:18 +0000)]
Add some reasonable default sorting to this expired holds list

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

14 years agodestination_shelf macro for hold and hold/transit slips. Will contain either HOLD...
phasefx [Thu, 7 Oct 2010 15:14:50 +0000 (15:14 +0000)]
destination_shelf macro for hold and hold/transit slips.  Will contain either HOLD SHELF, PUBLIC HOLD SHELF, or PRIVATE HOLD SHELF (these are localizable).  The latter two depend on the org unit setting 'circ.holds.behind_desk_pickup_supported' being in effect, and also considers a user setting for the holds user at the time of printing.

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

14 years agoParallel action/trigger collection and reaction
erickson [Thu, 7 Oct 2010 14:56:43 +0000 (14:56 +0000)]
Parallel action/trigger collection and reaction

QA'ed patch from miker to support parallel a/t event collection and
reaction.  Max parallel procs is controlled by two new opensrf.xml
trigger app_settings.  Sample config included, settings disabled by
default.

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

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

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

14 years agoNew way to printing shelf-expired holds
senator [Wed, 6 Oct 2010 21:01:42 +0000 (21:01 +0000)]
New way to printing shelf-expired holds

This just takes the newest template for printing hold pull lists and
grafts this new functionality onto it.  It should perhaps be adjusted to also
be able to print things on the holds shelf that /aren't/ shelf-expired.

For now you get to this under Admin -> For Developers -> Local Administration

This also corrects a bug because of which a "print pull list (alternate
strategy)" button appeared where it shouldn't.

This also removes the booking links from Admin -> For Developers -> Local
Administration, as there are regular staff client menu entries for those now.

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

14 years agoadded support for honoring the due date ceiling from the duration rule. AKA, end...
erickson [Wed, 6 Oct 2010 20:44:46 +0000 (20:44 +0000)]
added support for honoring the due date ceiling from the duration rule.  AKA, end-of-semester due dates

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

14 years agodb upgrade script dislikes holes -- spackle this one
miker [Wed, 6 Oct 2010 20:07:39 +0000 (20:07 +0000)]
db upgrade script dislikes holes -- spackle this one

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

14 years agoIncorporate upgrades 0427 and 0428 into the consolidated upgrade script.
scottmk [Wed, 6 Oct 2010 18:19:43 +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/trunk@18210 dcc99617-32d9-48b4-a31d-7c20da2025e4

14 years agoTwo changes to config schema:
scottmk [Wed, 6 Oct 2010 15:55:14 +0000 (15:55 +0000)]
Two changes to config schema:

1. Add new column date_ceiling to rule_circ_duration table.

2. New table hard_due_date.

For trunk, v1.6, v1.6.2 (eventually), and v2.1 (eventually).

NOT for v1.6.1 or v2.0.

M    Open-ILS/src/sql/Pg/002.schema.config.sql
A    Open-ILS/src/sql/Pg/upgrade/0432.schema.config_hard_due_date.sql
M    Open-ILS/examples/fm_IDL.xml

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

14 years agoavoid retreiving/searching a linked object, when there is no object to retrieve ...
erickson [Wed, 6 Oct 2010 15:01:38 +0000 (15:01 +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/trunk@18205 dcc99617-32d9-48b4-a31d-7c20da2025e4

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

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

14 years agoFurther propagating a syntax correction; SQL functions cannot reference
scottmk [Wed, 6 Oct 2010 14:32:01 +0000 (14:32 +0000)]
Further propagating a syntax correction; SQL functions cannot reference
their parameters by name.

M    Open-ILS/src/sql/Pg/110.hold_matrix.sql

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

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

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

14 years agoThinko fix for field name. The script would not commit, so please simply reapply...
miker [Wed, 6 Oct 2010 13:53:18 +0000 (13:53 +0000)]
Thinko fix for field name. The script would not commit, so please simply reapply 0430.

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

14 years agoStart out exact-ou-match rules with an "always win" weight
miker [Wed, 6 Oct 2010 13:45:00 +0000 (13:45 +0000)]
Start out exact-ou-match rules with an "always win" weight

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

14 years agoMake retargetting check less lax by including appropriate patron-side test
miker [Wed, 6 Oct 2010 13:43:52 +0000 (13:43 +0000)]
Make retargetting check less lax by including appropriate patron-side test

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

14 years agofirst level of groups hash can be array or hash, leading to breakage; for now, keep...
erickson [Wed, 6 Oct 2010 13:28:09 +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/trunk@18193 dcc99617-32d9-48b4-a31d-7c20da2025e4

14 years agoFixed the second and third function definitions, which wouldn't compile.
scottmk [Wed, 6 Oct 2010 13:27:26 +0000 (13:27 +0000)]
Fixed the second and third function definitions, which wouldn't compile.
An SQL function cannot reference its parameters by name, but only by number.

M    Open-ILS/src/sql/Pg/upgrade/0428.schema.hold_retarget.sql

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

14 years agoAdd a switch to turn on strict OU matching for all OUs required by a hold matchpoint
miker [Wed, 6 Oct 2010 03:07:30 +0000 (03:07 +0000)]
Add a switch to turn on strict OU matching for all OUs required by a hold matchpoint

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

14 years agousr_grp is entirely unused currently; hide it
miker [Wed, 6 Oct 2010 02:35:17 +0000 (02:35 +0000)]
usr_grp is entirely unused currently; hide it

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

14 years agoAdd a retargetting specific version of the hold-permit function which skips user...
miker [Wed, 6 Oct 2010 02:31:55 +0000 (02:31 +0000)]
Add a retargetting specific version of the hold-permit function which skips user tests

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

14 years agosome I18N and tweak call to getIntPref. Is the 2nd parameter version an undocumented...
phasefx [Tue, 5 Oct 2010 20:13:06 +0000 (20:13 +0000)]
some I18N and tweak call to getIntPref.  Is the 2nd parameter version an undocumented way of providing a default if the pref isn't found?

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

14 years agobug fix for close tab regression
phasefx [Tue, 5 Oct 2010 20:13:03 +0000 (20:13 +0000)]
bug fix for close tab regression

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

14 years agopatch from tsbere to improve tab behavior and to give command-line options for contro...
phasefx [Tue, 5 Oct 2010 20:13:01 +0000 (20:13 +0000)]
patch from tsbere to improve tab behavior and to give command-line options for controlling tabs
See https://bugs.launchpad.net/evergreen/+bug/625056

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

14 years agopatch from tsbere to use _blank for new windows instead of generated identifiers
phasefx [Tue, 5 Oct 2010 20:12:58 +0000 (20:12 +0000)]
patch from tsbere to use _blank for new windows instead of generated identifiers

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

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

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

14 years agohold matrix selection: treat root OU as just another OU
gmc [Tue, 5 Oct 2010 18:54:05 +0000 (18:54 +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/trunk@18179 dcc99617-32d9-48b4-a31d-7c20da2025e4

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

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

14 years agoThis is a silly commit, as this template should be made configurable down the
senator [Tue, 5 Oct 2010 16:37:57 +0000 (16:37 +0000)]
This is a silly commit, as this template should be made configurable down the
road, maybe by OU setting or something. Anyway, make the list more legible.

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

14 years agoEDI job POD
atz [Tue, 5 Oct 2010 16:16:59 +0000 (16:16 +0000)]
EDI job POD

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