Attachment #8227 for bug #7092

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

Lines 131-137 sub XSLTParse4Display { Link Here

(-)a/C4/XSLT.pm (-1 / +1 lines)
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 UseICU
135	UseAuthoritiesForTracings TraceSubjectSubdivisions	135	UseAuthoritiesForTracings TraceSubjectSubdivisions
136	Display856uAsImage OPACDisplay856uAsImage	136	Display856uAsImage OPACDisplay856uAsImage
137	UseControlNumber	137	UseControlNumber

Lines 315-320 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( Link Here

(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
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 ('UseICU', '0', 'Tell Koha if ICU indexing is in use for Zebra or not.','1','YesNo');
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');

Lines 4923-4928 if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { Link Here

(-)a/installer/data/mysql/updatedatabase.pl (+6 lines)
4923	SetVersion($DBversion);	4923	SetVersion($DBversion);
4924	}	4924	}
4925		4925
		4926	$DBversion = "3.07.00.XXX";
		4927	if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
		4928	$dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('UseICU', '1', 'Tell Koha if ICU indexing is in use for Zebra or not.','1','YesNo')");
		4929	print "Upgrade to $DBversion done (Add syspref to tell Koha if ICU indexing is in use for Zebra or not.)\n";
		4930	SetVersion ($DBversion);
		4931	}
4926		4932
4927	=head1 FUNCTIONS	4933	=head1 FUNCTIONS
4928		4934

Lines 69-74 Searching: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref (+7 lines)
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	- pref: UseICU
		74	default: 0
		75	choices:
		76	yes: Using
		77	no: "Not using"
		78	- 'ICU Zebra indexing. Please note: This setting will not affect Zebra indexing, it should only be used to tell Koha that you have activated ICU indexing if you have actually done so, since there is no way for Koha to figure this out on its own.'
72	Search Form:	79	Search Form:
73	-	80	-
74	- Show tabs in OPAC and staff-side advanced search for limiting searches on the	81	- Show tabs in OPAC and staff-side advanced search for limiting searches on the




        <xsl:variable name="SubjectModifier"><xsl:if test="marc:sysprefs/marc:syspref[@name='TraceCompleteSubfields']='1'">,complete-subfield</xsl:if></xsl:variable>
        <xsl:variable name="UseAuthoritiesForTracings" select="marc:sysprefs/marc:syspref[@name='UseAuthoritiesForTracings']"/>
        <xsl:variable name="TraceSubjectSubdivisions" select="marc:sysprefs/marc:syspref[@name='TraceSubjectSubdivisions']"/>

        <xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='Display856uAsImage']"/>
        <xsl:variable name="TracingQuotesLeft">
           <xsl:choose>
             <xsl:when test="marc:sysprefs/marc:syspref[@name='UseICU']='1'">{</xsl:when>
             <xsl:otherwise>"</xsl:otherwise>
           </xsl:choose>
        </xsl:variable>
        <xsl:variable name="TracingQuotesRight">
          <xsl:choose>
            <xsl:when test="marc:sysprefs/marc:syspref[@name='UseICU']='1'">}</xsl:when>
            <xsl:otherwise>"</xsl:otherwise>
          </xsl:choose>
        </xsl:variable>
        <xsl:variable name="leader" select="marc:leader"/>
        <xsl:variable name="leader6" select="substring($leader,7,1)"/>
        <xsl:variable name="leader7" select="substring($leader,8,1)"/>

                <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=<xsl:call-template name="subfieldSelect">
                        <xsl:with-param name="codes">abcdfgklmnopqrstvxyz</xsl:with-param>
                        <xsl:with-param name="delimeter"> and </xsl:with-param>
                        <xsl:with-param name="prefix">(su<xsl:value-of select="$SubjectModifier"/>:<xsl:value-of select="$TracingQuotesLeft"/></xsl:with-param>
                        <xsl:with-param name="suffix"><xsl:value-of select="$TracingQuotesRight"/>)</xsl:with-param>
                    </xsl:call-template>
                </xsl:attribute>
            </xsl:when>
            <xsl:otherwise>
               <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>
            </xsl:otherwise>
            </xsl:choose>
            <xsl:call-template name="chopPunctuation">




    <xsl:variable name="UseAuthoritiesForTracings" select="marc:sysprefs/marc:syspref[@name='UseAuthoritiesForTracings']"/>
    <xsl:variable name="TraceSubjectSubdivisions" select="marc:sysprefs/marc:syspref[@name='TraceSubjectSubdivisions']"/>
    <xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='OPACDisplay856uAsImage']"/>
    <xsl:variable name="TracingQuotesLeft">
      <xsl:choose>
        <xsl:when test="marc:sysprefs/marc:syspref[@name='UseICU']='1'">{</xsl:when>
        <xsl:otherwise>"</xsl:otherwise>
      </xsl:choose>
    </xsl:variable>
    <xsl:variable name="TracingQuotesRight">
      <xsl:choose>
        <xsl:when test="marc:sysprefs/marc:syspref[@name='UseICU']='1'">}</xsl:when>
        <xsl:otherwise>"</xsl:otherwise>
      </xsl:choose>
    </xsl:variable>
        <xsl:variable name="leader" select="marc:leader"/>
        <xsl:variable name="leader6" select="substring($leader,7,1)"/>
        <xsl:variable name="leader7" select="substring($leader,8,1)"/>

                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=<xsl:call-template name="subfieldSelect">
                        <xsl:with-param name="codes">abcdfgklmnopqrstvxyz</xsl:with-param>
                        <xsl:with-param name="delimeter"> and </xsl:with-param>
                        <xsl:with-param name="prefix">(su<xsl:value-of select="$SubjectModifier"/>:<xsl:value-of select="$TracingQuotesLeft"/></xsl:with-param>
                        <xsl:with-param name="suffix"><xsl:value-of select="$TracingQuotesRight"/>)</xsl:with-param>
                    </xsl:call-template>
                </xsl:attribute>
            </xsl:when>
            <xsl:otherwise>
                <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>
            </xsl:otherwise>
            </xsl:choose>
            <xsl:call-template name="chopPunctuation">
