From: Shula Link Date: Wed, 23 Sep 2020 16:56:49 +0000 (-0400) Subject: Pass converting all Volume references to Call Number references in labels. X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=c3b5bac06274a385ea21bfdb5e04239fe722053f;p=working%2FEvergreen.git Pass converting all Volume references to Call Number references in labels. Signed-off-by: Shula Link --- diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml index e47f7228b3..13b49509a5 100644 --- a/Open-ILS/examples/fm_IDL.xml +++ b/Open-ILS/examples/fm_IDL.xml @@ -6010,7 +6010,7 @@ SELECT usr, - + @@ -7352,7 +7352,7 @@ SELECT usr, - + @@ -7753,7 +7753,7 @@ SELECT usr, - + diff --git a/Open-ILS/src/edi_translator/data/test_output/perl_json2edi.tmp b/Open-ILS/src/edi_translator/data/test_output/perl_json2edi.tmp deleted file mode 100644 index a88c678f35..0000000000 --- a/Open-ILS/src/edi_translator/data/test_output/perl_json2edi.tmp +++ /dev/null @@ -1,79 +0,0 @@ - -{ - "msgtype: "ORDERS", - "msg": ["order", { - "po_number":6, - "date":"20100301", - "buyer":[ - {"id":"6666666", - "reference":{"API":"6666666"}} - ], - "vendor":[ "0672891", - {"id-qualifier":"91", "reference":{"IA":"1"}, "id":"0672891"} - ], - "currency":"USD", - "items":[ - - { - "identifiers":[ - {"id-qualifier":"SA","id":"38"}, - {"id-qualifier":"IB","id":""} - ], - "price":9.99, - "desc":[ - {"BTI":"Twilight zone/twilight tone / arr. Paul Jennings"}, - {"BPU":"Jenson Publications,"}, - {"BPD":"1982, c1979"}, - {"BPH":"1 score + parts"} - ], - "quantity":4 }, - - { - "identifiers":[ - {"id-qualifier":"SA","id":"40"}, - {"id-qualifier":"IB","id":"0393048799"} - ], - "price":16.44, - "desc":[ - {"BTI":"The twilight of American culture / Morris Berman."}, - {"BPU":"Norton,"}, - {"BPD":"c2000."}, - {"BPH":"xiv, 205 p. ;"} - ], - "quantity":3 }, - - { - "identifiers":[ - {"id-qualifier":"SA","id":"27"}, - {"id-qualifier":"IB","id":"0439139597"} - ], - "price":14.99, - "desc":[ - {"BTI":"Harry Potter and the goblet of fire / by J.K. Rowling ; illustrations by Mary GrandPr\u00e9."}, - {"BPU":"Arthur A. Levine Books,"}, - {"BPD":"c2000."}, - {"BPH":"xi, 734 p. :"} - ], - "quantity":19 }, - - { - "identifiers":[ - {"id-qualifier":"SA","id":"30"}, - {"id-qualifier":"IB","id":"0786222735"} - ], - "price":15.99, - "desc":[ - {"BTI":"Harry Potter and the Chamber of Secrets / J.K. Rowling ; illustrations by Mary GrandPr\u00e9."}, - {"BPU":"Thorndike Press,"}, - {"BPD":"1999."}, - {"BPH":"464 p. ; 22 cm."} - ], - "quantity":4 } - - ], - "line_items":4 - }], - "recipient":"0672891", - "sender":"6666666" -} - diff --git a/Open-ILS/src/edi_translator/data/test_output/ruby_json2edi.tmp b/Open-ILS/src/edi_translator/data/test_output/ruby_json2edi.tmp deleted file mode 100644 index fc0ee39a49..0000000000 --- a/Open-ILS/src/edi_translator/data/test_output/ruby_json2edi.tmp +++ /dev/null @@ -1,78 +0,0 @@ - -{ - "msg_type": "ORDERS", - "msg": ["order", { - "po_number":6, - "date":"20100301", - "buyer":[ - {"id":"6666666", - "reference":{"API":"6666666"}} - ], - "vendor":[ "0672891", - {"id-qualifier":"91", "reference":{"IA":"1"}, "id":"0672891"} - ], - "currency":"USD", - "items":[ - - { - "identifiers":[ - {"id-qualifier":"SA","id":"38"}, - {"id-qualifier":"IB","id":""} - ], - "price":9.99, - "desc":[ - {"BTI":"Twilight zone/twilight tone / arr. Paul Jennings"}, - {"BPU":"Jenson Publications,"}, - {"BPD":"1982, c1979"}, - {"BPH":"1 score + parts"} - ], - "quantity":4 }, - - { - "identifiers":[ - {"id-qualifier":"SA","id":"40"}, - {"id-qualifier":"IB","id":"0393048799"} - ], - "price":16.44, - "desc":[ - {"BTI":"The twilight of American culture / Morris Berman."}, - {"BPU":"Norton,"}, - {"BPD":"c2000."}, - {"BPH":"xiv, 205 p. ;"} - ], - "quantity":3 }, - - { - "identifiers":[ - {"id-qualifier":"SA","id":"27"}, - {"id-qualifier":"IB","id":"0439139597"} - ], - "price":14.99, - "desc":[ - {"BTI":"Harry Potter and the goblet of fire / by J.K. Rowling ; illustrations by Mary GrandPr\u00e9."}, - {"BPU":"Arthur A. Levine Books,"}, - {"BPD":"c2000."}, - {"BPH":"xi, 734 p. :"} - ], - "quantity":19 }, - - { - "identifiers":[ - {"id-qualifier":"SA","id":"30"}, - {"id-qualifier":"IB","id":"0786222735"} - ], - "price":15.99, - "desc":[ - {"BTI":"Harry Potter and the Chamber of Secrets / J.K. Rowling ; illustrations by Mary GrandPr\u00e9."}, - {"BPU":"Thorndike Press,"}, - {"BPD":"1999."}, - {"BPH":"464 p. ; 22 cm."} - ], - "quantity":4 } - - ], - "line_items":4 - }], - "recipient":"0672891", - "sender":"6666666" -} diff --git a/Open-ILS/src/eg2/src/app/core/org.service.ts b/Open-ILS/src/eg2/src/app/core/org.service.ts index 456f93f6f9..dded30a108 100644 --- a/Open-ILS/src/eg2/src/app/core/org.service.ts +++ b/Open-ILS/src/eg2/src/app/core/org.service.ts @@ -122,7 +122,7 @@ export class OrgService { return this.get(nodeOrId).ou_type().can_have_users() === 't'; } - // tests that a node can have volumes + // tests that a node can have call numbers canHaveVolumes(nodeOrId): boolean { return this .get(nodeOrId) diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/cnbrowse/results.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/cnbrowse/results.component.ts index b9e2076083..941fc95bd2 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/cnbrowse/results.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/cnbrowse/results.component.ts @@ -79,7 +79,7 @@ export class CnBrowseResultsComponent implements OnInit, OnDestroy { let org = this.searchContext.searchOrg.id(); if (this.searchContext.searchOrg.ou_type().can_have_vols() === 'f') { - // If the current search org unit cannot hold volumes, search + // If the current search org unit cannot hold call numbers, search // across child org units. org = this.org.descendants(this.searchContext.searchOrg, true); } diff --git a/Open-ILS/src/eg2/src/app/staff/share/course.service.ts b/Open-ILS/src/eg2/src/app/staff/share/course.service.ts index 080626b8ef..9df204a871 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/course.service.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/course.service.ts @@ -234,7 +234,7 @@ export class CourseService { 'open-ils.cat', 'open-ils.cat.transfer_copies_to_volume', this.auth.token(), res.acn_id, [item.id()] ).subscribe(transfered_res => { - console.debug('Copy transferred to volume with code ' + transfered_res); + console.debug('Copy transferred to call number with code ' + transfered_res); }, err => { reject(err); }, () => { diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/transfer-holdings.component.ts b/Open-ILS/src/eg2/src/app/staff/share/holdings/transfer-holdings.component.ts index 8563e9a2fb..6f4ab63ce0 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/holdings/transfer-holdings.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/transfer-holdings.component.ts @@ -55,7 +55,7 @@ export class TransferHoldingsComponent implements OnInit { ngOnInit() {} // Resolves with true if transfer completed, false otherwise. - // Assumes all volumes are transferred to the same bib record. + // Assumes all call numbers are transferred to the same bib record. transferHoldings(): Promise { if (!this.callNums || this.callNums.length === 0) { return Promise.resolve(false); @@ -114,7 +114,7 @@ export class TransferHoldingsComponent implements OnInit { return this.net.request('open-ils.cat', method, this.auth.token(), { docid: this.targetRecId, lib: orgId, - volumes: volIds + call numbers: volIds }).toPromise().then(resp => { const evt = this.evt.parse(resp); diff --git a/Open-ILS/src/extras/ils_events.xml b/Open-ILS/src/extras/ils_events.xml index ce36cc6d81..43a4141fca 100644 --- a/Open-ILS/src/extras/ils_events.xml +++ b/Open-ILS/src/extras/ils_events.xml @@ -62,7 +62,7 @@ The given user barcode already exists - The selected volume has copies attached + The selected call number has copies attached A refund greater than the negative balance on a transaction was provided @@ -117,7 +117,7 @@ - The selected location cannot have volumes attached + The selected location cannot have call numbers attached @@ -149,14 +149,14 @@ The requested bib record is marked as deleted - The requested volume is marked as deleted + The requested call number is marked as deleted The saved item has been edited by another user - The selected bib record has volumes attached + The selected bib record has call numbers attached Payment of an item deposit is required. @@ -730,7 +730,7 @@ A record already exists with the requested TCN value - A volume with the same label, title and owning library exists + A call number with the same label, title and owning library exists An item with the same barcode exists diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Financials.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Financials.pm index f4007248c5..9ca5bddb8c 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Financials.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Financials.pm @@ -613,7 +613,7 @@ __PACKAGE__->register_method( method => 'create_lineitem_assets', api_name => 'open-ils.acq.lineitem.assets.create', signature => { - desc => q/Creates the bibliographic data, volume, and copies associated with a lineitem./, + desc => q/Creates the bibliographic data, call number, and copies associated with a lineitem./, params => [ {desc => 'Authentication token', type => 'string'}, {desc => 'The lineitem id', type => 'number'}, @@ -667,7 +667,7 @@ sub create_lineitem_assets_impl { my $li_details = $e->search_acq_lineitem_detail({lineitem => $li_id}, {idlist=>1}); # ----------------------------------------------------------------- - # for each lineitem_detail, create the volume if necessary, create + # for each lineitem_detail, create the call number if necessary, create # a copy, and link them all together. # ----------------------------------------------------------------- my %volcache; @@ -676,7 +676,7 @@ sub create_lineitem_assets_impl { my $li_detail = $e->retrieve_acq_lineitem_detail($li_detail_id) or return (undef, $e->die_event); - # Create the volume object if necessary + # Create the call number object if necessary my $volume = $volcache{$li_detail->cn_label}; unless($volume and $volume->owning_lib == $li_detail->owning_lib) { ($volume, $evt) = diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Order.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Order.pm index 104cf71fc5..122d1eb79b 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Order.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Order.pm @@ -1274,7 +1274,7 @@ sub create_lineitem_assets { my $li_details = $mgr->editor->search_acq_lineitem_detail({lineitem => $li_id}, {idlist=>1}); # ----------------------------------------------------------------- - # for each lineitem_detail, create the volume if necessary, create + # for each lineitem_detail, create the call number if necessary, create # a copy, and link them all together. # ----------------------------------------------------------------- my $first_cn; @@ -3190,7 +3190,7 @@ sub cancel_lineitem { $result->{"lid"}->{$k} = $v; } - # Attempt to delete the gathered copies (this will also handle volume deletion and bib deletion) + # Attempt to delete the gathered copies (this will also handle call number deletion and bib deletion) # Delete empty bibs according org unit setting my $force_delete_empty_bib = $U->ou_ancestor_setting_value( $mgr->editor->requestor->ws_ou, 'cat.bib.delete_on_no_copy_via_acq_lineitem_cancel', $mgr->editor); diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat.pm index 36376a0948..6153c407c7 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat.pm @@ -879,7 +879,7 @@ sub transfer_copies_to_volume { $oargs = {}; } - # does the volume exist? good, we also need its owning_lib later + # does the call number exist? good, we also need its owning_lib later my( $cn, $cn_evt ) = $U->fetch_callnumber( $volume, 0, $editor ); return $cn_evt if $cn_evt; @@ -907,7 +907,7 @@ sub transfer_copies_to_volume { $editor, $oargs, undef, $fleshed_copies, $delete_stats, $retarget_holds, $force_delete_empty_bib, $create_parts); if( $evt ) { - $logger->info("copy to volume transfer failed with event: ".OpenSRF::Utils::JSON->perl2JSON($evt)); + $logger->info("copy to call number transfer failed with event: ".OpenSRF::Utils::JSON->perl2JSON($evt)); $editor->rollback; return $evt; } @@ -943,7 +943,7 @@ sub transfer_copies_to_volume { } $editor->commit; - $logger->info("copy to volume transfer successfully updated ".scalar(@$copies)." copies"); + $logger->info("copy to call number transfer successfully updated ".scalar(@$copies)." copies"); reset_hold_list($auth, $retarget_holds); return 1; @@ -973,7 +973,7 @@ sub in_db_merge { #XXX we actually /will/ want to check perms for master and sources after record ownership exists # This stored proc (asset.merge_record_assets(target,source)) has the side effects of - # moving call_number, title-type (and some volume-type) hold_request and uri-mapping + # moving call_number, title-type (and some call number-type) hold_request and uri-mapping # objects from the source record to the target record, so must be called from within # a transaction. @@ -1177,7 +1177,7 @@ sub fleshed_volume_update { my $copy_ids = []; for my $vol (@$volumes) { - $logger->info("vol-update: investigating volume ".$vol->id); + $logger->info("vol-update: investigating call number ".$vol->id); $vol->editor($reqr->id); $vol->edit_date('now'); @@ -1190,7 +1190,7 @@ sub fleshed_volume_update { if( $vol->isdeleted ) { - $logger->info("vol-update: deleting volume"); + $logger->info("vol-update: deleting call number"); return $editor->die_event unless $editor->allowed('UPDATE_VOLUME', $vol->owning_lib); @@ -1203,21 +1203,21 @@ sub fleshed_volume_update { $editor->update_asset_call_number($vol); } elsif( $vol->isnew ) { - $logger->info("vol-update: creating volume"); + $logger->info("vol-update: creating call number"); ($vol,$evt) = $assetcom->create_volume( $auto_merge_vols ? { all => 1} : $oargs, $editor, $vol ); return $evt if $evt; } elsif( $vol->ischanged ) { - $logger->info("vol-update: update volume"); + $logger->info("vol-update: update call number"); # Three cases here: - # 1) We're editing a volume, and not its copies. - # 2) We're editing a volume, and a subset of its copies. - # 3) We're editing a volume, and all of its copies. + # 1) We're editing a call number, and not its copies. + # 2) We're editing a call number, and a subset of its copies. + # 3) We're editing a call number, and all of its copies. # - # For 1) and 3), we definitely want to edit the volume + # For 1) and 3), we definitely want to edit the call number # itself (and possibly auto-merge), but for 2), we want - # to create a new volume (and possibly auto-merge). + # to create a new call number (and possibly auto-merge). if (scalar(@$copies) == 0) { # case 1 @@ -1302,8 +1302,8 @@ sub update_volume { if($auto_merge) { - # If the auto-merge option is on, merge our updated volume into the existing - # volume with the same record + owner + label. + # If the auto-merge option is on, merge our updated call number into the existing + # call number with the same record + owner + label. ($merge_vol, $evt) = OpenILS::Application::Cat::Merge::merge_volumes($editor, [$vol], $vols->[0]); return {evt => $evt, merge_vol => $merge_vol}; @@ -1370,7 +1370,7 @@ sub batch_volume_transfer { my $override = 1 if $self->api_name =~ /override/; $oargs = { all => 1 } unless defined $oargs; - $logger->info("merge: transferring volumes to lib=$o_lib and record=$rec"); + $logger->info("merge: transferring call numbers to lib=$o_lib and record=$rec"); my $e = new_editor(authtoken => $auth, xact =>1); return $e->event unless $e->checkauth; @@ -1391,24 +1391,24 @@ sub batch_volume_transfer { for my $vol (@$vols) { - # if we've already looked at this volume, go to the next + # if we've already looked at this call number, go to the next next if !$vol or grep { $vol->id == $_ } @seen; - # grab all of the volumes in the list that have + # grab all of the call numbers in the list that have # the same label so they can be merged my @all = grep { $_->label eq $vol->label } @$vols; - # take note of the fact that we've looked at this set of volumes + # take note of the fact that we've looked at this set of call numbers push( @seen, $_->id ) for @all; push( @rec_ids, $_->record ) for @all; - # for each volume, see if there are any copies that have a + # for each call number, see if there are any copies that have a # remote circ_lib (circ_lib != vol->owning_lib and != $o_lib ). # if so, warn them unless( $override && ($oargs->{all} || grep { $_ eq 'COPY_REMOTE_CIRC_LIB' } @{$oargs->{events}}) ) { for my $v (@all) { - $logger->debug("merge: searching for copies with remote circ_lib for volume ".$v->id); + $logger->debug("merge: searching for copies with remote circ_lib for call number ".$v->id); my $args = { call_number => $v->id, circ_lib => { "not in" => [ $o_lib, $v->owning_lib ] }, @@ -1426,7 +1426,7 @@ sub batch_volume_transfer { # record the difference between the destination bib and the present bib my $same_bib = $vol->record == $rec; - # see if there is a volume at the destination lib that + # see if there is a call number at the destination lib that # already has the requested label my $existing_vol = $e->search_asset_call_number( { @@ -1442,19 +1442,19 @@ sub batch_volume_transfer { if( $existing_vol ) { if( grep { $_->id == $existing_vol->id } @all ) { - # this volume is already accounted for in our list of volumes to merge + # this call number is already accounted for in our list of call numbers to merge $existing_vol = undef; } else { - # this volume exists on the destination record/owning_lib and must + # this call number exists on the destination record/owning_lib and must # be used as the destination for merging - $logger->debug("merge: volume already exists at destination record: ". + $logger->debug("merge: call number already exists at destination record: ". $existing_vol->id.' : '.$existing_vol->label) if $existing_vol; } } if( @all > 1 || $existing_vol ) { - $logger->info("merge: found collisions in volume transfer"); + $logger->info("merge: found collisions in call number transfer"); my @args = ($e, \@all); @args = ($e, \@all, $existing_vol) if $existing_vol; ($vol, $evt) = OpenILS::Application::Cat::Merge::merge_volumes(@args); @@ -1468,14 +1468,14 @@ sub batch_volume_transfer { $vol->editor($e->requestor->id); $vol->edit_date('now'); - $logger->info("merge: updating volume ".$vol->id); + $logger->info("merge: updating call number ".$vol->id); $e->update_asset_call_number($vol) or return $e->event; } else { - $logger->info("merge: bypassing volume update because existing volume used as target"); + $logger->info("merge: bypassing call number update because existing call number used as target"); } - # regardless of what volume was used as the destination, + # regardless of what call number was used as the destination, # update any copies that have moved over to the new lib my $copies = $e->search_asset_copy([ { call_number => $vol->id , deleted => 'f' }, @@ -1495,7 +1495,7 @@ sub batch_volume_transfer { $e->update_asset_copy($copy) or return $e->event; } - # update parts if volume is moving bib records + # update parts if call number is moving bib records if( !$same_bib ) { for my $copy (@$copies) { my $parts = $copy->parts; diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/AssetCommon.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/AssetCommon.pm index f9f60dcef5..b63899e7b6 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/AssetCommon.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/AssetCommon.pm @@ -60,7 +60,7 @@ sub create_copy { return OpenILS::Event->new('COPY_LOCATION_NOT_FOUND') unless @$copy_loc; - # see if the volume this copy references is marked as deleted + # see if the call number this copy references is marked as deleted return OpenILS::Event->new('VOLUME_DELETED', vol => $vol->id) if $U->is_true($vol->deleted); @@ -552,7 +552,7 @@ sub cancel_copy_holds { return $class->cancel_hold_list($editor, $holds); } -# deletes all holds that specifically target the deleted volume +# deletes all holds that specifically target the deleted call number sub cancel_volume_holds { my($class, $editor, $volume) = @_; @@ -597,7 +597,7 @@ sub create_volume { $override = { all => 1 } if($override && !ref $override); $override = { all => 0 } if(!ref $override); - # see if the record this volume references is marked as deleted + # see if the record this call number references is marked as deleted my $rec = $editor->retrieve_biblio_record_entry($vol->record) or return $editor->die_event; return OpenILS::Event->new('BIB_RECORD_DELETED', rec => $rec->id) @@ -616,7 +616,7 @@ sub create_volume { my $label = undef; if(@$vols) { - # we've found an exising volume + # we've found an exising call number if($override->{all} || grep { $_ eq 'VOLUME_LABEL_EXISTS' } @{$override->{events}}) { $label = $vol->label; } else { @@ -625,8 +625,8 @@ sub create_volume { } } - # create a temp label so we can create the new volume, - # then de-dup it with the existing volume + # create a temp label so we can create the new call number, + # then de-dup it with the existing call number $vol->label( "__SYSTEM_TMP_$$".time) if $label; $vol->creator($editor->requestor->id); @@ -646,7 +646,7 @@ sub create_volume { return ($vol); } -# returns the volume if it exists +# returns the call number if it exists sub volume_exists { my($class, $e, $rec_id, $label, $owning_lib, $prefix, $suffix) = @_; return $e->search_asset_call_number( @@ -669,11 +669,11 @@ sub find_or_create_volume { $vol = $class->volume_exists($e, $record_id, $label, $org_id, $prefix, $suffix); } - # If the volume exists, return the ID + # If the call number exists, return the ID return ($vol, undef, 1) if $vol; # ----------------------------------------------------------------- - # Otherwise, create a new volume with the given attributes + # Otherwise, create a new call number with the given attributes # ----------------------------------------------------------------- return (undef, $e->die_event) unless $e->allowed('UPDATE_VOLUME', $org_id); @@ -715,7 +715,7 @@ sub remove_empty_objects { if( OpenILS::Application::Cat::BibCommon->title_is_empty($editor, $vol->record, $vol->id) ) { - # delete this volume if it's not already marked as deleted + # delete this call number if it's not already marked as deleted unless( $U->is_true($vol->deleted) || $vol->isdeleted ) { my $evt = $class->delete_volume($editor, $vol, $override, 0, 1); return $evt if $evt; @@ -732,12 +732,12 @@ sub remove_empty_objects { } else { - # this may be the last copy attached to the volume. + # this may be the last copy attached to the call number. if($U->ou_ancestor_setting_value( $editor->requestor->ws_ou, 'cat.volume.delete_on_empty', $editor)) { - # if this volume is "empty" and not mid-delete, delete it. + # if this call number is "empty" and not mid-delete, delete it. unless($U->is_true($vol->deleted) || $vol->isdeleted) { my $copies = $editor->search_asset_copy( @@ -754,7 +754,7 @@ sub remove_empty_objects { return undef; } -# Deletes a volume. Returns undef on success, event on error +# Deletes a call number. Returns undef on success, event on error # force : deletes all attached copies # skip_copy_check : assumes caller has verified no copies need deleting first sub delete_volume { @@ -784,7 +784,7 @@ sub delete_volume { $evt = $class->cancel_volume_holds($editor, $vol); return $evt if $evt; - # handle the case where this is the last volume on the record + # handle the case where this is the last call number on the record return $class->remove_empty_objects($editor, $override, $vol); } diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/BibCommon.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/BibCommon.pm index c461dba2ac..7a40b5aaa3 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/BibCommon.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/BibCommon.pm @@ -377,15 +377,15 @@ sub delete_rec { # --------------------------------------------------------------------------- -# returns true if the given title (id) has no un-deleted volumes or -# copies attached. If a context volume is defined, a record -# is considered empty only if the context volume is the only -# remaining volume on the record. +# returns true if the given title (id) has no un-deleted call numbers or +# copies attached. If a context call number is defined, a record +# is considered empty only if the context call number is the only +# remaining call number on the record. # --------------------------------------------------------------------------- sub title_is_empty { my($class, $editor, $rid, $vol_id) = @_; - # check if $rid is an object, because may be passing the volume + # check if $rid is an object, because may be passing the call number # with a fleshed record in one of our callers. $rid = $rid->id() if (ref($rid)); @@ -394,11 +394,11 @@ sub title_is_empty { my $cnlist = $editor->search_asset_call_number( { record => $rid, deleted => 'f' }, { idlist => 1 } ); - return 1 unless @$cnlist; # no attached volumes - return 0 if @$cnlist > 1; # multiple attached volumes - return 0 unless $$cnlist[0] == $vol_id; # attached volume is not the context vol. + return 1 unless @$cnlist; # no attached call numbers + return 0 if @$cnlist > 1; # multiple attached call numbers + return 0 unless $$cnlist[0] == $vol_id; # attached call number is not the context vol. - # see if the sole remaining context volume has any attached copies + # see if the sole remaining context call number has any attached copies for my $cn (@$cnlist) { my $copylist = $editor->search_asset_copy( [ diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/Merge.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/Merge.pm index 699af6a61e..aba111e2ab 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/Merge.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/Merge.pm @@ -51,8 +51,8 @@ sub merge_records { $logger->activity("merge: user ".$reqr->id." merging bib records: @recs with master = $master"); # ----------------------------------------------------------- - # collect all of the volumes, merge any with duplicate - # labels, then move all of the volumes to the master record + # collect all of the call numbers, merge any with duplicate + # labels, then move all of the call numbers to the master record # ----------------------------------------------------------- my @volumes; for (@recs) { @@ -60,10 +60,10 @@ sub merge_records { push( @volumes, @$vs ); } - $logger->info("merge: merge recovered ".scalar(@volumes)." total volumes"); + $logger->info("merge: merge recovered ".scalar(@volumes)." total call numbers"); my @trimmed; - # de-duplicate any volumes with the same label and owning_lib + # de-duplicate any call numbers with the same label and owning_lib my %seen_vols; @@ -83,34 +83,34 @@ sub merge_records { my @dups; for my $vv (@volumes) { if( $vv->label eq $v->label and $vv->owning_lib == $v->owning_lib ) { - $logger->debug("merge: pushing dupe volume ".$vv->id) if @dups; + $logger->debug("merge: pushing dupe call number ".$vv->id) if @dups; push( @dups, $vv ); $seen_vols{$vv->id} = 1; } } if( @dups == 1 ) { - $logger->debug("merge: pushing unique volume into trimmed volume set: ".$v->id); + $logger->debug("merge: pushing unique call number into trimmed call number set: ".$v->id); push( @trimmed, @dups ); } else { my($vol, $e) = merge_volumes($editor, \@dups); return $e if $e; - $logger->debug("merge: pushing vol-merged volume into trimmed volume set: ".$vol->id); + $logger->debug("merge: pushing vol-merged call number into trimmed call number set: ".$vol->id); push(@trimmed, $vol); } } - my $s = 'merge: trimmed volume set contains the following vols: '; + my $s = 'merge: trimmed call number set contains the following vols: '; $s .= 'id = '.$_->id .' : record = '.$_->record.' | ' for @trimmed; $logger->debug($s); - # make all the volumes point to the master record + # make all the call numbers point to the master record my $stat; for $vol (@trimmed) { if( $vol->record ne $master ) { - $logger->debug("merge: moving volume ". + $logger->debug("merge: moving call number ". $vol->id." from record ".$vol->record. " to $master"); $vol->editor( $editor->requestor->id ); @@ -155,9 +155,9 @@ sub merge_records { -# takes a list of volume objects, picks the volume with most -# copies and moves all copies attached to the other volumes -# into said volume. all other volumes are deleted +# takes a list of call number objects, picks the call number with most +# copies and moves all copies attached to the other call numbers +# into said call number. all other call numbers are deleted sub merge_volumes { my( $editor, $volumes, $master ) = @_; my %copies; @@ -169,12 +169,12 @@ sub merge_volumes { $master and @$volumes == 1 and $master->id == $$volumes[0]->id; - $logger->debug("merge: fetching copies for volume list of size ".scalar(@$volumes)); + $logger->debug("merge: fetching copies for call number list of size ".scalar(@$volumes)); - # collect all of the copies attached to the selected volumes + # collect all of the copies attached to the selected call numbers for( @$volumes ) { $copies{$_->id} = $editor->search_asset_copy({call_number=>$_->id, deleted=>'f'}); - $logger->debug("merge: found ".scalar(@{$copies{$_->id}})." copies for volume ".$_->id); + $logger->debug("merge: found ".scalar(@{$copies{$_->id}})." copies for call number ".$_->id); } my $bigcn; @@ -199,9 +199,9 @@ sub merge_volumes { $bigcn = $$volumes[0]->id unless $bigcn; - $logger->info("merge: merge using volume $bigcn as the master"); + $logger->info("merge: merge using call number $bigcn as the master"); - # now move all of the copies to the new volume + # now move all of the copies to the new call number for my $cn (keys %copies) { next if $cn == $bigcn; for my $copy (@{$copies{$cn}}) { @@ -224,7 +224,7 @@ sub merge_volumes { } my ($mvol) = grep { $_->id == $bigcn } @$volumes; - $logger->debug("merge: returning master volume ".$mvol->id); + $logger->debug("merge: returning master call number ".$mvol->id); return ($mvol); } @@ -242,7 +242,7 @@ sub merge_volume_holds { for my $hold (@$holds) { $logger->info("Changing hold ".$hold->id. - " target from ".$hold->target." to $master_id in volume merge"); + " target from ".$hold->target." to $master_id in call number merge"); $hold->target($master_id); unless($e->update_action_hold_request($hold)) { diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm index bb4412b6d9..12791990b6 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm @@ -1219,7 +1219,7 @@ sub copy_details { hold => $hold, transit => $transit, circ => $circ, - volume => $vol, + call number => $vol, mvr => $mvr }; } diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm index 66280f5999..910f80608e 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm @@ -436,7 +436,7 @@ my @AUTOLOAD_FIELDS = qw/ patron patron_id patron_barcode - volume + call number title is_renewal is_checkout @@ -1928,7 +1928,7 @@ sub handle_checkout_holds { # *any* hold type that this copy could fill may end up filled. # # Then, if circ.checkout_fill_related_hold_exact_match_only is not enabled, look -# for a Title (T) or Volume (V) hold that matches the item. This allows items +# for a Title (T) or Call number (V) hold that matches the item. This allows items # that are non-requestable to count as capturing those hold types. # ------------------------------------------------------------------------------ sub find_related_user_hold { @@ -2649,7 +2649,7 @@ sub checkin_retarget { # Copy level, but not this copy? next if ($_->{hold_type} eq 'C' or $_->{hold_type} eq 'R' or $_->{hold_type} eq 'F' and $_->{target} != $self->copy->id); - # Volume level, but not this volume? + # Call number level, but not this call number? next if ($_->{hold_type} eq 'V' and $_->{target} != $self->volume->id); if(@$parts) { # We have parts? # Skip title holds diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/HoldNotify.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/HoldNotify.pm index b4559605e9..0bb3d53dd1 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/HoldNotify.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/HoldNotify.pm @@ -64,7 +64,7 @@ sub send_email_notify_pub { my @AUTOLOAD_FIELDS = qw/ hold copy - volume + call number title editor patron diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm index 11c29f8914..7b62e787c3 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm @@ -2389,10 +2389,10 @@ The named fields in the hash are: issuanceid - ID of the issuance to be held, required for Issuance level hold partid - ID of the monograph part to be held, required for monograph part level hold titleid - ID (BRN) of the title to be held, required for Title level hold - volume_id - required for Volume level hold + volume_id - required for Call number level hold copy_id - required for Copy level hold mrid - required for Meta-record level hold - hold_type - T, C (or R or F), I, V or M for Title, Copy, Issuance, Volume or Meta-record (default "T") + hold_type - T, C (or R or F), I, V or M for Title, Copy, Issuance, Call number or Meta-record (default "T") All key/value pairs are passed on to do_possibility_checks. @@ -3018,11 +3018,11 @@ sub _check_volume_hold_is_possible { my( $vol, $title, $depth, $request_lib, $patron, $requestor, $pickup_lib, $selection_ou, $oargs ) = @_; my %org_filter = create_ranged_org_filter(new_editor(), $selection_ou, $depth); my $copies = new_editor->search_asset_copy({call_number => $vol->id, %org_filter}); - $logger->info("checking possibility of volume hold for volume ".$vol->id); + $logger->info("checking possibility of call number hold for call number ".$vol->id); my $filter_copies = []; for my $copy (@$copies) { - # ignore part-mapped copies for regular volume level holds + # ignore part-mapped copies for regular call number level holds push(@$filter_copies, $copy) unless new_editor->search_asset_copy_part_map({target_copy => $copy->id})->[0]; } @@ -4832,7 +4832,7 @@ __PACKAGE__->register_method( signature => { desc => q/ Returns a stream of objects containing whatever bib, - volume, etc. data is available to the specific hold + call number, etc. data is available to the specific hold type and target. /, params => [ diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm index 5762f848fd..d926746750 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm @@ -1949,7 +1949,7 @@ sub copy_hold_capture { $cps = [ asset::copy->search( id => $hold->target ) ]; } catch Error with { my $e = shift; - die "Could not retrieve initial volume list:\n\n$e\n"; + die "Could not retrieve initial call number list:\n\n$e\n"; }; } @@ -2072,7 +2072,7 @@ sub volume_hold_capture { $cache{cns}{$_->id} = $_ for (@$vols); } catch Error with { my $e = shift; - die "Could not retrieve initial volume list:\n\n$e\n"; + die "Could not retrieve initial call number list:\n\n$e\n"; }; } @@ -2112,7 +2112,7 @@ sub title_hold_capture { } catch Error with { my $e = shift; - warn "Could not retrieve volume list:\n\n$e\n"; + warn "Could not retrieve call number list:\n\n$e\n"; }; $cache{cns}{$_->id} = $_ for (@$cn_list); diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Reactor.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Reactor.pm index cb7d5b818d..9e52ac8ea5 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Reactor.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Reactor.pm @@ -466,7 +466,7 @@ $_TT_helpers = { $$vol_data{callnumber_sort} = $vol->getAttribute('label_sortkey'); $$vol_data{suffix_sort} = $vol->findnodes('.//*[local-name()="call_number_suffix"]')->get_node(1)->getAttribute('label_sortkey'); $$vol_data{suffix} = $vol->findnodes('.//*[local-name()="call_number_suffix"]')->get_node(1)->getAttribute('label'); - #$logger->info("sort_bucket_unapi_bre found volume: " . join(', ', map { "$_: $$vol_data{$_}" } keys(%$vol_data))); + #$logger->info("sort_bucket_unapi_bre found call number: " . join(', ', map { "$_: $$vol_data{$_}" } keys(%$vol_data))); my @copies; for my $cp ($vol->findnodes('.//*[local-name()="copy" and @deleted="false"]')) { diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm index f34c8aeaee..8b0bd5ed3e 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm @@ -2090,7 +2090,7 @@ sub import_record_asset_list_impl { apply_import_item_defaults($e, $item, $auto_callnumber); # -------------------------------------------------------------------------------- - # Find or create the volume + # Find or create the call number # -------------------------------------------------------------------------------- my ($vol, $evt) = OpenILS::Application::Cat::AssetCommon->find_or_create_volume( diff --git a/Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm b/Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm index c26d8bffb9..a4f5d43b43 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm @@ -697,7 +697,7 @@ sub find_hold_from_copy { return $hold if $hold = $run_hold_query->( target => $map->metarecord, hold_type => 'M'); - # volume holds + # call number holds return $hold if $hold = $run_hold_query->( target => $copy->call_number->id, hold_type => 'V'); diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Utils/HoldTargeter.pm b/Open-ILS/src/perlmods/lib/OpenILS/Utils/HoldTargeter.pm index 3816822724..8473d838a6 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Utils/HoldTargeter.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Utils/HoldTargeter.pm @@ -508,7 +508,7 @@ sub get_hold_copies { } unless ($hold_type eq 'C' || $hold_type eq 'I' || $hold_type eq 'P') { - # For volume and higher level holds, avoid targeting copies that + # For call number and higher level holds, avoid targeting copies that # act as instances of monograph parts. $query->{from}->{acp}->{acpm} = { type => 'left', diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Utils/MFHD/Caption.pm b/Open-ILS/src/perlmods/lib/OpenILS/Utils/MFHD/Caption.pm index b79afe071b..22b6e57a36 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Utils/MFHD/Caption.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Utils/MFHD/Caption.pm @@ -360,7 +360,7 @@ sub calendar_increment { } else { # @cur is in the year before @new. There are # two possible cases for the calendar change date that - # indicate that it's time to change the volume: + # indicate that it's time to change the call number: # (1) the change date is AFTER @cur in the year, or # (2) the change date is BEFORE @new in the year. # @@ -499,13 +499,13 @@ sub next_chron { $next->{$keys[$i]} = $new[$i]; } - # Figure out if we need to adjust volume number + # Figure out if we need to adjust call number number # # If we are incrementing based on date, $carry doesn't # matter: we're not going to increment the v. number twice # # It is conceivable that a serial could increment based on date for some - # volumes and issue numbering for other volumes, but until a real case + # call numbers and issue numbering for other call numbers, but until a real case # comes up, let's assume that defined calendar changes always trump $u if (defined $pattern->{x}) { my $increment = $self->calendar_increment(\@cur, \@new); @@ -718,7 +718,7 @@ sub next_enum { $carry = 0; } - # You can't have a combined issue that spans two volumes: no.12/1 + # You can't have a combined issue that spans two call numbers: no.12/1 # is forbidden if ($self->enum_is_combined($key, $next->{$key})) { $next->{$key} .= '/' . ($next->{$key} + 1); diff --git a/Open-ILS/src/perlmods/live_t/26-lp1411422-transferring-items-volumes-with-parts.t b/Open-ILS/src/perlmods/live_t/26-lp1411422-transferring-items-volumes-with-parts.t index 5bd7e1f14d..32d8f45e2e 100755 --- a/Open-ILS/src/perlmods/live_t/26-lp1411422-transferring-items-volumes-with-parts.t +++ b/Open-ILS/src/perlmods/live_t/26-lp1411422-transferring-items-volumes-with-parts.t @@ -88,7 +88,7 @@ foreach(@{$sdestbib}) { diag("Using this non parted bib ". $destbib->id); -# Create a new volume for the copy to transfer to +# Create a new call number for the copy to transfer to # ------------- my $newcall = Fieldmapper::asset::call_number->new; @@ -100,7 +100,7 @@ $newcall->label('Test copy transfer with parts'); my $stat = $e->create_asset_call_number($newcall); -ok($stat, 'Created temporary volume on bib '.$destbib->id); +ok($stat, 'Created temporary call number on bib '.$destbib->id); diag( "New call number id: " . $newcall->id ); @@ -127,7 +127,7 @@ ok($destparts, 'Copy transfer with parts success on bib '.$destbib->id); is($destparts->label, $part->label, 'Part labels match and everything!'); -# Now test transferring volumes, +# Now test transferring call numbers, # might as well transfer it back to the old bib # ------------- diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index df03e859aa..21e4d5d788 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -106,7 +106,7 @@ This is table is used to set up the relative "quality" of each MARC source, such as OCLC. Also identifies "transcendant" sources, i.e., sources of bib records that should display in the OPAC even if no copies or located URIs are attached. Also indicates if -the source is allowed to have actual copies on its bibs. Volumes +the source is allowed to have actual copies on its bibs. Call numbers for targeted URIs are unaffected by this setting. $$; diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql index 8f31296ed5..302ea4375e 100644 --- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql +++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql @@ -713,7 +713,7 @@ INSERT INTO permission.perm_list ( id, code, description ) VALUES ( 4, 'TITLE_HOLDS', oils_i18n_gettext( 4, 'Allow a user to place a hold at the title level', 'ppl', 'description' )), ( 5, 'VOLUME_HOLDS', oils_i18n_gettext( 5, - 'Allow a user to place a volume level hold', 'ppl', 'description' )), + 'Allow a user to place a call number level hold', 'ppl', 'description' )), ( 6, 'COPY_HOLDS', oils_i18n_gettext( 6, 'Allow a user to place a hold on a specific copy', 'ppl', 'description' )), ( 7, 'REQUEST_HOLDS', oils_i18n_gettext( 7, @@ -739,11 +739,11 @@ INSERT INTO permission.perm_list ( id, code, description ) VALUES ( 17, 'IMPORT_MARC', oils_i18n_gettext( 17, 'Allow a user to import a MARC record via the Z39.50 interface', 'ppl', 'description' )), ( 18, 'CREATE_VOLUME', oils_i18n_gettext( 18, - 'Allow a user to create a volume', 'ppl', 'description' )), + 'Allow a user to create a call number', 'ppl', 'description' )), ( 19, 'UPDATE_VOLUME', oils_i18n_gettext( 19, - 'Allow a user to edit volumes - needed for merging records. This is a duplicate of VOLUME_UPDATE; user must have both permissions at appropriate level to merge records.', 'ppl', 'description' )), + 'Allow a user to edit call numbers - needed for merging records. This is a duplicate of VOLUME_UPDATE; user must have both permissions at appropriate level to merge records.', 'ppl', 'description' )), ( 20, 'DELETE_VOLUME', oils_i18n_gettext( 20, - 'Allow a user to delete a volume', 'ppl', 'description' )), + 'Allow a user to delete a call number', 'ppl', 'description' )), ( 21, 'CREATE_COPY', oils_i18n_gettext( 21, 'Allow a user to create a new copy object', 'ppl', 'description' )), ( 22, 'UPDATE_COPY', oils_i18n_gettext( 22, @@ -863,19 +863,19 @@ INSERT INTO permission.perm_list ( id, code, description ) VALUES ( 80, 'VIEW_COPY_NOTES', oils_i18n_gettext( 80, 'Allow a user to view all notes attached to a copy', 'ppl', 'description' )), ( 81, 'VIEW_VOLUME_NOTES', oils_i18n_gettext( 81, - 'Allow a user to view all notes attached to a volume', 'ppl', 'description' )), + 'Allow a user to view all notes attached to a call number', 'ppl', 'description' )), ( 82, 'VIEW_TITLE_NOTES', oils_i18n_gettext( 82, 'Allow a user to view all notes attached to a title', 'ppl', 'description' )), ( 83, 'CREATE_COPY_NOTE', oils_i18n_gettext( 83, 'Allow a user to create a new copy note', 'ppl', 'description' )), ( 84, 'CREATE_VOLUME_NOTE', oils_i18n_gettext( 84, - 'Allow a user to create a new volume note', 'ppl', 'description' )), + 'Allow a user to create a new call number note', 'ppl', 'description' )), ( 85, 'CREATE_TITLE_NOTE', oils_i18n_gettext( 85, 'Allow a user to create a new title note', 'ppl', 'description' )), ( 86, 'DELETE_COPY_NOTE', oils_i18n_gettext( 86, 'Allow a user to delete another user''s copy notes', 'ppl', 'description' )), ( 87, 'DELETE_VOLUME_NOTE', oils_i18n_gettext( 87, - 'Allow a user to delete another user''s volume note', 'ppl', 'description' )), + 'Allow a user to delete another user''s call number note', 'ppl', 'description' )), ( 88, 'DELETE_TITLE_NOTE', oils_i18n_gettext( 88, 'Allow a user to delete another user''s title note', 'ppl', 'description' )), ( 89, 'UPDATE_CONTAINER', oils_i18n_gettext( 89, @@ -3214,7 +3214,7 @@ INSERT into config.org_unit_setting_type 'Default copy status (normal)', 'coust', 'label'), oils_i18n_gettext('cat.default_copy_status_normal', - 'Default status when a copy is created using the normal volume/copy creator interface.', + 'Default status when a copy is created using the normal call number/copy creator interface.', 'coust', 'description'), 'link', 'ccs') @@ -3310,10 +3310,10 @@ INSERT into config.org_unit_setting_type ,( 'cat.volume.delete_on_empty', 'cat', oils_i18n_gettext('cat.volume.delete_on_empty', - 'Delete volume with last copy', + 'Delete call number with last copy', 'coust', 'label'), oils_i18n_gettext('cat.volume.delete_on_empty', - 'Automatically delete a volume when the last linked copy is deleted', + 'Automatically delete a call number when the last linked copy is deleted', 'coust', 'description'), 'bool', null) @@ -3385,7 +3385,7 @@ INSERT into config.org_unit_setting_type 'Checkout Fills Related Hold On Valid Copy Only', 'coust', 'label'), oils_i18n_gettext('circ.checkout_fills_related_hold_exact_match_only', - 'When filling related holds on checkout only match on items that are valid for opportunistic capture for the hold. Without this set a Title or Volume hold could match when the item is not holdable. With this set only holdable items will match.', + 'When filling related holds on checkout only match on items that are valid for opportunistic capture for the hold. Without this set a Title or Call number hold could match when the item is not holdable. With this set only holdable items will match.', 'coust', 'description'), 'bool', null) @@ -4605,7 +4605,7 @@ INSERT into config.org_unit_setting_type ,( 'ui.cat.volume_copy_editor.horizontal', 'gui', oils_i18n_gettext('ui.cat.volume_copy_editor.horizontal', - 'Horizontal layout for Volume/Copy Creator/Editor.', + 'Horizontal layout for Call number/Copy Creator/Editor.', 'coust', 'label'), oils_i18n_gettext('ui.cat.volume_copy_editor.horizontal', 'The main entry point for this interface is in Holdings Maintenance, Actions for Selected Rows, Edit Item Attributes / Call Numbers / Replace Barcodes. This setting changes the top and bottom panes for that interface into left and right panes.', @@ -5334,10 +5334,10 @@ INSERT into config.org_unit_setting_type ,( 'ui.unified_volume_copy_editor', 'gui', oils_i18n_gettext('ui.unified_volume_copy_editor', - 'Unified Volume/Item Creator/Editor', + 'Unified Call number/Item Creator/Editor', 'coust', 'label'), oils_i18n_gettext('ui.unified_volume_copy_editor', - 'If true combines the Volume/Copy Creator and Item Attribute Editor in some instances.', + 'If true combines the Call number/Copy Creator and Item Attribute Editor in some instances.', 'coust', 'description'), 'bool', null) @@ -18870,7 +18870,7 @@ VALUES ( 'cat.holdings_show_empty', 'cat', 'bool', oils_i18n_gettext( 'cat.holdings_show_empty', - 'Holdings View Show Empty Volumes', + 'Holdings View Show Empty Call numbers', 'cwst', 'label' ) ), ( @@ -18884,7 +18884,7 @@ VALUES ( 'cat.holdings_show_vols', 'cat', 'bool', oils_i18n_gettext( 'cat.holdings_show_vols', - 'Holdings View Show Volumes', + 'Holdings View Show Call numbers', 'cwst', 'label' ) ), ( diff --git a/Open-ILS/src/sql/Pg/960.data.marc21-tag-tables.sql b/Open-ILS/src/sql/Pg/960.data.marc21-tag-tables.sql index 16963c7dc7..3d1befbbe4 100644 --- a/Open-ILS/src/sql/Pg/960.data.marc21-tag-tables.sql +++ b/Open-ILS/src/sql/Pg/960.data.marc21-tag-tables.sql @@ -415,7 +415,7 @@ VALUES (1, 'biblio', '026', 'c', $$Date$$, FALSE, FALSE, FALSE); INSERT INTO config.marc_subfield(marc_format, marc_record_type, tag, code, description, repeatable, mandatory, hidden) -VALUES (1, 'biblio', '026', 'd', $$Number of volume or part$$, +VALUES (1, 'biblio', '026', 'd', $$Number of call number or part$$, TRUE, FALSE, FALSE); INSERT INTO config.marc_subfield(marc_format, marc_record_type, tag, code, description, repeatable, mandatory, hidden) @@ -4851,7 +4851,7 @@ VALUES (1, 'biblio', '504', '8', $$Field link and sequence number$$, TRUE, FALSE, FALSE); INSERT INTO config.marc_field(marc_format, marc_record_type, tag, name, description, fixed_field, repeatable, mandatory, hidden) -VALUES (1, 'biblio', '505', $$Formatted Contents Note$$, $$Titles of separate works or parts of an item or the table of contents. The field may also contain statements of responsibility and volume numbers or other sequential designations.$$, +VALUES (1, 'biblio', '505', $$Formatted Contents Note$$, $$Titles of separate works or parts of an item or the table of contents. The field may also contain statements of responsibility and call number numbers or other sequential designations.$$, FALSE, TRUE, FALSE, FALSE); INSERT INTO config.record_attr_definition(name, label) VALUES ('marc21_biblio_505_ind_1', 'MARC 21 biblio field 505 indicator position 1'); @@ -17225,7 +17225,7 @@ VALUES (1, 'authority', '641', '8', $$Field link and sequence number$$, TRUE, FALSE, FALSE); INSERT INTO config.marc_field(marc_format, marc_record_type, tag, name, description, fixed_field, repeatable, mandatory, hidden) -VALUES (1, 'authority', '642', $$Series Numbering Example$$, $$Series numbering example that is to be followed in the sequential designation portion of a series added entry tracing in bibliographic records for individual issues of the series named in the 1XX field of an established heading record for a series. Different ranges of volumes/dates or different series numbering examples for different organizations and/or different copies or sets within the same organization are also contained in separate 642 fields.$$, +VALUES (1, 'authority', '642', $$Series Numbering Example$$, $$Series numbering example that is to be followed in the sequential designation portion of a series added entry tracing in bibliographic records for individual issues of the series named in the 1XX field of an established heading record for a series. Different ranges of call numbers/dates or different series numbering examples for different organizations and/or different copies or sets within the same organization are also contained in separate 642 fields.$$, FALSE, TRUE, FALSE, FALSE); INSERT INTO config.record_attr_definition(name, label) VALUES ('marc21_authority_642_ind_1', 'MARC 21 authority field 642 indicator position 1'); @@ -17257,7 +17257,7 @@ VALUES (1, 'authority', '642', '8', $$Field link and sequence number$$, TRUE, FALSE, FALSE); INSERT INTO config.marc_field(marc_format, marc_record_type, tag, name, description, fixed_field, repeatable, mandatory, hidden) -VALUES (1, 'authority', '643', $$Series Place and Publisher/Issuing Body$$, $$Place of publication and the name of the publisher/issuing body of the series named in the 1XX field of an established heading record for a series. May also contain the volumes/dates to which the publication information applies.$$, +VALUES (1, 'authority', '643', $$Series Place and Publisher/Issuing Body$$, $$Place of publication and the name of the publisher/issuing body of the series named in the 1XX field of an established heading record for a series. May also contain the call numbers/dates to which the publication information applies.$$, FALSE, TRUE, FALSE, FALSE); INSERT INTO config.record_attr_definition(name, label) VALUES ('marc21_authority_643_ind_1', 'MARC 21 authority field 643 indicator position 1'); @@ -17289,7 +17289,7 @@ VALUES (1, 'authority', '643', '8', $$Field link and sequence number$$, TRUE, FALSE, FALSE); INSERT INTO config.marc_field(marc_format, marc_record_type, tag, name, description, fixed_field, repeatable, mandatory, hidden) -VALUES (1, 'authority', '644', $$Series Analysis Practice$$, $$One-character alphabetic code that indicates a specific organization's analysis practice for a series named in the 1XX field of an established heading record for a series. May also contain the volumes/dates and/or the institution/copy identification to which the practice applies.$$, +VALUES (1, 'authority', '644', $$Series Analysis Practice$$, $$One-character alphabetic code that indicates a specific organization's analysis practice for a series named in the 1XX field of an established heading record for a series. May also contain the call numbers/dates and/or the institution/copy identification to which the practice applies.$$, FALSE, TRUE, FALSE, FALSE); INSERT INTO config.record_attr_definition(name, label) VALUES ('marc21_authority_644_ind_1', 'MARC 21 authority field 644 indicator position 1'); @@ -17325,7 +17325,7 @@ VALUES (1, 'authority', '644', '8', $$Field link and sequence number$$, TRUE, FALSE, FALSE); INSERT INTO config.marc_field(marc_format, marc_record_type, tag, name, description, fixed_field, repeatable, mandatory, hidden) -VALUES (1, 'authority', '645', $$Series Tracing Practice$$, $$One-character alphabetic code that indicates a specific organization's tracing practice for a series named in the 1XX field of an established heading record for a series. May also contain the volumes/dates and/or the institution/copy identification to which the tracing practice applies.$$, +VALUES (1, 'authority', '645', $$Series Tracing Practice$$, $$One-character alphabetic code that indicates a specific organization's tracing practice for a series named in the 1XX field of an established heading record for a series. May also contain the call numbers/dates and/or the institution/copy identification to which the tracing practice applies.$$, FALSE, TRUE, FALSE, FALSE); INSERT INTO config.record_attr_definition(name, label) VALUES ('marc21_authority_645_ind_1', 'MARC 21 authority field 645 indicator position 1'); @@ -17357,7 +17357,7 @@ VALUES (1, 'authority', '645', '8', $$Field link and sequence number$$, TRUE, FALSE, FALSE); INSERT INTO config.marc_field(marc_format, marc_record_type, tag, name, description, fixed_field, repeatable, mandatory, hidden) -VALUES (1, 'authority', '646', $$Series Classification Practice$$, $$One-character alphabetic code that indicates a specific organization's classification practice for a series named in the 1XX field of an established heading record for a series. May also contain the volumes/dates and/or the institution/copy identification to which the classification practice applies.$$, +VALUES (1, 'authority', '646', $$Series Classification Practice$$, $$One-character alphabetic code that indicates a specific organization's classification practice for a series named in the 1XX field of an established heading record for a series. May also contain the call numbers/dates and/or the institution/copy identification to which the classification practice applies.$$, FALSE, TRUE, FALSE, FALSE); INSERT INTO config.record_attr_definition(name, label) VALUES ('marc21_authority_646_ind_1', 'MARC 21 authority field 646 indicator position 1'); diff --git a/Open-ILS/src/sql/Pg/upgrade/0358.data.acq.cancel_reason-6063.sql b/Open-ILS/src/sql/Pg/upgrade/0358.data.acq.cancel_reason-6063.sql index 809fbcdd29..84c8ef0838 100644 --- a/Open-ILS/src/sql/Pg/upgrade/0358.data.acq.cancel_reason-6063.sql +++ b/Open-ILS/src/sql/Pg/upgrade/0358.data.acq.cancel_reason-6063.sql @@ -37,7 +37,7 @@ INSERT INTO acq.cancel_reason (org_unit, keep_debits, id, label, description) VA (1, 't', 1228, 'Military sales quantity', 'Quantity of goods or services sold to a military organization.'), (1, 't', 1229, 'On premises sales', 'Sale of product in restaurants or bars.'), (1, 't', 1230, 'Off premises sales', 'Sale of product directly to a store.'), -(1, 't', 1231, 'Estimated annual volume', 'Volume estimated for a year.'), +(1, 't', 1231, 'Estimated annual call number', 'Volume estimated for a year.'), (1, 't', 1232, 'Minimum delivery batch', 'Minimum quantity of goods delivered at one time.'), (1, 't', 1233, 'Maximum delivery batch', 'Maximum quantity of goods delivered at one time.'), (1, 't', 1234, 'Pipes', 'The number of tubes used to convey a substance.'), @@ -115,7 +115,7 @@ INSERT INTO acq.cancel_reason (org_unit, keep_debits, id, label, description) VA (1, 't', 1306, 'Chargeable number of packages', 'The number of packages on which charges are based.'), (1, 't', 1307, 'Chargeable number of units', 'The number of units on which charges are based.'), (1, 't', 1308, 'Chargeable period', 'The period of time on which charges are based.'), -(1, 't', 1309, 'Chargeable volume', 'The volume on which charges are based.'), +(1, 't', 1309, 'Chargeable call number', 'The call number on which charges are based.'), (1, 't', 1310, 'Chargeable cubic measurements', 'The cubic measurements on which charges are based.'), (1, 't', 1311, 'Chargeable surface', 'The surface area on which charges are based.'), (1, 't', 1312, 'Chargeable length', 'The length on which charges are based.'), @@ -467,7 +467,7 @@ INSERT INTO acq.cancel_reason (org_unit, keep_debits, id, label, description) VA (1, 't', 1659, 'Tug', 'The number of tugboat(s).'), (1, 't', 1660, 'Maximum quantity capability of the package', 'Maximum quantity of a product that can be contained in a package.'), (1, 't', 1661, 'Calculated', 'The calculated quantity.'), -(1, 't', 1662, 'Monthly volume, estimated', 'Volume estimated for a month.'), +(1, 't', 1662, 'Monthly call number, estimated', 'Volume estimated for a month.'), (1, 't', 1663, 'Total number of persons', 'Quantity representing the total number of persons.'), (1, 't', 1664, 'Tariff Quantity', 'Quantity of the goods in the unit as required by Customs for duty/tax/fee assessment. These quantities may also be used for other fiscal or statistical purposes.'), (1, 't', 1665, 'Deducted tariff quantity', 'Quantity deducted from tariff quantity to reckon duty/tax/fee assessment bases.'), @@ -478,7 +478,7 @@ INSERT INTO acq.cancel_reason (org_unit, keep_debits, id, label, description) VA (1, 't', 1670, 'Chargeable number of trailers', 'The number of trailers on which charges are based.'), (1, 't', 1671, 'Number of packages for a set', 'Number of packages used to pack the individual items in a grouping of merchandise that is sold together as a single trade item.'), (1, 't', 1672, 'Number of items in a set', 'The number of individual items in a grouping of merchandise that is sold together as a single trade item.'), -(1, 't', 1673, 'Order sizing factor', 'A trade item specification other than gross, net weight, or volume for a trade item or a transaction, used for order sizing and pricing purposes.'), +(1, 't', 1673, 'Order sizing factor', 'A trade item specification other than gross, net weight, or call number for a trade item or a transaction, used for order sizing and pricing purposes.'), (1, 't', 1674, 'Number of different next lower level trade items', 'Value indicates the number of differrent next lower level trade items contained in a complex trade item.'), (1, 't', 1675, 'Agreed maximum buying quantity', 'The agreed maximum quantity of the trade item that may be purchased.'), (1, 't', 1676, 'Agreed minimum buying quantity', 'The agreed minimum quantity of the trade item that may be purchased.'), diff --git a/Open-ILS/src/sql/Pg/upgrade/0504.schema.parts_and_cnaffix.sql b/Open-ILS/src/sql/Pg/upgrade/0504.schema.parts_and_cnaffix.sql index 020a78a814..cce7f7ea41 100644 --- a/Open-ILS/src/sql/Pg/upgrade/0504.schema.parts_and_cnaffix.sql +++ b/Open-ILS/src/sql/Pg/upgrade/0504.schema.parts_and_cnaffix.sql @@ -101,7 +101,7 @@ INSERT INTO config.org_unit_setting_type ( name, label, description, datatype ) 'ui.cat.volume_copy_editor.horizontal', oils_i18n_gettext( 'ui.cat.volume_copy_editor.horizontal', - 'GUI: Horizontal layout for Volume/Copy Creator/Editor.', + 'GUI: Horizontal layout for Call number/Copy Creator/Editor.', 'coust', 'label'), oils_i18n_gettext( 'ui.cat.volume_copy_editor.horizontal', diff --git a/Open-ILS/src/sql/Pg/upgrade/0523.data.default-copy-status.sql b/Open-ILS/src/sql/Pg/upgrade/0523.data.default-copy-status.sql index e3072f8769..efc7c103de 100644 --- a/Open-ILS/src/sql/Pg/upgrade/0523.data.default-copy-status.sql +++ b/Open-ILS/src/sql/Pg/upgrade/0523.data.default-copy-status.sql @@ -14,7 +14,7 @@ INSERT into config.org_unit_setting_type ( name, label, description, datatype, fm_class ) VALUES ( 'cat.default_copy_status_normal', oils_i18n_gettext( 'cat.default_copy_status_normal', 'Cataloging: Default copy status (normal)', 'coust', 'label'), - oils_i18n_gettext( 'cat.default_copy_status_normal', 'Default status when a copy is created using the normal volume/copy creator interface.', 'coust', 'description'), + oils_i18n_gettext( 'cat.default_copy_status_normal', 'Default status when a copy is created using the normal call number/copy creator interface.', 'coust', 'description'), 'link', 'ccs' ); diff --git a/Open-ILS/src/sql/Pg/upgrade/0524.data.toggle_unified_volume_copy_editor.sql b/Open-ILS/src/sql/Pg/upgrade/0524.data.toggle_unified_volume_copy_editor.sql index 994b180c52..8cb40db728 100644 --- a/Open-ILS/src/sql/Pg/upgrade/0524.data.toggle_unified_volume_copy_editor.sql +++ b/Open-ILS/src/sql/Pg/upgrade/0524.data.toggle_unified_volume_copy_editor.sql @@ -5,8 +5,8 @@ INSERT INTO config.upgrade_log (version) VALUES ('0524'); -- phasefx INSERT into config.org_unit_setting_type ( name, label, description, datatype ) VALUES ( 'ui.unified_volume_copy_editor', - oils_i18n_gettext( 'ui.unified_volume_copy_editor', 'GUI: Unified Volume/Item Creator/Editor', 'coust', 'label'), - oils_i18n_gettext( 'ui.unified_volume_copy_editor', 'If true combines the Volume/Copy Creator and Item Attribute Editor in some instances.', 'coust', 'description'), + oils_i18n_gettext( 'ui.unified_volume_copy_editor', 'GUI: Unified Call number/Item Creator/Editor', 'coust', 'label'), + oils_i18n_gettext( 'ui.unified_volume_copy_editor', 'If true combines the Call number/Copy Creator and Item Attribute Editor in some instances.', 'coust', 'description'), 'bool' ); diff --git a/Open-ILS/src/sql/Pg/upgrade/0564.data.org-setting-cat.volume.delete_on_empty.sql b/Open-ILS/src/sql/Pg/upgrade/0564.data.org-setting-cat.volume.delete_on_empty.sql index d5c5213980..dbbb58611d 100644 --- a/Open-ILS/src/sql/Pg/upgrade/0564.data.org-setting-cat.volume.delete_on_empty.sql +++ b/Open-ILS/src/sql/Pg/upgrade/0564.data.org-setting-cat.volume.delete_on_empty.sql @@ -10,8 +10,8 @@ SELECT evergreen.upgrade_deps_block_check('0564', :eg_version); INSERT INTO config.org_unit_setting_type ( name, label, description, datatype ) VALUES ( 'cat.volume.delete_on_empty', - oils_i18n_gettext('cat.volume.delete_on_empty', 'Cat: Delete volume with last copy', 'coust', 'label'), - oils_i18n_gettext('cat.volume.delete_on_empty', 'Automatically delete a volume when the last linked copy is deleted', 'coust', 'description'), + oils_i18n_gettext('cat.volume.delete_on_empty', 'Cat: Delete call number with last copy', 'coust', 'label'), + oils_i18n_gettext('cat.volume.delete_on_empty', 'Automatically delete a call number when the last linked copy is deleted', 'coust', 'description'), 'bool' ); diff --git a/Open-ILS/src/sql/Pg/upgrade/0585.checkout_fills_related_hold_exact_match.sql b/Open-ILS/src/sql/Pg/upgrade/0585.checkout_fills_related_hold_exact_match.sql index 611a2b058d..c86fd0be75 100644 --- a/Open-ILS/src/sql/Pg/upgrade/0585.checkout_fills_related_hold_exact_match.sql +++ b/Open-ILS/src/sql/Pg/upgrade/0585.checkout_fills_related_hold_exact_match.sql @@ -7,7 +7,7 @@ INSERT into config.org_unit_setting_type ( name, label, description, datatype ) VALUES ( 'circ.checkout_fills_related_hold_exact_match_only', 'Checkout Fills Related Hold On Valid Copy Only', - 'When filling related holds on checkout only match on items that are valid for opportunistic capture for the hold. Without this set a Title or Volume hold could match when the item is not holdable. With this set only holdable items will match.', + 'When filling related holds on checkout only match on items that are valid for opportunistic capture for the hold. Without this set a Title or Call number hold could match when the item is not holdable. With this set only holdable items will match.', 'bool'); COMMIT; diff --git a/Open-ILS/src/sql/Pg/upgrade/0622.data.YAOUS-i18n-update.sql b/Open-ILS/src/sql/Pg/upgrade/0622.data.YAOUS-i18n-update.sql index 4f70fd0801..40d7b944fa 100644 --- a/Open-ILS/src/sql/Pg/upgrade/0622.data.YAOUS-i18n-update.sql +++ b/Open-ILS/src/sql/Pg/upgrade/0622.data.YAOUS-i18n-update.sql @@ -51,7 +51,7 @@ UPDATE config.org_unit_setting_type SET grp = 'cat', label='Defines the control UPDATE config.org_unit_setting_type SET grp = 'cat', label='Spine label maximum lines' WHERE name = 'cat.spine.line.height'; UPDATE config.org_unit_setting_type SET grp = 'cat', label='Spine label left margin' WHERE name = 'cat.spine.line.margin'; UPDATE config.org_unit_setting_type SET grp = 'cat', label='Spine label line width' WHERE name = 'cat.spine.line.width'; -UPDATE config.org_unit_setting_type SET grp = 'cat', label='Delete volume with last copy' WHERE name = 'cat.volume.delete_on_empty'; +UPDATE config.org_unit_setting_type SET grp = 'cat', label='Delete call number with last copy' WHERE name = 'cat.volume.delete_on_empty'; UPDATE config.org_unit_setting_type SET grp = 'gui', label='Toggle off the patron summary sidebar after first view.' WHERE name = 'circ.auto_hide_patron_summary'; UPDATE config.org_unit_setting_type SET grp = 'holds', label='Block Renewal of Items Needed for Holds' WHERE name = 'circ.block_renews_for_holds'; UPDATE config.org_unit_setting_type SET grp = 'booking', label='Elbow room' WHERE name = 'circ.booking_reservation.default_elbow_room'; @@ -175,7 +175,7 @@ UPDATE config.org_unit_setting_type SET grp = 'sec' WHERE name = 'patron.passwor UPDATE config.org_unit_setting_type SET grp = 'serial', label='Previous Issuance Copy Location' WHERE name = 'serial.prev_issuance_copy_location'; UPDATE config.org_unit_setting_type SET grp = 'gui', label='Work Log: Maximum Patrons Logged' WHERE name = 'ui.admin.patron_log.max_entries'; UPDATE config.org_unit_setting_type SET grp = 'gui', label='Work Log: Maximum Actions Logged' WHERE name = 'ui.admin.work_log.max_entries'; -UPDATE config.org_unit_setting_type SET grp = 'gui', label='Horizontal layout for Volume/Copy Creator/Editor.' WHERE name = 'ui.cat.volume_copy_editor.horizontal'; +UPDATE config.org_unit_setting_type SET grp = 'gui', label='Horizontal layout for Call number/Copy Creator/Editor.' WHERE name = 'ui.cat.volume_copy_editor.horizontal'; UPDATE config.org_unit_setting_type SET grp = 'gui', label='Uncheck bills by default in the patron billing interface' WHERE name = 'ui.circ.billing.uncheck_bills_and_unfocus_payment_box'; UPDATE config.org_unit_setting_type SET grp = 'gui', label='Record In-House Use: Maximum # of uses allowed per entry.' WHERE name = 'ui.circ.in_house_use.entry_cap'; UPDATE config.org_unit_setting_type SET grp = 'gui', label='Record In-House Use: # of uses threshold for Are You Sure? dialog.' WHERE name = 'ui.circ.in_house_use.entry_warn'; @@ -245,7 +245,7 @@ UPDATE config.org_unit_setting_type SET grp = 'gui', label='Regex for phone fiel UPDATE config.org_unit_setting_type SET grp = 'gui', label='Require at least one address for Patron Registration' WHERE name = 'ui.patron.registration.require_address'; UPDATE config.org_unit_setting_type SET grp = 'gui', label='Cap results in Patron Search at this number.' WHERE name = 'ui.patron_search.result_cap'; UPDATE config.org_unit_setting_type SET grp = 'gui', label='Require staff initials for entry/edit of item/patron/penalty notes/messages.' WHERE name = 'ui.staff.require_initials'; -UPDATE config.org_unit_setting_type SET grp = 'gui', label='Unified Volume/Item Creator/Editor' WHERE name = 'ui.unified_volume_copy_editor'; +UPDATE config.org_unit_setting_type SET grp = 'gui', label='Unified Call number/Item Creator/Editor' WHERE name = 'ui.unified_volume_copy_editor'; UPDATE config.org_unit_setting_type SET grp = 'gui', label='URL for remote directory containing list column settings.' WHERE name = 'url.remote_column_settings'; diff --git a/Open-ILS/src/sql/Pg/upgrade/0655.config.bib_source.can_have_copies.sql b/Open-ILS/src/sql/Pg/upgrade/0655.config.bib_source.can_have_copies.sql index 6d34581eb8..4158779976 100644 --- a/Open-ILS/src/sql/Pg/upgrade/0655.config.bib_source.can_have_copies.sql +++ b/Open-ILS/src/sql/Pg/upgrade/0655.config.bib_source.can_have_copies.sql @@ -1,7 +1,7 @@ -- Evergreen DB patch 0655.config.bib_source.can_have_copies.sql -- -- This column introduces the ability to prevent bib records associated --- with specific bib sources from being able to have volumes or MFHD +-- with specific bib sources from being able to have call numbers or MFHD -- records attached to them. -- BEGIN; diff --git a/Open-ILS/src/sql/Pg/upgrade/1117.data.workstation-settings.sql b/Open-ILS/src/sql/Pg/upgrade/1117.data.workstation-settings.sql index 1b99f9da5c..0609ecc600 100644 --- a/Open-ILS/src/sql/Pg/upgrade/1117.data.workstation-settings.sql +++ b/Open-ILS/src/sql/Pg/upgrade/1117.data.workstation-settings.sql @@ -116,7 +116,7 @@ VALUES ( 'cat.holdings_show_empty', 'cat', 'bool', oils_i18n_gettext( 'cat.holdings_show_empty', - 'Holdings View Show Empty Volumes', + 'Holdings View Show Empty Call numbers', 'cwst', 'label' ) ), ( @@ -130,7 +130,7 @@ VALUES ( 'cat.holdings_show_vols', 'cat', 'bool', oils_i18n_gettext( 'cat.holdings_show_vols', - 'Holdings View Show Volumes', + 'Holdings View Show Call numbers', 'cwst', 'label' ) ), ( diff --git a/Open-ILS/src/sql/Pg/version-upgrade/1.6.1-2.0-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/1.6.1-2.0-upgrade-db.sql index 698179f0e6..c0358faf24 100644 --- a/Open-ILS/src/sql/Pg/version-upgrade/1.6.1-2.0-upgrade-db.sql +++ b/Open-ILS/src/sql/Pg/version-upgrade/1.6.1-2.0-upgrade-db.sql @@ -221,7 +221,7 @@ INSERT INTO permission.temp_perm ( id, code, description ) VALUES ( 3, 'MR_HOLDS INSERT INTO permission.temp_perm ( id, code, description ) VALUES ( 4, 'TITLE_HOLDS', 'Allow a user to place a hold at the title level' ); INSERT INTO permission.temp_perm ( id, code, description ) VALUES ( 5, 'VOLUME_HOLDS', - 'Allow a user to place a volume level hold' ); + 'Allow a user to place a call number level hold' ); INSERT INTO permission.temp_perm ( id, code, description ) VALUES ( 6, 'COPY_HOLDS', 'Allow a user to place a hold on a specific copy' ); INSERT INTO permission.temp_perm ( id, code, description ) VALUES ( 7, 'REQUEST_HOLDS', @@ -247,11 +247,11 @@ INSERT INTO permission.temp_perm ( id, code, description ) VALUES ( 16, 'CREATE_ INSERT INTO permission.temp_perm ( id, code, description ) VALUES ( 17, 'IMPORT_MARC', 'Allow a user to import a MARC record via the Z39.50 interface' ); INSERT INTO permission.temp_perm ( id, code, description ) VALUES ( 18, 'CREATE_VOLUME', - 'Allow a user to create a volume' ); + 'Allow a user to create a call number' ); INSERT INTO permission.temp_perm ( id, code, description ) VALUES ( 19, 'UPDATE_VOLUME', - 'Allow a user to edit volumes - needed for merging records. This is a duplicate of VOLUME_UPDATE; user must have both permissions at appropriate level to merge records.' ); + 'Allow a user to edit call numbers - needed for merging records. This is a duplicate of VOLUME_UPDATE; user must have both permissions at appropriate level to merge records.' ); INSERT INTO permission.temp_perm ( id, code, description ) VALUES ( 20, 'DELETE_VOLUME', - 'Allow a user to delete a volume' ); + 'Allow a user to delete a call number' ); INSERT INTO permission.temp_perm ( id, code, description ) VALUES ( 21, 'CREATE_COPY', 'Allow a user to create a new copy object' ); INSERT INTO permission.temp_perm ( id, code, description ) VALUES ( 22, 'UPDATE_COPY', @@ -373,19 +373,19 @@ INSERT INTO permission.temp_perm ( id, code, description ) VALUES ( 79, 'REGISTE INSERT INTO permission.temp_perm ( id, code, description ) VALUES ( 80, 'VIEW_COPY_NOTES', 'Allow a user to view all notes attached to a copy' ); INSERT INTO permission.temp_perm ( id, code, description ) VALUES ( 81, 'VIEW_VOLUME_NOTES', - 'Allow a user to view all notes attached to a volume' ); + 'Allow a user to view all notes attached to a call number' ); INSERT INTO permission.temp_perm ( id, code, description ) VALUES ( 82, 'VIEW_TITLE_NOTES', 'Allow a user to view all notes attached to a title' ); INSERT INTO permission.temp_perm ( id, code, description ) VALUES ( 83, 'CREATE_COPY_NOTE', 'Allow a user to create a new copy note' ); INSERT INTO permission.temp_perm ( id, code, description ) VALUES ( 84, 'CREATE_VOLUME_NOTE', - 'Allow a user to create a new volume note' ); + 'Allow a user to create a new call number note' ); INSERT INTO permission.temp_perm ( id, code, description ) VALUES ( 85, 'CREATE_TITLE_NOTE', 'Allow a user to create a new title note' ); INSERT INTO permission.temp_perm ( id, code, description ) VALUES ( 86, 'DELETE_COPY_NOTE', 'Allow a user to delete another user''s copy notes' ); INSERT INTO permission.temp_perm ( id, code, description ) VALUES ( 87, 'DELETE_VOLUME_NOTE', - 'Allow a user to delete another user''s volume note' ); + 'Allow a user to delete another user''s call number note' ); INSERT INTO permission.temp_perm ( id, code, description ) VALUES ( 88, 'DELETE_TITLE_NOTE', 'Allow a user to delete another user''s title note' ); INSERT INTO permission.temp_perm ( id, code, description ) VALUES ( 89, 'UPDATE_CONTAINER', @@ -13112,7 +13112,7 @@ CREATE TABLE acq.user_request ( request_type INT NOT NULL REFERENCES acq.user_request_type (id), isxn TEXT, title TEXT, - volume TEXT, + call number TEXT, author TEXT, article_title TEXT, article_pages TEXT, @@ -17521,7 +17521,7 @@ INSERT INTO acq.cancel_reason (org_unit, keep_debits, id, label, description) VA (1, 't', 1228, 'Military sales quantity', 'Quantity of goods or services sold to a military organization.'), (1, 't', 1229, 'On premises sales', 'Sale of product in restaurants or bars.'), (1, 't', 1230, 'Off premises sales', 'Sale of product directly to a store.'), -(1, 't', 1231, 'Estimated annual volume', 'Volume estimated for a year.'), +(1, 't', 1231, 'Estimated annual call number', 'Volume estimated for a year.'), (1, 't', 1232, 'Minimum delivery batch', 'Minimum quantity of goods delivered at one time.'), (1, 't', 1233, 'Maximum delivery batch', 'Maximum quantity of goods delivered at one time.'), (1, 't', 1234, 'Pipes', 'The number of tubes used to convey a substance.'), @@ -17599,7 +17599,7 @@ INSERT INTO acq.cancel_reason (org_unit, keep_debits, id, label, description) VA (1, 't', 1306, 'Chargeable number of packages', 'The number of packages on which charges are based.'), (1, 't', 1307, 'Chargeable number of units', 'The number of units on which charges are based.'), (1, 't', 1308, 'Chargeable period', 'The period of time on which charges are based.'), -(1, 't', 1309, 'Chargeable volume', 'The volume on which charges are based.'), +(1, 't', 1309, 'Chargeable call number', 'The call number on which charges are based.'), (1, 't', 1310, 'Chargeable cubic measurements', 'The cubic measurements on which charges are based.'), (1, 't', 1311, 'Chargeable surface', 'The surface area on which charges are based.'), (1, 't', 1312, 'Chargeable length', 'The length on which charges are based.'), @@ -17951,7 +17951,7 @@ INSERT INTO acq.cancel_reason (org_unit, keep_debits, id, label, description) VA (1, 't', 1659, 'Tug', 'The number of tugboat(s).'), (1, 't', 1660, 'Maximum quantity capability of the package', 'Maximum quantity of a product that can be contained in a package.'), (1, 't', 1661, 'Calculated', 'The calculated quantity.'), -(1, 't', 1662, 'Monthly volume, estimated', 'Volume estimated for a month.'), +(1, 't', 1662, 'Monthly call number, estimated', 'Volume estimated for a month.'), (1, 't', 1663, 'Total number of persons', 'Quantity representing the total number of persons.'), (1, 't', 1664, 'Tariff Quantity', 'Quantity of the goods in the unit as required by Customs for duty/tax/fee assessment. These quantities may also be used for other fiscal or statistical purposes.'), (1, 't', 1665, 'Deducted tariff quantity', 'Quantity deducted from tariff quantity to reckon duty/tax/fee assessment bases.'), @@ -17962,7 +17962,7 @@ INSERT INTO acq.cancel_reason (org_unit, keep_debits, id, label, description) VA (1, 't', 1670, 'Chargeable number of trailers', 'The number of trailers on which charges are based.'), (1, 't', 1671, 'Number of packages for a set', 'Number of packages used to pack the individual items in a grouping of merchandise that is sold together as a single trade item.'), (1, 't', 1672, 'Number of items in a set', 'The number of individual items in a grouping of merchandise that is sold together as a single trade item.'), -(1, 't', 1673, 'Order sizing factor', 'A trade item specification other than gross, net weight, or volume for a trade item or a transaction, used for order sizing and pricing purposes.'), +(1, 't', 1673, 'Order sizing factor', 'A trade item specification other than gross, net weight, or call number for a trade item or a transaction, used for order sizing and pricing purposes.'), (1, 't', 1674, 'Number of different next lower level trade items', 'Value indicates the number of differrent next lower level trade items contained in a complex trade item.'), (1, 't', 1675, 'Agreed maximum buying quantity', 'The agreed maximum quantity of the trade item that may be purchased.'), (1, 't', 1676, 'Agreed minimum buying quantity', 'The agreed minimum quantity of the trade item that may be purchased.'), diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.0-2.1-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.0-2.1-upgrade-db.sql index 219da6bedf..3c10946d47 100644 --- a/Open-ILS/src/sql/Pg/version-upgrade/2.0-2.1-upgrade-db.sql +++ b/Open-ILS/src/sql/Pg/version-upgrade/2.0-2.1-upgrade-db.sql @@ -2629,7 +2629,7 @@ INSERT INTO config.org_unit_setting_type ( name, label, description, datatype ) 'ui.cat.volume_copy_editor.horizontal', oils_i18n_gettext( 'ui.cat.volume_copy_editor.horizontal', - 'GUI: Horizontal layout for Volume/Copy Creator/Editor.', + 'GUI: Horizontal layout for Call number/Copy Creator/Editor.', 'coust', 'label'), oils_i18n_gettext( 'ui.cat.volume_copy_editor.horizontal', @@ -3486,7 +3486,7 @@ CREATE TABLE asset.opac_visible_copies ( ); INSERT INTO biblio.peer_type (id,name) VALUES - (1,oils_i18n_gettext(1,'Bound Volume','bpt','name')), + (1,oils_i18n_gettext(1,'Bound Call number','bpt','name')), (2,oils_i18n_gettext(2,'Bilingual','bpt','name')), (3,oils_i18n_gettext(3,'Back-to-back','bpt','name')), (4,oils_i18n_gettext(4,'Set','bpt','name')), @@ -4455,7 +4455,7 @@ INSERT into config.org_unit_setting_type ( name, label, description, datatype, fm_class ) VALUES ( 'cat.default_copy_status_normal', oils_i18n_gettext( 'cat.default_copy_status_normal', 'Cataloging: Default copy status (normal)', 'coust', 'label'), - oils_i18n_gettext( 'cat.default_copy_status_normal', 'Default status when a copy is created using the normal volume/copy creator interface.', 'coust', 'description'), + oils_i18n_gettext( 'cat.default_copy_status_normal', 'Default status when a copy is created using the normal call number/copy creator interface.', 'coust', 'description'), 'link', 'ccs' ); @@ -4463,8 +4463,8 @@ INSERT into config.org_unit_setting_type INSERT into config.org_unit_setting_type ( name, label, description, datatype ) VALUES ( 'ui.unified_volume_copy_editor', - oils_i18n_gettext( 'ui.unified_volume_copy_editor', 'GUI: Unified Volume/Item Creator/Editor', 'coust', 'label'), - oils_i18n_gettext( 'ui.unified_volume_copy_editor', 'If true combines the Volume/Copy Creator and Item Attribute Editor in some instances.', 'coust', 'description'), + oils_i18n_gettext( 'ui.unified_volume_copy_editor', 'GUI: Unified Call number/Item Creator/Editor', 'coust', 'label'), + oils_i18n_gettext( 'ui.unified_volume_copy_editor', 'If true combines the Call number/Copy Creator and Item Attribute Editor in some instances.', 'coust', 'description'), 'bool' ); diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql index 8c88ab39cc..a4d4318c1d 100644 --- a/Open-ILS/src/sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql +++ b/Open-ILS/src/sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql @@ -962,8 +962,8 @@ SELECT evergreen.upgrade_deps_block_check('0564', :eg_version); INSERT INTO config.org_unit_setting_type ( name, label, description, datatype ) VALUES ( 'cat.volume.delete_on_empty', - oils_i18n_gettext('cat.volume.delete_on_empty', 'Cat: Delete volume with last copy', 'coust', 'label'), - oils_i18n_gettext('cat.volume.delete_on_empty', 'Automatically delete a volume when the last linked copy is deleted', 'coust', 'description'), + oils_i18n_gettext('cat.volume.delete_on_empty', 'Cat: Delete call number with last copy', 'coust', 'label'), + oils_i18n_gettext('cat.volume.delete_on_empty', 'Automatically delete a call number when the last linked copy is deleted', 'coust', 'description'), 'bool' ); @@ -3490,7 +3490,7 @@ INSERT into config.org_unit_setting_type ( name, label, description, datatype ) VALUES ( 'circ.checkout_fills_related_hold_exact_match_only', 'Checkout Fills Related Hold On Valid Copy Only', - 'When filling related holds on checkout only match on items that are valid for opportunistic capture for the hold. Without this set a Title or Volume hold could match when the item is not holdable. With this set only holdable items will match.', + 'When filling related holds on checkout only match on items that are valid for opportunistic capture for the hold. Without this set a Title or Call number hold could match when the item is not holdable. With this set only holdable items will match.', 'bool'); @@ -4838,7 +4838,7 @@ UPDATE config.org_unit_setting_type SET grp = 'cat', label='Defines the control UPDATE config.org_unit_setting_type SET grp = 'cat', label='Spine label maximum lines' WHERE name = 'cat.spine.line.height'; UPDATE config.org_unit_setting_type SET grp = 'cat', label='Spine label left margin' WHERE name = 'cat.spine.line.margin'; UPDATE config.org_unit_setting_type SET grp = 'cat', label='Spine label line width' WHERE name = 'cat.spine.line.width'; -UPDATE config.org_unit_setting_type SET grp = 'cat', label='Delete volume with last copy' WHERE name = 'cat.volume.delete_on_empty'; +UPDATE config.org_unit_setting_type SET grp = 'cat', label='Delete call number with last copy' WHERE name = 'cat.volume.delete_on_empty'; UPDATE config.org_unit_setting_type SET grp = 'gui', label='Toggle off the patron summary sidebar after first view.' WHERE name = 'circ.auto_hide_patron_summary'; UPDATE config.org_unit_setting_type SET grp = 'holds', label='Block Renewal of Items Needed for Holds' WHERE name = 'circ.block_renews_for_holds'; UPDATE config.org_unit_setting_type SET grp = 'booking', label='Elbow room' WHERE name = 'circ.booking_reservation.default_elbow_room'; @@ -4962,7 +4962,7 @@ UPDATE config.org_unit_setting_type SET grp = 'sec' WHERE name = 'patron.passwor UPDATE config.org_unit_setting_type SET grp = 'serial', label='Previous Issuance Copy Location' WHERE name = 'serial.prev_issuance_copy_location'; UPDATE config.org_unit_setting_type SET grp = 'gui', label='Work Log: Maximum Patrons Logged' WHERE name = 'ui.admin.patron_log.max_entries'; UPDATE config.org_unit_setting_type SET grp = 'gui', label='Work Log: Maximum Actions Logged' WHERE name = 'ui.admin.work_log.max_entries'; -UPDATE config.org_unit_setting_type SET grp = 'gui', label='Horizontal layout for Volume/Copy Creator/Editor.' WHERE name = 'ui.cat.volume_copy_editor.horizontal'; +UPDATE config.org_unit_setting_type SET grp = 'gui', label='Horizontal layout for Call number/Copy Creator/Editor.' WHERE name = 'ui.cat.volume_copy_editor.horizontal'; UPDATE config.org_unit_setting_type SET grp = 'gui', label='Uncheck bills by default in the patron billing interface' WHERE name = 'ui.circ.billing.uncheck_bills_and_unfocus_payment_box'; UPDATE config.org_unit_setting_type SET grp = 'gui', label='Record In-House Use: Maximum # of uses allowed per entry.' WHERE name = 'ui.circ.in_house_use.entry_cap'; UPDATE config.org_unit_setting_type SET grp = 'gui', label='Record In-House Use: # of uses threshold for Are You Sure? dialog.' WHERE name = 'ui.circ.in_house_use.entry_warn'; @@ -5032,7 +5032,7 @@ UPDATE config.org_unit_setting_type SET grp = 'gui', label='Regex for phone fiel UPDATE config.org_unit_setting_type SET grp = 'gui', label='Require at least one address for Patron Registration' WHERE name = 'ui.patron.registration.require_address'; UPDATE config.org_unit_setting_type SET grp = 'gui', label='Cap results in Patron Search at this number.' WHERE name = 'ui.patron_search.result_cap'; UPDATE config.org_unit_setting_type SET grp = 'gui', label='Require staff initials for entry/edit of item/patron/penalty notes/messages.' WHERE name = 'ui.staff.require_initials'; -UPDATE config.org_unit_setting_type SET grp = 'gui', label='Unified Volume/Item Creator/Editor' WHERE name = 'ui.unified_volume_copy_editor'; +UPDATE config.org_unit_setting_type SET grp = 'gui', label='Unified Call number/Item Creator/Editor' WHERE name = 'ui.unified_volume_copy_editor'; UPDATE config.org_unit_setting_type SET grp = 'gui', label='URL for remote directory containing list column settings.' WHERE name = 'url.remote_column_settings'; @@ -6242,7 +6242,7 @@ INSERT INTO permission.perm_list ( id, code, description ) VALUES -- Evergreen DB patch 0655.config.bib_source.can_have_copies.sql -- -- This column introduces the ability to prevent bib records associated --- with specific bib sources from being able to have volumes or MFHD +-- with specific bib sources from being able to have call numbers or MFHD -- records attached to them. -- diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.8.4-2.9.0-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.8.4-2.9.0-upgrade-db.sql index a61e7a9af3..c44fba286a 100644 --- a/Open-ILS/src/sql/Pg/version-upgrade/2.8.4-2.9.0-upgrade-db.sql +++ b/Open-ILS/src/sql/Pg/version-upgrade/2.8.4-2.9.0-upgrade-db.sql @@ -1450,7 +1450,7 @@ VALUES (1, 'biblio', '026', 'c', $$Date$$, FALSE, FALSE, FALSE); INSERT INTO config.marc_subfield(marc_format, marc_record_type, tag, code, description, repeatable, mandatory, hidden) -VALUES (1, 'biblio', '026', 'd', $$Number of volume or part$$, +VALUES (1, 'biblio', '026', 'd', $$Number of call number or part$$, TRUE, FALSE, FALSE); INSERT INTO config.marc_subfield(marc_format, marc_record_type, tag, code, description, repeatable, mandatory, hidden) @@ -5886,7 +5886,7 @@ VALUES (1, 'biblio', '504', '8', $$Field link and sequence number$$, TRUE, FALSE, FALSE); INSERT INTO config.marc_field(marc_format, marc_record_type, tag, name, description, fixed_field, repeatable, mandatory, hidden) -VALUES (1, 'biblio', '505', $$Formatted Contents Note$$, $$Titles of separate works or parts of an item or the table of contents. The field may also contain statements of responsibility and volume numbers or other sequential designations.$$, +VALUES (1, 'biblio', '505', $$Formatted Contents Note$$, $$Titles of separate works or parts of an item or the table of contents. The field may also contain statements of responsibility and call number numbers or other sequential designations.$$, FALSE, TRUE, FALSE, FALSE); INSERT INTO config.record_attr_definition(name, label) VALUES ('marc21_biblio_505_ind_1', 'MARC 21 biblio field 505 indicator position 1'); @@ -18210,7 +18210,7 @@ VALUES (1, 'authority', '641', '8', $$Field link and sequence number$$, TRUE, FALSE, FALSE); INSERT INTO config.marc_field(marc_format, marc_record_type, tag, name, description, fixed_field, repeatable, mandatory, hidden) -VALUES (1, 'authority', '642', $$Series Numbering Example$$, $$Series numbering example that is to be followed in the sequential designation portion of a series added entry tracing in bibliographic records for individual issues of the series named in the 1XX field of an established heading record for a series. Different ranges of volumes/dates or different series numbering examples for different organizations and/or different copies or sets within the same organization are also contained in separate 642 fields.$$, +VALUES (1, 'authority', '642', $$Series Numbering Example$$, $$Series numbering example that is to be followed in the sequential designation portion of a series added entry tracing in bibliographic records for individual issues of the series named in the 1XX field of an established heading record for a series. Different ranges of call numbers/dates or different series numbering examples for different organizations and/or different copies or sets within the same organization are also contained in separate 642 fields.$$, FALSE, TRUE, FALSE, FALSE); INSERT INTO config.record_attr_definition(name, label) VALUES ('marc21_authority_642_ind_1', 'MARC 21 authority field 642 indicator position 1'); @@ -18242,7 +18242,7 @@ VALUES (1, 'authority', '642', '8', $$Field link and sequence number$$, TRUE, FALSE, FALSE); INSERT INTO config.marc_field(marc_format, marc_record_type, tag, name, description, fixed_field, repeatable, mandatory, hidden) -VALUES (1, 'authority', '643', $$Series Place and Publisher/Issuing Body$$, $$Place of publication and the name of the publisher/issuing body of the series named in the 1XX field of an established heading record for a series. May also contain the volumes/dates to which the publication information applies.$$, +VALUES (1, 'authority', '643', $$Series Place and Publisher/Issuing Body$$, $$Place of publication and the name of the publisher/issuing body of the series named in the 1XX field of an established heading record for a series. May also contain the call numbers/dates to which the publication information applies.$$, FALSE, TRUE, FALSE, FALSE); INSERT INTO config.record_attr_definition(name, label) VALUES ('marc21_authority_643_ind_1', 'MARC 21 authority field 643 indicator position 1'); @@ -18274,7 +18274,7 @@ VALUES (1, 'authority', '643', '8', $$Field link and sequence number$$, TRUE, FALSE, FALSE); INSERT INTO config.marc_field(marc_format, marc_record_type, tag, name, description, fixed_field, repeatable, mandatory, hidden) -VALUES (1, 'authority', '644', $$Series Analysis Practice$$, $$One-character alphabetic code that indicates a specific organization's analysis practice for a series named in the 1XX field of an established heading record for a series. May also contain the volumes/dates and/or the institution/copy identification to which the practice applies.$$, +VALUES (1, 'authority', '644', $$Series Analysis Practice$$, $$One-character alphabetic code that indicates a specific organization's analysis practice for a series named in the 1XX field of an established heading record for a series. May also contain the call numbers/dates and/or the institution/copy identification to which the practice applies.$$, FALSE, TRUE, FALSE, FALSE); INSERT INTO config.record_attr_definition(name, label) VALUES ('marc21_authority_644_ind_1', 'MARC 21 authority field 644 indicator position 1'); @@ -18310,7 +18310,7 @@ VALUES (1, 'authority', '644', '8', $$Field link and sequence number$$, TRUE, FALSE, FALSE); INSERT INTO config.marc_field(marc_format, marc_record_type, tag, name, description, fixed_field, repeatable, mandatory, hidden) -VALUES (1, 'authority', '645', $$Series Tracing Practice$$, $$One-character alphabetic code that indicates a specific organization's tracing practice for a series named in the 1XX field of an established heading record for a series. May also contain the volumes/dates and/or the institution/copy identification to which the tracing practice applies.$$, +VALUES (1, 'authority', '645', $$Series Tracing Practice$$, $$One-character alphabetic code that indicates a specific organization's tracing practice for a series named in the 1XX field of an established heading record for a series. May also contain the call numbers/dates and/or the institution/copy identification to which the tracing practice applies.$$, FALSE, TRUE, FALSE, FALSE); INSERT INTO config.record_attr_definition(name, label) VALUES ('marc21_authority_645_ind_1', 'MARC 21 authority field 645 indicator position 1'); @@ -18342,7 +18342,7 @@ VALUES (1, 'authority', '645', '8', $$Field link and sequence number$$, TRUE, FALSE, FALSE); INSERT INTO config.marc_field(marc_format, marc_record_type, tag, name, description, fixed_field, repeatable, mandatory, hidden) -VALUES (1, 'authority', '646', $$Series Classification Practice$$, $$One-character alphabetic code that indicates a specific organization's classification practice for a series named in the 1XX field of an established heading record for a series. May also contain the volumes/dates and/or the institution/copy identification to which the classification practice applies.$$, +VALUES (1, 'authority', '646', $$Series Classification Practice$$, $$One-character alphabetic code that indicates a specific organization's classification practice for a series named in the 1XX field of an established heading record for a series. May also contain the call numbers/dates and/or the institution/copy identification to which the classification practice applies.$$, FALSE, TRUE, FALSE, FALSE); INSERT INTO config.record_attr_definition(name, label) VALUES ('marc21_authority_646_ind_1', 'MARC 21 authority field 646 indicator position 1'); diff --git a/Open-ILS/src/sql/Pg/version-upgrade/3.1.5-3.2.0-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/3.1.5-3.2.0-upgrade-db.sql index bc276b0d57..de90bf1ab1 100644 --- a/Open-ILS/src/sql/Pg/version-upgrade/3.1.5-3.2.0-upgrade-db.sql +++ b/Open-ILS/src/sql/Pg/version-upgrade/3.1.5-3.2.0-upgrade-db.sql @@ -791,7 +791,7 @@ VALUES ( 'cat.holdings_show_empty', 'cat', 'bool', oils_i18n_gettext( 'cat.holdings_show_empty', - 'Holdings View Show Empty Volumes', + 'Holdings View Show Empty Call numbers', 'cwst', 'label' ) ), ( @@ -805,7 +805,7 @@ VALUES ( 'cat.holdings_show_vols', 'cat', 'bool', oils_i18n_gettext( 'cat.holdings_show_vols', - 'Holdings View Show Volumes', + 'Holdings View Show Call numbers', 'cwst', 'label' ) ), ( diff --git a/Open-ILS/src/support-scripts/test-scripts/unapi_bench.pl b/Open-ILS/src/support-scripts/test-scripts/unapi_bench.pl index 5b38b28b75..a173ea879c 100755 --- a/Open-ILS/src/support-scripts/test-scripts/unapi_bench.pl +++ b/Open-ILS/src/support-scripts/test-scripts/unapi_bench.pl @@ -112,7 +112,7 @@ sub unapi { for my $rec_id (keys %records) { my $rec = $records{$rec_id}; - print sprintf("%d [%s] has %d volumes and %d copies\n", + print sprintf("%d [%s] has %d call numbers and %d copies\n", $rec_id, $rec->{title}, scalar(@{$rec->{volumes}}), scalar(map { @{$_->{copies}} } @{$rec->{volumes}})); @@ -165,7 +165,7 @@ sub unapi_spread { for my $rec_id (keys %records) { my $rec = $records{$rec_id}; - print sprintf("%d [%s] has %d volumes and %d copies\n", + print sprintf("%d [%s] has %d call numbers and %d copies\n", $rec_id, $rec->{title}, scalar(@{$rec->{volumes}}), scalar(map { @{$_->{copies}} } @{$rec->{volumes}})); @@ -210,7 +210,7 @@ sub unapi_batch { for my $rec_id (keys %records) { my $rec = $records{$rec_id}; - print sprintf("%d [%s] has %d volumes and %d copies\n", + print sprintf("%d [%s] has %d call numbers and %d copies\n", $rec_id, $rec->{title}, scalar(@{$rec->{volumes}}), scalar(map { @{$_->{copies}} } @{$rec->{volumes}})); @@ -255,7 +255,7 @@ sub direct_spread { for my $rec_id (keys %records) { my $rec = $records{$rec_id}; - print sprintf("%d [%s] has %d volumes and %d copies\n", + print sprintf("%d [%s] has %d call numbers and %d copies\n", $rec_id, $rec->{title}, scalar(@{$rec->{record}->call_numbers}), scalar(map { @{$_->copies} } @{$rec->{record}->call_numbers})); @@ -324,7 +324,7 @@ sub direct { for my $rec_id (keys %records) { my $rec = $records{$rec_id}; - print sprintf("%d [%s] has %d volumes and %d copies\n", + print sprintf("%d [%s] has %d call numbers and %d copies\n", $rec_id, $rec->{title}, scalar(@{$rec->{record}->call_numbers}), scalar(map { @{$_->copies} } @{$rec->{record}->call_numbers})); diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_table.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_table.tt2 index 0432fff0af..415e420d30 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_table.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_table.tt2 @@ -174,7 +174,7 @@ END; # FOREACH bib hold_link = ''; param_sep = l(" / "); - # Only staff get to place copy or volume holds + # Only staff get to place copy or call number holds IF ctx.is_staff; hold_link = '