View | Details | Raw Unified | Return to bug 5193
Collapse All | Expand All

(-)a/admin/systempreferences.pl (+2 lines)
Lines 274-279 $tabsysprefs{QueryAutoTruncate} = "Searching"; Link Here
274
$tabsysprefs{QueryRemoveStopwords}    = "Searching";
274
$tabsysprefs{QueryRemoveStopwords}    = "Searching";
275
$tabsysprefs{AdvancedSearchTypes}     = "Searching";
275
$tabsysprefs{AdvancedSearchTypes}     = "Searching";
276
$tabsysprefs{DisplayMultiPlaceHold}   = "Searching";
276
$tabsysprefs{DisplayMultiPlaceHold}   = "Searching";
277
$tabsysprefs{OPACAdvancedSearchTypes} = "Searching";
278
$tabsysprefs{ShowAuctionSearchOptions} = "Searching";
277
279
278
# EnhancedContent
280
# EnhancedContent
279
$tabsysprefs{AmazonEnabled}          = "EnhancedContent";
281
$tabsysprefs{AmazonEnabled}          = "EnhancedContent";
(-)a/catalogue/search.pl (+5 lines)
Lines 311-316 if ( $template_type eq 'advsearch' ) { Link Here
311
    my $languages_limit_loop = getAllLanguages();
311
    my $languages_limit_loop = getAllLanguages();
312
    $template->param(search_languages_loop => $languages_limit_loop,);
312
    $template->param(search_languages_loop => $languages_limit_loop,);
313
313
314
    # display the auction house indexes
315
    if ( C4::Context->preference("ShowAuctionSearchOptions") == 1) {
316
        $template->param( ShowAuctionSearchOptions => C4::Context->preference("ShowAuctionSearchOptions") );
317
    }
318
314
    # use the global setting by default
319
    # use the global setting by default
315
    if ( C4::Context->preference("expandedSearchOption") == 1) {
320
    if ( C4::Context->preference("expandedSearchOption") == 1) {
316
        $template->param( expanded_options => C4::Context->preference("expandedSearchOption") );
321
        $template->param( expanded_options => C4::Context->preference("expandedSearchOption") );
(-)a/etc/zebradb/biblios/etc/bib1.att (+5 lines)
Lines 189-191 att 9903 lex Link Here
189
att 9904    arl
189
att 9904    arl
190
att 9013    arp
190
att 9013    arp
191
att 9520    Item
191
att 9520    Item
192
#Auction house indexes
193
att 9950    auctplace
194
att 9951    auctdate
195
att 9952    auctcode
196
(-)a/etc/zebradb/ccl.properties (+5 lines)
Lines 1052-1057 arl 1=9904 r=r Link Here
1052
1052
1053
#Accelerated Reader Point
1053
#Accelerated Reader Point
1054
arp 1=9013 r=r
1054
arp 1=9013 r=r
1055
# auction information
1056
auctplace 1=9950
1057
auctdate  1=9951
1058
auctcode  1=9952
1059
1055
1060
1056
## Statuses
1061
## Statuses
1057
popularity 1=issues
1062
popularity 1=issues
(-)a/etc/zebradb/marc_defs/marc21/biblios/record.abs (+4 lines)
Lines 153-158 melm 526$d arp,arp:n Link Here
153
#melm 533$d     pubdate,pubdate:s
153
#melm 533$d     pubdate,pubdate:s
154
#melm 541$d     Date-of-acquisition,Date-of-acquisition:s
154
#melm 541$d     Date-of-acquisition,Date-of-acquisition:s
155
melm 590        Note:w,Note:p
155
melm 590        Note:w,Note:p
156
melm 591        auctplace:w,auctplace:p
157
melm 592        auctdate,auctdate:s
158
melm 593        auctcode:w,auctcode:p
159
156
160
157
melm 600$a      Name-and-title,Name,Personal-name,Subject-name-personal,Subject
161
melm 600$a      Name-and-title,Name,Personal-name,Subject-name-personal,Subject
158
melm 600$t      Name-and-title,Title,Subject
162
melm 600$t      Name-and-title,Title,Subject
(-)a/installer/data/mysql/updatedatabase.pl (+13 lines)
Lines 3698-3703 $DBversion = "3.01.00.145"; Link Here
3698
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
3698
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
3699
    $dbh->do("ALTER TABLE borrowers ADD KEY `guarantorid` (guarantorid);");
3699
    $dbh->do("ALTER TABLE borrowers ADD KEY `guarantorid` (guarantorid);");
3700
    print "Upgrade to $DBversion done (Add index on guarantorid)\n";
3700
    print "Upgrade to $DBversion done (Add index on guarantorid)\n";
3701
}
3702
$DBversion = '3.01.00.146';
3703
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
3704
    $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type)VALUES('ShowAuctionSearchOptions', '0', 'If ON, includes specialized auction catalog/house/date searches in advanced search (staff and OPAC)', '', 'YesNo')");
3705
    $dbh->do("INSERT INTO `marc_tag_structure` (`tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`, `frameworkcode`) VALUES
3706
                ('591', 'AUCTION HOUSE', 'AUCTION HOUSE', 1, 0, NULL, ''),
3707
                ('592', 'DATE OF AUCTION SALE', 'DATE OF AUCTION SALE', 1, 0, NULL, ''),
3708
                ('593', 'AUCTION SALES CODE', 'AUCTION SALES CODE', 1, 0, NULL, '')");
3709
        $dbh->do("INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `kohafield`, `tab`, `authorised_value` , `authtypecode`, `value_builder`, `isurl`, `hidden`, `frameworkcode`, `seealso`, `link`, `defaultvalue`) VALUES
3710
                ('591', 'a', 'AUCTION HOUSE', 'AUCTION HOUSE', 0, 0, NULL, 5, NULL, NULL, '', NULL, 0, '', '', '', NULL),
3711
                ('592', 'a', 'DATE OF AUCTION SALE', 'DATE OF AUCTION SALE', 0, 0, NULL, 5, NULL, NULL, '', NULL, 0, '', '', '', NULL),
3712
                ('593', 'a', 'AUCTION SALES CODE', 'AUCTION SALES CODE', 0, 0, NULL, 5, NULL, NULL, '', NULL, 0, '', '', '', NULL)");
3713
        print "Upgrade to $DBversion done ( Added 591, 592, 593 fields into default framework for use with auction house/date/sales code indexes )\n";
3701
    SetVersion ($DBversion);
3714
    SetVersion ($DBversion);
3702
}
3715
}
3703
3716
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc (+6 lines)
Lines 13-18 Link Here
13
    <option value="se">&nbsp;&nbsp;&nbsp;&nbsp; Series Title</option>
13
    <option value="se">&nbsp;&nbsp;&nbsp;&nbsp; Series Title</option>
14
    <option value="su">Subject</option>
14
    <option value="su">Subject</option>
15
    <option value="su,phr">&nbsp;&nbsp;&nbsp;&nbsp; Subject as Phrase</option>
15
    <option value="su,phr">&nbsp;&nbsp;&nbsp;&nbsp; Subject as Phrase</option>
16
<!-- TMPL_IF NAME="ShowAuctionSearchOptions" -->
17
    <option value="auctcode">Auction Catalog Code</option>
18
    <option value="auctplace">Auction Place</option>
19
    <option value="auctdate,phr">Auction Date</option>
20
<!-- /TMPL_IF -->
21
16
    <option value="bc">Barcode</option>
22
    <option value="bc">Barcode</option>
17
    <option value="sn">Standard Number</option>
23
    <option value="sn">Standard Number</option>
18
    <option value="nb">&nbsp;&nbsp;&nbsp;&nbsp; ISBN</option>
24
    <option value="nb">&nbsp;&nbsp;&nbsp;&nbsp; ISBN</option>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref (+8 lines)
Lines 58-63 Searching: Link Here
58
            - PazPar2 to group similar results on the OPAC. This requires that PazPar2 is set up and running.
58
            - PazPar2 to group similar results on the OPAC. This requires that PazPar2 is set up and running.
59
    Search Form:
59
    Search Form:
60
        -
60
        -
61
            - By default,
62
            - pref: ShowAuctionSearchOptions
63
              type: boolean
64
              choices:
65
                  yes: show
66
                  no: "don't show"
67
            - 'specialized auction indexes show in OPAC and staff advanced search.'
68
        -
61
            - Show checkboxes to search by
69
            - Show checkboxes to search by
62
            - pref: AdvancedSearchTypes
70
            - pref: AdvancedSearchTypes
63
              choices:
71
              choices:
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl (+6 lines)
Lines 80-85 Link Here
80
            <option value="pn,wrdl">&nbsp;&nbsp;&nbsp;&nbsp; Personal Name</option>
80
            <option value="pn,wrdl">&nbsp;&nbsp;&nbsp;&nbsp; Personal Name</option>
81
            <option value="pn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Personal Name Phrase</option>
81
            <option value="pn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Personal Name Phrase</option>
82
<!-- /TMPL_IF -->
82
<!-- /TMPL_IF -->
83
<!-- TMPL_IF NAME="ShowAuctionSearchOptions" -->
84
            <option value="auctcode">Auction Catalog Code</option>
85
            <option value="auctplace">Auction Place</option>
86
            <option value="auctdate,phr">Auction Date</option>
87
<!-- /TMPL_IF -->
88
            <option value="ln">Language</option>
83
<!-- TMPL_IF NAME="expanded_options" -->
89
<!-- TMPL_IF NAME="expanded_options" -->
84
            <option value="nt">Notes/Comments</option>
90
            <option value="nt">Notes/Comments</option>
85
<!-- /TMPL_IF -->
91
<!-- /TMPL_IF -->
(-)a/opac/opac-search.pl (-1 / +5 lines)
Lines 241-246 if ( $template_type && $template_type eq 'advsearch' ) { Link Here
241
					  advsearch => 1,
241
					  advsearch => 1,
242
                      search_boxes_loop => \@search_boxes_array);
242
                      search_boxes_loop => \@search_boxes_array);
243
243
244
# display the auction house indexes
245
    if ( C4::Context->preference("ShowAuctionSearchOptions") == 1) {
246
        $template->param( ShowAuctionSearchOptions => C4::Context->preference("ShowAuctionSearchOptions") );
247
    }
248
244
# use the global setting by default
249
# use the global setting by default
245
	if ( C4::Context->preference("expandedSearchOption") == 1 ) {
250
	if ( C4::Context->preference("expandedSearchOption") == 1 ) {
246
		$template->param( expanded_options => C4::Context->preference("expandedSearchOption") );
251
		$template->param( expanded_options => C4::Context->preference("expandedSearchOption") );
247
- 

Return to bug 5193