- 

Return to bug 7092

Lines 24-31 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl (-4 / +15 lines)
24	<xsl:variable name="SubjectModifier"><xsl:if test="marc:sysprefs/marc:syspref[@name='TraceCompleteSubfields']='1'">,complete-subfield</xsl:if></xsl:variable>	24	<xsl:variable name="SubjectModifier"><xsl:if test="marc:sysprefs/marc:syspref[@name='TraceCompleteSubfields']='1'">,complete-subfield</xsl:if></xsl:variable>
25	<xsl:variable name="UseAuthoritiesForTracings" select="marc:sysprefs/marc:syspref[@name='UseAuthoritiesForTracings']"/>	25	<xsl:variable name="UseAuthoritiesForTracings" select="marc:sysprefs/marc:syspref[@name='UseAuthoritiesForTracings']"/>
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
28	<xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='Display856uAsImage']"/>	27	<xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='Display856uAsImage']"/>
		28	<xsl:variable name="TracingQuotesLeft">
		29	<xsl:choose>
		30	<xsl:when test="marc:sysprefs/marc:syspref[@name='UseICU']='1'">{</xsl:when>
		31	<xsl:otherwise>"</xsl:otherwise>
		32	</xsl:choose>
		33	</xsl:variable>
		34	<xsl:variable name="TracingQuotesRight">
		35	<xsl:choose>
		36	<xsl:when test="marc:sysprefs/marc:syspref[@name='UseICU']='1'">}</xsl:when>
		37	<xsl:otherwise>"</xsl:otherwise>
		38	</xsl:choose>
		39	</xsl:variable>
29	<xsl:variable name="leader" select="marc:leader"/>	40	<xsl:variable name="leader" select="marc:leader"/>
30	<xsl:variable name="leader6" select="substring($leader,7,1)"/>	41	<xsl:variable name="leader6" select="substring($leader,7,1)"/>
31	<xsl:variable name="leader7" select="substring($leader,8,1)"/>	42	<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">	473	<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>	474	<xsl:with-param name="codes">abcdfgklmnopqrstvxyz</xsl:with-param>
464	<xsl:with-param name="delimeter"> and </xsl:with-param>	475	<xsl:with-param name="delimeter"> and </xsl:with-param>
465	<xsl:with-param name="prefix">(su<xsl:value-of select="$SubjectModifier"/>:{</xsl:with-param>	476	<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>	477	<xsl:with-param name="suffix"><xsl:value-of select="$TracingQuotesRight"/>)</xsl:with-param>
467	</xsl:call-template>	478	</xsl:call-template>
468	</xsl:attribute>	479	</xsl:attribute>
469	</xsl:when>	480	</xsl:when>
470	<xsl:otherwise>	481	<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>	482	<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>	483	</xsl:otherwise>
473	</xsl:choose>	484	</xsl:choose>
474	<xsl:call-template name="chopPunctuation">	485	<xsl:call-template name="chopPunctuation">

Lines 27-32 Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl (-4 / +15 lines)
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='UseICU']='1'">{</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='UseICU']='1'">}</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	-