Permalink
Browse files

replacing SHELF_LOC by LOC, as decided with kados on the chat

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
  • Loading branch information...
1 parent a553ea8 commit d46958af513b86e6f3d3f5f5965cdd82ac1ceb9b Paul POULAIN committed with Joshua Ferraro Dec 26, 2007
View
@@ -976,7 +976,7 @@ sub searchResults {
$branches{ $bdata->{'branchcode'} } = $bdata->{'branchname'};
}
my %locations;
- my $lsch = $dbh->prepare("SELECT authorised_value,lib FROM authorised_values WHERE category = 'SHELF_LOC'");
+ my $lsch = $dbh->prepare("SELECT authorised_value,lib FROM authorised_values WHERE category = 'LOC'");
$lsch->execute();
while (my $ldata = $lsch->fetchrow_hashref ) {
$locations{ $ldata->{'authorised_value'} } = $ldata->{'lib'};
@@ -1138,7 +1138,6 @@ sub searchResults {
foreach my $code ( keys %subfieldstosearch ) {
$item->{$code} = $field->subfield( $subfieldstosearch{$code} );
}
-
# set item's branch name, use homebranch first, fall back to holdingbranch
if ($item->{'homebranch'}) {
$item->{'branchname'} = $branches{$item->{homebranch}};
View
@@ -54,7 +54,7 @@
my %locations;
# FIXME: move this to a pm, check waiting status for holds
my $dbh = C4::Context->dbh;
-my $lsch = $dbh->prepare("SELECT authorised_value,lib FROM authorised_values WHERE category = 'SHELF_LOC'");
+my $lsch = $dbh->prepare("SELECT authorised_value,lib FROM authorised_values WHERE category = 'LOC'");
$lsch->execute();
while (my $ldata = $lsch->fetchrow_hashref ) {
$locations{ $ldata->{'authorised_value'} } = $ldata->{'lib'};
@@ -115,7 +115,7 @@ INSERT INTO marc_subfield_structure (tagfield, tagsubfield, liblibrarian, libopa
('952', '9', 'Koha itemnumber (autogenerated)', 'Koha itemnumber', 0, 0, 'items.itemnumber', -1, '', '', '', 0, 7, '', '', '', NULL),
('952', 'a', 'Location (home branch)', 'Location (home branch)', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, '', '', '', NULL),
('952', 'b', 'Sublocation or collection (holding branch)', 'Sublocation or collection (holding branch)', 1, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, '', '', '', NULL),
- ('952', 'c', 'Shelving location', 'Shelving location', 1, 0, 'items.location', 10, 'SHELF_LOC', '', '', 0, 0, '', '', '', NULL),
+ ('952', 'c', 'Shelving location', 'Shelving location', 1, 0, 'items.location', 10, 'LOC', '', '', 0, 0, '', '', '', NULL),
('952', 'd', 'Date acquired', 'Date acquired', 0, 0, 'items.dateaccessioned', 10, '', '', 'dateaccessioned.pl', 0, 0, '', '', '', NULL),
('952', 'e', 'Source of acquisition', 'Source of acquisition', 1, 0, 'items.booksellerid', 10, '', '', '', 0, 0, '', '', '', NULL),
('952', 'f', 'Coded location qualifier', 'Coded location qualifier', 1, 0, 'items.coded_location_qualifier', 10, '', '', '', NULL, 0, '', '', '', NULL),
@@ -173,7 +173,7 @@ INSERT INTO marc_subfield_structure (tagfield, tagsubfield, liblibrarian, libopa
('952', '9', 'Koha itemnumber (autogenerated)', 'Koha itemnumber', 0, 0, 'items.itemnumber', -1, '', '', '', 0, 7, 'BKS', '', '', NULL),
('952', 'a', 'Location (home branch)', 'Location (home branch)', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, 'BKS', '', '', NULL),
('952', 'b', 'Sublocation or collection (holding branch)', 'Sublocation or collection (holding branch)', 1, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, 'BKS', '', '', NULL),
- ('952', 'c', 'Shelving location', 'Shelving location', 1, 0, 'items.location', 10, 'SHELF_LOC', '', '', 0, 0, 'BKS', '', '', NULL),
+ ('952', 'c', 'Shelving location', 'Shelving location', 1, 0, 'items.location', 10, 'LOC', '', '', 0, 0, 'BKS', '', '', NULL),
('952', 'd', 'Date acquired', 'Date acquired', 0, 0, 'items.dateaccessioned', 10, '', '', 'dateaccessioned.pl', 0, 0, 'BKS', '', '', NULL),
('952', 'e', 'Source of acquisition', 'Source of acquisition', 1, 0, 'items.booksellerid', 10, '', '', '', 0, 0, 'BKS', '', '', NULL),
('952', 'f', 'Coded location qualifier', 'Coded location qualifier', 1, 0, 'items.coded_location_qualifier', 10, '', '', '', NULL, 0, 'BKS', '', '', NULL),
@@ -4090,7 +4090,7 @@ INSERT INTO marc_subfield_structure (tagfield, tagsubfield, liblibrarian, libopa
('952', '9', 'Koha itemnumber (autogenerated)', 'Koha itemnumber', 0, 0, 'items.itemnumber', -1, '', '', '', 0, 7, 'CF', '', '', NULL),
('952', 'a', 'Location (home branch)', 'Location (home branch)', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, 'CF', '', '', NULL),
('952', 'b', 'Sublocation or collection (holding branch)', 'Sublocation or collection (holding branch)', 1, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, 'CF', '', '', NULL),
- ('952', 'c', 'Shelving location', 'Shelving location', 1, 0, 'items.location', 10, 'SHELF_LOC', '', '', 0, 0, 'CF', '', '', NULL),
+ ('952', 'c', 'Shelving location', 'Shelving location', 1, 0, 'items.location', 10, 'LOC', '', '', 0, 0, 'CF', '', '', NULL),
('952', 'd', 'Date acquired', 'Date acquired', 0, 0, 'items.dateaccessioned', 10, '', '', 'dateaccessioned.pl', 0, 0, 'CF', '', '', NULL),
('952', 'e', 'Source of acquisition', 'Source of acquisition', 1, 0, 'items.booksellerid', 10, '', '', '', 0, 0, 'CF', '', '', NULL),
('952', 'f', 'Coded location qualifier', 'Coded location qualifier', 1, 0, 'items.coded_location_qualifier', 10, '', '', '', NULL, 0, 'CF', '', '', NULL),
@@ -8008,7 +8008,7 @@ INSERT INTO marc_subfield_structure (tagfield, tagsubfield, liblibrarian, libopa
('952', '9', 'Koha itemnumber (autogenerated)', 'Koha itemnumber', 0, 0, 'items.itemnumber', -1, '', '', '', 0, 7, 'SR', '', '', NULL),
('952', 'a', 'Location (home branch)', 'Location (home branch)', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, 'SR', '', '', NULL),
('952', 'b', 'Sublocation or collection (holding branch)', 'Sublocation or collection (holding branch)', 1, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, 'SR', '', '', NULL),
- ('952', 'c', 'Shelving location', 'Shelving location', 1, 0, 'items.location', 10, 'SHELF_LOC', '', '', 0, 0, 'SR', '', '', NULL),
+ ('952', 'c', 'Shelving location', 'Shelving location', 1, 0, 'items.location', 10, 'LOC', '', '', 0, 0, 'SR', '', '', NULL),
('952', 'd', 'Date acquired', 'Date acquired', 0, 0, 'items.dateaccessioned', 10, '', '', 'dateaccessioned.pl', 0, 0, 'SR', '', '', NULL),
('952', 'e', 'Source of acquisition', 'Source of acquisition', 1, 0, 'items.booksellerid', 10, '', '', '', 0, 0, 'SR', '', '', NULL),
('952', 'f', 'Coded location qualifier', 'Coded location qualifier', 1, 0, 'items.coded_location_qualifier', 10, '', '', '', NULL, 0, 'SR', '', '', NULL),
@@ -11925,7 +11925,7 @@ INSERT INTO marc_subfield_structure (tagfield, tagsubfield, liblibrarian, libopa
('952', '9', 'Koha itemnumber (autogenerated)', 'Koha itemnumber', 0, 0, 'items.itemnumber', -1, '', '', '', 0, 7, 'VR', '', '', NULL),
('952', 'a', 'Location (home branch)', 'Location (home branch)', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, 'VR', '', '', NULL),
('952', 'b', 'Sublocation or collection (holding branch)', 'Sublocation or collection (holding branch)', 1, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, 'VR', '', '', NULL),
- ('952', 'c', 'Shelving location', 'Shelving location', 1, 0, 'items.location', 10, 'SHELF_LOC', '', '', 0, 0, 'VR', '', '', NULL),
+ ('952', 'c', 'Shelving location', 'Shelving location', 1, 0, 'items.location', 10, 'LOC', '', '', 0, 0, 'VR', '', '', NULL),
('952', 'd', 'Date acquired', 'Date acquired', 0, 0, 'items.dateaccessioned', 10, '', '', 'dateaccessioned.pl', 0, 0, 'VR', '', '', NULL),
('952', 'e', 'Source of acquisition', 'Source of acquisition', 1, 0, 'items.booksellerid', 10, '', '', '', 0, 0, 'VR', '', '', NULL),
('952', 'f', 'Coded location qualifier', 'Coded location qualifier', 1, 0, 'items.coded_location_qualifier', 10, '', '', '', NULL, 0, 'VR', '', '', NULL),
@@ -15841,7 +15841,7 @@ INSERT INTO marc_subfield_structure (tagfield, tagsubfield, liblibrarian, libopa
('952', '9', 'Koha itemnumber (autogenerated)', 'Koha itemnumber', 0, 0, 'items.itemnumber', -1, '', '', '', 0, 7, 'AR', '', '', NULL),
('952', 'a', 'Location (home branch)', 'Location (home branch)', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, 'AR', '', '', NULL),
('952', 'b', 'Sublocation or collection (holding branch)', 'Sublocation or collection (holding branch)', 1, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, 'AR', '', '', NULL),
- ('952', 'c', 'Shelving location', 'Shelving location', 1, 0, 'items.location', 10, 'SHELF_LOC', '', '', 0, 0, 'AR', '', '', NULL),
+ ('952', 'c', 'Shelving location', 'Shelving location', 1, 0, 'items.location', 10, 'LOC', '', '', 0, 0, 'AR', '', '', NULL),
('952', 'd', 'Date acquired', 'Date acquired', 0, 0, 'items.dateaccessioned', 10, '', '', 'dateaccessioned.pl', 0, 0, 'AR', '', '', NULL),
('952', 'e', 'Source of acquisition', 'Source of acquisition', 1, 0, 'items.booksellerid', 10, '', '', '', 0, 0, 'AR', '', '', NULL),
('952', 'f', 'Coded location qualifier', 'Coded location qualifier', 1, 0, 'items.coded_location_qualifier', 10, '', '', '', NULL, 0, 'AR', '', '', NULL),
@@ -19756,7 +19756,7 @@ INSERT INTO marc_subfield_structure (tagfield, tagsubfield, liblibrarian, libopa
('952', '9', 'Koha itemnumber (autogenerated)', 'Koha itemnumber', 0, 0, 'items.itemnumber', -1, '', '', '', 0, 7, 'KT', '', '', NULL),
('952', 'a', 'Location (home branch)', 'Location (home branch)', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, 'KT', '', '', NULL),
('952', 'b', 'Sublocation or collection (holding branch)', 'Sublocation or collection (holding branch)', 1, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, 'KT', '', '', NULL),
- ('952', 'c', 'Shelving location', 'Shelving location', 1, 0, 'items.location', 10, 'SHELF_LOC', '', '', 0, 0, 'KT', '', '', NULL),
+ ('952', 'c', 'Shelving location', 'Shelving location', 1, 0, 'items.location', 10, 'LOC', '', '', 0, 0, 'KT', '', '', NULL),
('952', 'd', 'Date acquired', 'Date acquired', 0, 0, 'items.dateaccessioned', 10, '', '', 'dateaccessioned.pl', 0, 0, 'KT', '', '', NULL),
('952', 'e', 'Source of acquisition', 'Source of acquisition', 1, 0, 'items.booksellerid', 10, '', '', '', 0, 0, 'KT', '', '', NULL),
('952', 'f', 'Coded location qualifier', 'Coded location qualifier', 1, 0, 'items.coded_location_qualifier', 10, '', '', '', NULL, 0, 'KT', '', '', NULL),
@@ -23672,7 +23672,7 @@ INSERT INTO marc_subfield_structure (tagfield, tagsubfield, liblibrarian, libopa
('952', '9', 'Koha itemnumber (autogenerated)', 'Koha itemnumber', 0, 0, 'items.itemnumber', -1, '', '', '', 0, 7, 'IR', '', '', NULL),
('952', 'a', 'Location (home branch)', 'Location (home branch)', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, 'IR', '', '', NULL),
('952', 'b', 'Sublocation or collection (holding branch)', 'Sublocation or collection (holding branch)', 1, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, 'IR', '', '', NULL),
- ('952', 'c', 'Shelving location', 'Shelving location', 1, 0, 'items.location', 10, 'SHELF_LOC', '', '', 0, 0, 'IR', '', '', NULL),
+ ('952', 'c', 'Shelving location', 'Shelving location', 1, 0, 'items.location', 10, 'LOC', '', '', 0, 0, 'IR', '', '', NULL),
('952', 'd', 'Date acquired', 'Date acquired', 0, 0, 'items.dateaccessioned', 10, '', '', 'dateaccessioned.pl', 0, 0, 'IR', '', '', NULL),
('952', 'e', 'Source of acquisition', 'Source of acquisition', 1, 0, 'items.booksellerid', 10, '', '', '', 0, 0, 'IR', '', '', NULL),
('952', 'f', 'Coded location qualifier', 'Coded location qualifier', 1, 0, 'items.coded_location_qualifier', 10, '', '', '', NULL, 0, 'IR', '', '', NULL),
@@ -27586,7 +27586,7 @@ INSERT INTO marc_subfield_structure (tagfield, tagsubfield, liblibrarian, libopa
('952', '9', 'Koha itemnumber (autogenerated)', 'Koha itemnumber', 0, 0, 'items.itemnumber', -1, '', '', '', 0, 7, 'SER', '', '', NULL),
('952', 'a', 'Location (home branch)', 'Location (home branch)', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, 'SER', '', '', NULL),
('952', 'b', 'Sublocation or collection (holding branch)', 'Sublocation or collection (holding branch)', 1, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, 'SER', '', '', NULL),
- ('952', 'c', 'Shelving location', 'Shelving location', 1, 0, 'items.location', 10, 'SHELF_LOC', '', '', 0, 0, 'SER', '', '', NULL),
+ ('952', 'c', 'Shelving location', 'Shelving location', 1, 0, 'items.location', 10, 'LOC', '', '', 0, 0, 'SER', '', '', NULL),
('952', 'd', 'Date acquired', 'Date acquired', 0, 0, 'items.dateaccessioned', 10, '', '', 'dateaccessioned.pl', 0, 0, 'SER', '', '', NULL),
('952', 'e', 'Source of acquisition', 'Source of acquisition', 1, 0, 'items.booksellerid', 10, '', '', '', 0, 0, 'SER', '', '', NULL),
('952', 'f', 'Coded location qualifier', 'Coded location qualifier', 1, 0, 'items.coded_location_qualifier', 10, '', '', '', NULL, 0, 'SER', '', '', NULL),
@@ -114,7 +114,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
('952', '9', 'Koha itemnumber (autogenerated)', 'Koha itemnumber', 0, 0, 'items.itemnumber', -1, '', '', '', 0, 7, '', '', '', NULL),
('952', 'a', 'Location (home branch)', 'Location (home branch)', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, '', '', '', NULL),
('952', 'b', 'Sublocation or collection (holding branch)', 'Sublocation or collection (holding branch)', 0, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, '', '', '', NULL),
- ('952', 'c', 'Shelving location', 'Shelving location', 0, 0, 'items.location', 10, 'SHELF_LOC', '', '', 0, 0, '', '', '', NULL),
+ ('952', 'c', 'Shelving location', 'Shelving location', 0, 0, 'items.location', 10, 'LOC', '', '', 0, 0, '', '', '', NULL),
('952', 'd', 'Date acquired', 'Date acquired', 0, 0, 'items.dateaccessioned', 10, '', '', 'dateaccessioned.pl', 0, 0, '', '', '', NULL),
('952', 'e', 'Source of acquisition', 'Source of acquisition', 0, 0, 'items.booksellerid', 10, '', '', '', 0, 0, '', '', '', NULL),
('952', 'f', 'Coded location qualifier', 'Coded location qualifier', 0, 0, 'items.coded_location_qualifier', 10, '', '', '', NULL, 0, '', '', '', NULL),
Oops, something went wrong. Retry.

0 comments on commit d46958a

Please sign in to comment.