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

(-)a/C4/XSLT.pm (-1 / +1 lines)
Lines 131-137 sub XSLTParse4Display { Link Here
131
    my $sysxml = "<sysprefs>\n";
131
    my $sysxml = "<sysprefs>\n";
132
    foreach my $syspref ( qw/ hidelostitems OPACURLOpenInNewWindow
132
    foreach my $syspref ( qw/ hidelostitems OPACURLOpenInNewWindow
133
                              DisplayOPACiconsXSLT URLLinkText viewISBD
133
                              DisplayOPACiconsXSLT URLLinkText viewISBD
134
                              OPACBaseURL TraceCompleteSubfields
134
                              OPACBaseURL TraceCompleteSubfields TracingQuotes
135
                              UseAuthoritiesForTracings TraceSubjectSubdivisions
135
                              UseAuthoritiesForTracings TraceSubjectSubdivisions
136
                              Display856uAsImage OPACDisplay856uAsImage 
136
                              Display856uAsImage OPACDisplay856uAsImage 
137
                              UseControlNumber
137
                              UseControlNumber
(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
Lines 315-320 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( Link Here
315
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','','free');
315
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','','free');
316
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free');
316
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free');
317
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('TraceSubjectSubdivisions', '0', 'Create searches on all subdivisions for subject tracings.','1','YesNo');
317
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('TraceSubjectSubdivisions', '0', 'Create searches on all subdivisions for subject tracings.','1','YesNo');
318
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('TracingQuotes', 'quote', 'Quote character to use when tracing subjects.','quote|curlybrace','Choice');
318
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('StaffAuthorisedValueImages','1','',NULL,'YesNo');
319
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('StaffAuthorisedValueImages','1','',NULL,'YesNo');
319
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACDisplay856uAsImage','OFF','Display the URI in the 856u field as an image, the corresponding OPACXSLT option must be on','OFF|Details|Results|Both','Choice');
320
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACDisplay856uAsImage','OFF','Display the URI in the 856u field as an image, the corresponding OPACXSLT option must be on','OFF|Details|Results|Both','Choice');
320
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('Display856uAsImage','OFF','Display the URI in the 856u field as an image, the corresponding Staff Client XSLT option must be on','OFF|Details|Results|Both','Choice');
321
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('Display856uAsImage','OFF','Display the URI in the 856u field as an image, the corresponding Staff Client XSLT option must be on','OFF|Details|Results|Both','Choice');
(-)a/installer/data/mysql/updatedatabase.pl (+7 lines)
Lines 4884-4889 Date due: <<issues.date_due>><br /> Link Here
4884
    SetVersion($DBversion);
4884
    SetVersion($DBversion);
4885
}
4885
}
4886
4886
4887
$DBversion = "3.07.00.XXX";
4888
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
4889
    $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('TracingQuotes ','curlybrace','Quote character to use when tracing subjects.','quote|curlybrace','Choice')");
4890
    print "Upgrade to $DBversion done (Add syspref to control the quoting characters used in subject tracings)\n";
4891
    SetVersion ($DBversion);
4892
}
4893
4887
=head1 FUNCTIONS
4894
=head1 FUNCTIONS
4888
4895
4889
=head2 DropAllForeignKeys($table)
4896
=head2 DropAllForeignKeys($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref (+8 lines)
Lines 69-74 Searching: Link Here
69
                  yes: Include
69
                  yes: Include
70
                  no: "Don't include"
70
                  no: "Don't include"
71
            - subdivisions for searches generated by clicking on subject tracings.
71
            - subdivisions for searches generated by clicking on subject tracings.
72
        -
73
            - Use
74
            - pref: TracingQuotes
75
              default: quote
76
              choices:
77
                  quote: quotes
78
                  curlybrace: curly braces
79
            - 'to group subjects together. Set this to curly braces if you are using Zebra with ICU indexing.'
72
    Search Form:
80
    Search Form:
73
        -
81
        -
74
            - Show checkboxes to search by
82
            - Show checkboxes to search by
(-)a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl (-3 / +15 lines)
Lines 26-31 Link Here
26
        <xsl:variable name="TraceSubjectSubdivisions" select="marc:sysprefs/marc:syspref[@name='TraceSubjectSubdivisions']"/>
26
        <xsl:variable name="TraceSubjectSubdivisions" select="marc:sysprefs/marc:syspref[@name='TraceSubjectSubdivisions']"/>
27
27
28
        <xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='Display856uAsImage']"/>
28
        <xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='Display856uAsImage']"/>
29
        <xsl:variable name="TracingQuotesLeft">
30
          <xsl:choose>
31
            <xsl:when test="marc:sysprefs/marc:syspref[@name='TracingQuotes']='curlybrace'">{</xsl:when>
32
            <xsl:otherwise>"</xsl:otherwise>
33
          </xsl:choose>
34
        </xsl:variable>
35
        <xsl:variable name="TracingQuotesRight">
36
          <xsl:choose>
37
            <xsl:when test="marc:sysprefs/marc:syspref[@name='TracingQuotes']='curlybrace'">}</xsl:when>
38
            <xsl:otherwise>"</xsl:otherwise>
39
          </xsl:choose>
40
        </xsl:variable>
29
        <xsl:variable name="leader" select="marc:leader"/>
41
        <xsl:variable name="leader" select="marc:leader"/>
30
        <xsl:variable name="leader6" select="substring($leader,7,1)"/>
42
        <xsl:variable name="leader6" select="substring($leader,7,1)"/>
31
        <xsl:variable name="leader7" select="substring($leader,8,1)"/>
43
        <xsl:variable name="leader7" select="substring($leader,8,1)"/>
Lines 462-474 Link Here
462
                <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=<xsl:call-template name="subfieldSelect">
474
                <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=<xsl:call-template name="subfieldSelect">
463
                        <xsl:with-param name="codes">abcdfgklmnopqrstvxyz</xsl:with-param>
475
                        <xsl:with-param name="codes">abcdfgklmnopqrstvxyz</xsl:with-param>
464
                        <xsl:with-param name="delimeter"> and </xsl:with-param>
476
                        <xsl:with-param name="delimeter"> and </xsl:with-param>
465
                        <xsl:with-param name="prefix">(su<xsl:value-of select="$SubjectModifier"/>:{</xsl:with-param>
477
                        <xsl:with-param name="prefix">(su<xsl:value-of select="$SubjectModifier"/>:<xsl:value-of select="$TracingQuotesLeft"/></xsl:with-param>
466
                        <xsl:with-param name="suffix">})</xsl:with-param>
478
                        <xsl:with-param name="suffix"><xsl:value-of select="$TracingQuotesRight"/>)</xsl:with-param>
467
                    </xsl:call-template>
479
                    </xsl:call-template>
468
                </xsl:attribute>
480
                </xsl:attribute>
469
            </xsl:when>
481
            </xsl:when>
470
            <xsl:otherwise>
482
            <xsl:otherwise>
471
                <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=su<xsl:value-of select="$SubjectModifier"/>:{<xsl:value-of select="marc:subfield[@code='a']"/>}</xsl:attribute>
483
                <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=su<xsl:value-of select="$SubjectModifier"/>:<xsl:value-of select="$TracingQuotesLeft"/><xsl:value-of select="marc:subfield[@code='a']"/><xsl:value-of select="$TracingQuotesRight"/></xsl:attribute>
472
            </xsl:otherwise>
484
            </xsl:otherwise>
473
            </xsl:choose>
485
            </xsl:choose>
474
            <xsl:call-template name="chopPunctuation">
486
            <xsl:call-template name="chopPunctuation">
(-)a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl (-4 / +15 lines)
Lines 27-32 Link Here
27
    <xsl:variable name="UseAuthoritiesForTracings" select="marc:sysprefs/marc:syspref[@name='UseAuthoritiesForTracings']"/>
27
    <xsl:variable name="UseAuthoritiesForTracings" select="marc:sysprefs/marc:syspref[@name='UseAuthoritiesForTracings']"/>
28
    <xsl:variable name="TraceSubjectSubdivisions" select="marc:sysprefs/marc:syspref[@name='TraceSubjectSubdivisions']"/>
28
    <xsl:variable name="TraceSubjectSubdivisions" select="marc:sysprefs/marc:syspref[@name='TraceSubjectSubdivisions']"/>
29
    <xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='OPACDisplay856uAsImage']"/>
