From 332428a8cd12062b7c0e31845d7ca1a6f78c3ee4 Mon Sep 17 00:00:00 2001 From: miker Date: Fri, 20 Jan 2006 18:16:43 +0000 Subject: [PATCH] updates to support corner cases in circ git-svn-id: svn://svn.open-ils.org/ILS/trunk@2764 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../OpenILS/Application/Storage/CDBI/action.pm | 14 ++++++++++++++ .../OpenILS/Application/Storage/CDBI/asset.pm | 2 +- .../OpenILS/Application/Storage/CDBI/config.pm | 7 +++++++ .../Application/Storage/Driver/Pg/dbi.pm | 18 ++++++++++++++++++ .../src/perlmods/OpenILS/Utils/Fieldmapper.pm | 8 ++++++-- 5 files changed, 46 insertions(+), 3 deletions(-) diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/action.pm b/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/action.pm index 18288a7998..3ddcb7b4a8 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/action.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/action.pm @@ -6,6 +6,20 @@ package action; use base qw/OpenILS::Application::Storage::CDBI/; #------------------------------------------------------------------------------- +package action::in_house_use; +use base qw/action/; +__PACKAGE__->table('action_in_house_use'); +__PACKAGE__->columns(Primary => 'id'); +__PACKAGE__->columns(Essential => qw/item staff org_unit use_time/); +#------------------------------------------------------------------------------- + +package action::non_cataloged_circulation; +use base qw/action/; +__PACKAGE__->table('action_non_cataloged_circulation'); +__PACKAGE__->columns(Primary => 'id'); +__PACKAGE__->columns(Essential => qw/patron staff circ_lib item_type circ_time/); +#------------------------------------------------------------------------------- + package action::survey; use base qw/action/; __PACKAGE__->table('action_survey'); diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/asset.pm b/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/asset.pm index 881ca0cefc..c5b9c397ef 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/asset.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/asset.pm @@ -39,7 +39,7 @@ __PACKAGE__->columns( Essential => qw/call_number barcode creator create_date ed edit_date copy_number status loan_duration circ_lib fine_level circulate deposit price ref opac_visible circ_as_type circ_modifier deposit_amount location - holdable/ ); + holdable dummy_title dummy_author/ ); #------------------------------------------------------------------------------- package asset::stat_cat; diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/config.pm b/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/config.pm index f81cf1ddbe..cf429bc126 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/config.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/config.pm @@ -6,6 +6,13 @@ package config; use base qw/OpenILS::Application::Storage::CDBI/; #------------------------------------------------------------------------------- +package config::non_cataloged_item; +use base qw/config/; +__PACKAGE__->table('config_non_cataloged_item'); +__PACKAGE__->columns(Primary => 'id'); +__PACKAGE__->columns(Essential => qw/owning_lib name/); +#------------------------------------------------------------------------------- + package config::standing; use base qw/config/; __PACKAGE__->table('config_standing'); diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Driver/Pg/dbi.pm b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Driver/Pg/dbi.pm index 3fb33d5d91..57cdfe247c 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Driver/Pg/dbi.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Driver/Pg/dbi.pm @@ -143,6 +143,18 @@ action::circulation->table( 'action.circulation' ); action::circulation->sequence( 'money.billable_xact_id_seq' ); + #--------------------------------------------------------------------- + package action::in_house_use; + + action::in_house_use->table( 'action.in_house_use' ); + action::in_house_use->sequence( 'action.in_house_use_id_seq' ); + + #--------------------------------------------------------------------- + package action::non_cataloged_circulation; + + action::non_cataloged_circulation->table( 'action.non_cataloged_circulation' ); + action::non_cataloged_circulation->sequence( 'action.non_cataloged_circulation_id_seq' ); + #--------------------------------------------------------------------- package action::open_circulation; @@ -172,6 +184,12 @@ action::survey_response->table( 'action.survey_response' ); action::survey_response->sequence( 'action.survey_response_id_seq' ); + #--------------------------------------------------------------------- + package config::non_cataloged_type; + + config::non_cataloged_type->table( 'config.non_cataloged_type' ); + config::non_cataloged_type->sequence( 'config.non_cataloged_type_id_seq' ); + #--------------------------------------------------------------------- package config::copy_status; diff --git a/Open-ILS/src/perlmods/OpenILS/Utils/Fieldmapper.pm b/Open-ILS/src/perlmods/OpenILS/Utils/Fieldmapper.pm index 69be355d9a..dbc1267439 100644 --- a/Open-ILS/src/perlmods/OpenILS/Utils/Fieldmapper.pm +++ b/Open-ILS/src/perlmods/OpenILS/Utils/Fieldmapper.pm @@ -65,6 +65,9 @@ sub _init { 'Fieldmapper::container::call_number_bucket_item' => { hint => 'ccnbi' }, 'Fieldmapper::container::biblio_record_entry_bucket_item' => { hint => 'cbrebi' }, + 'Fieldmapper::action::in_house_use' => { hint => 'aihu' }, + 'Fieldmapper::action::non_cataloged_circulation'=> { hint => 'ancc' }, + 'Fieldmapper::action::survey' => { hint => 'asv', proto_fields => { questions => 1, responses => 1 } }, @@ -94,8 +97,6 @@ sub _init { 'Fieldmapper::actor::org_address' => { hint => 'aoa' }, 'Fieldmapper::actor::profile' => { hint => 'ap' }, 'Fieldmapper::actor::card' => { hint => 'ac' }, - 'Fieldmapper::config::standing' => { hint => 'cst' }, - 'Fieldmapper::config::copy_status' => { hint => 'ccs' }, 'Fieldmapper::actor::stat_cat' => { hint => 'actsc', proto_fields => { entries => 1 } }, 'Fieldmapper::actor::stat_cat_entry' => { hint => 'actsce' }, @@ -181,6 +182,9 @@ sub _init { 'Fieldmapper::config::rules::recuring_fine' => { hint => 'crrf' }, 'Fieldmapper::config::rules::circ_duration' => { hint => 'crcd' }, 'Fieldmapper::config::rules::max_fine' => { hint => 'crmf' }, + 'Fieldmapper::config::non_cataloged_type' => { hint => 'cnct' }, + 'Fieldmapper::config::standing' => { hint => 'cst' }, + 'Fieldmapper::config::copy_status' => { hint => 'ccs' }, 'Fieldmapper::authority::full_rec' => { hint => 'afr' }, 'Fieldmapper::authority::record_descriptor' => { hint => 'ard' }, -- 2.43.2