29
    <xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='OPACDisplay856uAsImage']"/>
30
    <xsl:variable name="TracingQuotesLeft">
31
      <xsl:choose>
32
        <xsl:when test="marc:sysprefs/marc:syspref[@name='TracingQuotes']='curlybrace'">{</xsl:when>
33
        <xsl:otherwise>"</xsl:otherwise>
34
      </xsl:choose>
35
    </xsl:variable>
36
    <xsl:variable name="TracingQuotesRight">
37
      <xsl:choose>
38
        <xsl:when test="marc:sysprefs/marc:syspref[@name='TracingQuotes']='curlybrace'">}</xsl:when>
39
        <xsl:otherwise>"</xsl:otherwise>
40
      </xsl:choose>
41
    </xsl:variable>
30
        <xsl:variable name="leader" select="marc:leader"/>
42
        <xsl:variable name="leader" select="marc:leader"/>
31
        <xsl:variable name="leader6" select="substring($leader,7,1)"/>
43
        <xsl:variable name="leader6" select="substring($leader,7,1)"/>
32
        <xsl:variable name="leader7" select="substring($leader,8,1)"/>
44
        <xsl:variable name="leader7" select="substring($leader,8,1)"/>
Lines 474-486 Link Here
474
                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=<xsl:call-template name="subfieldSelect">
486
                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=<xsl:call-template name="subfieldSelect">
475
                        <xsl:with-param name="codes">abcdfgklmnopqrstvxyz</xsl:with-param>
487
                        <xsl:with-param name="codes">abcdfgklmnopqrstvxyz</xsl:with-param>
476
                        <xsl:with-param name="delimeter"> and </xsl:with-param>
488
                        <xsl:with-param name="delimeter"> and </xsl:with-param>
477
                        <xsl:with-param name="prefix">(su<xsl:value-of select="$SubjectModifier"/>:{</xsl:with-param>
489
                        <xsl:with-param name="prefix">(su<xsl:value-of select="$SubjectModifier"/>:<xsl:value-of select="$TracingQuotesLeft"/></xsl:with-param>
478
                        <xsl:with-param name="suffix">})</xsl:with-param>
490
                        <xsl:with-param name="suffix"><xsl:value-of select="$TracingQuotesRight"/>)</xsl:with-param>
479
                    </xsl:call-template>
491
                    </xsl:call-template>
480
                </xsl:attribute>
492
                </xsl:attribute>
481
            </xsl:when>
493
            </xsl:when>
482
            <xsl:otherwise>
494
            <xsl:otherwise>
483
                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=su<xsl:value-of select="$SubjectModifier"/>:{<xsl:value-of select="marc:subfield[@code='a']"/>}</xsl:attribute>
495
                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=su<xsl:value-of select="$SubjectModifier"/>:<xsl:value-of select="$TracingQuotesLeft"/><xsl:value-of select="marc:subfield[@code='a']"/><xsl:value-of select="$TracingQuotesRight"/></xsl:attribute>
484
            </xsl:otherwise>
496
            </xsl:otherwise>
485
            </xsl:choose>
497
            </xsl:choose>
486
            <xsl:call-template name="chopPunctuation">
498
            <xsl:call-template name="chopPunctuation">
487
- 

Return to bug 7092