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

(-)a/etc/zebradb/marc_defs/normarc/biblios/record.abs (-18 / +18 lines)
Lines 177-201 melm 520 Abstract:w,Abstract:p Link Here
177
#melm 533$d     pubdate,pubdate:s
177
#melm 533$d     pubdate,pubdate:s
178
#melm 541$d     Date-of-acquisition,Date-of-acquisition:s
178
#melm 541$d     Date-of-acquisition,Date-of-acquisition:s
179
179
180
melm 600$a      Name-and-title,Name,Personal-name,Subject-name-personal,Subject
180
melm 600$a      Name-and-title,Name,Personal-name,Subject-name-personal,Subject,Subject:p
181
melm 600$t      Name-and-title,Title,Subject
181
melm 600$t      Name-and-title,Title,Subject,Subject:p
182
melm 600$9      Koha-Auth-Number
182
melm 600$9      Koha-Auth-Number
183
#melm 600       Name,Personal-name,Subject-heading,Subject-name-personal
183
#melm 600       Name,Personal-name,Subject-heading,Subject-name-personal
184
melm 600        Name,Personal-name,Subject-name-personal,Subject
184
melm 600        Name,Personal-name,Subject-name-personal,Subject,Subject:p
185
melm 610$a      Name-and-title
185
melm 610$a      Name-and-title,Subject,Subject:p
186
melm 610$t      Name-and-title,Title
186
melm 610$t      Name-and-title,Title,Subject,Subject:p
187
melm 610$9      Koha-Auth-Number
187
melm 610$9      Koha-Auth-Number
188
melm 610        Name,Subject,Corporate-name
188
melm 610        Name,Subject,Corporate-name,Subject,Subject:p
189
melm 611        Conference-name
189
melm 611        Conference-name,Subject,Subject:p
190
melm 611$a      Name-and-title
190
melm 611$a      Name-and-title,Subject,Subject:p
191
melm 611$t      Name-and-title,Title
191
melm 611$t      Name-and-title,Title,Subject,Subject:p
192
melm 611$9      Koha-Auth-Number
192
melm 611$9      Koha-Auth-Number
193
melm 611        Name,Subject
193
melm 611        Name,Subject,Subject:p
194
melm 630$i      Thematic-number
194
melm 630$i      Thematic-number,Subject,Subject:p
195
melm 630$n      Thematic-number
195
melm 630$n      Thematic-number,Subject,Subject:p
196
melm 630$r      Music-key
196
melm 630$r      Music-key,Subject,Subject:p
197
melm 630$9      Koha-Auth-Number
197
melm 630$9      Koha-Auth-Number
198
melm 630        Subject
198
melm 630        Subject,Subject:p
199
melm 650$9      Koha-Auth-Number
199
melm 650$9      Koha-Auth-Number
200
melm 650        Subject,Subject:p
200
melm 650        Subject,Subject:p
201
melm 651$9      Koha-Auth-Number
201
melm 651$9      Koha-Auth-Number
Lines 205-217 melm 652$9 Koha-Auth-Number Link Here
205
melm 653$9      Koha-Auth-Number
205
melm 653$9      Koha-Auth-Number
206
melm 653        Subject,Subject:p
206
melm 653        Subject,Subject:p
207
melm 654$9      Koha-Auth-Number
207
melm 654$9      Koha-Auth-Number
208
melm 654        Subject
208
melm 654        Subject,Subject:p
209
melm 655$9      Koha-Auth-Number
209
melm 655$9      Koha-Auth-Number
210
melm 655        Subject
210
melm 655        Subject,Subject:p
211
melm 656$9      Koha-Auth-Number
211
melm 656$9      Koha-Auth-Number
212
melm 656        Subject
212
melm 656        Subject,Subject:p
213
melm 657$9      Koha-Auth-Number
213
melm 657$9      Koha-Auth-Number
214
melm 657        Subject
214
melm 657        Subject,Subject:p
215
melm 690$9      Koha-Auth-Number
215
melm 690$9      Koha-Auth-Number
216
melm 690        Subject,Subject:p
216
melm 690        Subject,Subject:p
217
217
(-)a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl (-6 / +35 lines)
Lines 15-21 Link Here
15
15
16
        <!-- Sysprefs -->
16
        <!-- Sysprefs -->
17
        <xsl:variable name="OPACBaseURL" select="marc:sysprefs/marc:syspref[@name='OPACBaseURL']"/>
17
        <xsl:variable name="OPACBaseURL" select="marc:sysprefs/marc:syspref[@name='OPACBaseURL']"/>
18
18
        <xsl:variable name="SubjectModifier"><xsl:if test="marc:sysprefs/marc:syspref[@name='TraceCompleteSubfields']='1'">,complete-subfield</xsl:if></xsl:variable>
19
        <xsl:variable name="TraceSubjectSubdivisions" select="marc:sysprefs/marc:syspref[@name='TraceSubjectSubdivisions']"/>
20
        <xsl:variable name="TracingQuotesLeft">
21
          <xsl:choose>
22
            <xsl:when test="marc:sysprefs/marc:syspref[@name='TracingQuotes']='curlybrace'">{</xsl:when>
23
            <xsl:otherwise>"</xsl:otherwise>
24
          </xsl:choose>
25
        </xsl:variable>
26
        <xsl:variable name="TracingQuotesRight">
27
          <xsl:choose>
28
            <xsl:when test="marc:sysprefs/marc:syspref[@name='TracingQuotes']='curlybrace'">}</xsl:when>
29
            <xsl:otherwise>"</xsl:otherwise>
30
          </xsl:choose>
31
        </xsl:variable>
32
        <xsl:variable name="DisplayOPACiconsXSLT" select="marc:sysprefs/marc:syspref[@name='DisplayOPACiconsXSLT']"/>
33
        
19
        <xsl:variable name="leader" select="marc:leader"/>
34
        <xsl:variable name="leader" select="marc:leader"/>
20
        <xsl:variable name="leader6" select="substring($leader,7,1)"/>
35
        <xsl:variable name="leader6" select="substring($leader,7,1)"/>
21
        <xsl:variable name="leader7" select="substring($leader,8,1)"/>
36
        <xsl:variable name="leader7" select="substring($leader,8,1)"/>
Lines 293-308 Link Here
293
        </span>
308
        </span>
294
        </xsl:if>
309
        </xsl:if>
295
310
311
        <!-- Subjects -->
312
296
        <xsl:if test="marc:datafield[substring(@tag, 1, 1) = '6']">
313
        <xsl:if test="marc:datafield[substring(@tag, 1, 1) = '6']">
297
            <span class="results_summary"><span class="label">Emner: </span>
314
            <span class="results_summary subjects"><span class="label">Emne(r): </span>
298
            <xsl:for-each select="marc:datafield[substring(@tag, 1, 1) = '6']">
315
            <xsl:for-each select="marc:datafield[substring(@tag, 1, 1) = '6']">
299
            <a>
316
            <a>
300
            <xsl:choose>
317
            <xsl:choose>
301
            <xsl:when test="marc:subfield[@code=9]">
318
            <!-- Will implement this later
302
                <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute>
319
                <xsl:when test="marc:subfield[@code=9] and $UseAuthoritiesForTracings='1'">
320
                    <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute>
321
                </xsl:when>
322
            -->
323
            <xsl:when test="$TraceSubjectSubdivisions='1'">
324
                <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=<xsl:call-template name="subfieldSelect">
325
                        <xsl:with-param name="codes">abcdvxyz</xsl:with-param>
326
                        <xsl:with-param name="delimeter"> and </xsl:with-param>
327
                        <xsl:with-param name="prefix">(su<xsl:value-of select="$SubjectModifier"/>:<xsl:value-of select="$TracingQuotesLeft"/></xsl:with-param>
328
                        <xsl:with-param name="suffix"><xsl:value-of select="$TracingQuotesRight"/>)</xsl:with-param>
329
                    </xsl:call-template>
330
                </xsl:attribute>
303
            </xsl:when>
331
            </xsl:when>
304
            <xsl:otherwise>
332
            <xsl:otherwise>
305
                <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=su:<xsl:value-of select="marc:subfield[@code='a']"/></xsl:attribute>
333
                <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>
306
            </xsl:otherwise>
334
            </xsl:otherwise>
307
            </xsl:choose>
335
            </xsl:choose>
308
            <xsl:call-template name="chopPunctuation">
336
            <xsl:call-template name="chopPunctuation">
Lines 313-319 Link Here
313
                        <xsl:with-param name="subdivDelimiter">-- </xsl:with-param>
341
                        <xsl:with-param name="subdivDelimiter">-- </xsl:with-param>
314
                    </xsl:call-template>
342
                    </xsl:call-template>
315
                </xsl:with-param>
343
                </xsl:with-param>
316
            </xsl:call-template></a>
344
            </xsl:call-template>
345
            </a>
317
            <xsl:choose>
346
            <xsl:choose>
318
            <xsl:when test="position()=last()"></xsl:when>
347
            <xsl:when test="position()=last()"></xsl:when>
319
            <xsl:otherwise> | </xsl:otherwise>
348
            <xsl:otherwise> | </xsl:otherwise>
(-)a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl (-1 / +3 lines)
Lines 24-36 Link Here
24
		<xsl:param name="delimeter"><xsl:text> </xsl:text></xsl:param>
24
		<xsl:param name="delimeter"><xsl:text> </xsl:text></xsl:param>
25
		<xsl:param name="subdivCodes"/>
25
		<xsl:param name="subdivCodes"/>
26
		<xsl:param name="subdivDelimiter"/>
26
		<xsl:param name="subdivDelimiter"/>
27
        <xsl:param name="prefix"/>
28
        <xsl:param name="suffix"/>
27
		<xsl:variable name="str">
29
		<xsl:variable name="str">
28
			<xsl:for-each select="marc:subfield">
30
			<xsl:for-each select="marc:subfield">
29
				<xsl:if test="contains($codes, @code)">
31
				<xsl:if test="contains($codes, @code)">
30
                    <xsl:if test="contains($subdivCodes, @code)">
32
                    <xsl:if test="contains($subdivCodes, @code)">
31
                        <xsl:value-of select="$subdivDelimiter"/>
33
                        <xsl:value-of select="$subdivDelimiter"/>
32
                    </xsl:if>
34
                    </xsl:if>
33
					<xsl:value-of select="text()"/><xsl:value-of select="$delimeter"/>
35
					<xsl:value-of select="$prefix"/><xsl:value-of select="text()"/><xsl:value-of select="$suffix"/><xsl:value-of select="$delimeter"/>
34
				</xsl:if>
36
				</xsl:if>
35
			</xsl:for-each>
37
			</xsl:for-each>
36
		</xsl:variable>
38
		</xsl:variable>
(-)a/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACDetail.xsl (-6 / +35 lines)
Lines 16-22 Link Here
16
16
17
    <xsl:template match="marc:record">
17
    <xsl:template match="marc:record">
18
18
19
    <xsl:variable name="DisplayOPACiconsXSLT" select="marc:sysprefs/marc:syspref[@name='DisplayOPACiconsXSLT']"/>
19
        <!-- Sysprefs -->
20
        <xsl:variable name="SubjectModifier"><xsl:if test="marc:sysprefs/marc:syspref[@name='TraceCompleteSubfields']='1'">,complete-subfield</xsl:if></xsl:variable>
21
        <xsl:variable name="TraceSubjectSubdivisions" select="marc:sysprefs/marc:syspref[@name='TraceSubjectSubdivisions']"/>
22
        <xsl:variable name="TracingQuotesLeft">
23
          <xsl:choose>
24
            <xsl:when test="marc:sysprefs/marc:syspref[@name='TracingQuotes']='curlybrace'">{</xsl:when>
25
            <xsl:otherwise>"</xsl:otherwise>
26
          </xsl:choose>
27
        </xsl:variable>
28
        <xsl:variable name="TracingQuotesRight">
29
          <xsl:choose>
30
            <xsl:when test="marc:sysprefs/marc:syspref[@name='TracingQuotes']='curlybrace'">}</xsl:when>
31
            <xsl:otherwise>"</xsl:otherwise>
32
          </xsl:choose>
33
        </xsl:variable>
34
        <xsl:variable name="DisplayOPACiconsXSLT" select="marc:sysprefs/marc:syspref[@name='DisplayOPACiconsXSLT']"/>
20
35
21
        <xsl:variable name="leader" select="marc:leader"/>
36
        <xsl:variable name="leader" select="marc:leader"/>
22
        <xsl:variable name="leader6" select="substring($leader,7,1)"/>
37
        <xsl:variable name="leader6" select="substring($leader,7,1)"/>
Lines 301-316 Link Here
301
        </span>
316
        </span>
302
        </xsl:if>
317
        </xsl:if>
303
318
319
        <!-- Subjects -->
320
304
        <xsl:if test="marc:datafield[substring(@tag, 1, 1) = '6']">
321
        <xsl:if test="marc:datafield[substring(@tag, 1, 1) = '6']">
305
            <span class="results_summary"><span class="label">Emner: </span>
322
            <span class="results_summary subjects"><span class="label">Emne(r): </span>
306
            <xsl:for-each select="marc:datafield[substring(@tag, 1, 1) = '6']">
323
            <xsl:for-each select="marc:datafield[substring(@tag, 1, 1) = '6']">
307
            <a>
324
            <a>
308
            <xsl:choose>
325
            <xsl:choose>
309
            <xsl:when test="marc:subfield[@code=9]">
326
            <!-- Will implement this later
310
                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute>
327
                <xsl:when test="marc:subfield[@code=9] and $UseAuthoritiesForTracings='1'">
328
                    <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute>
329
                </xsl:when>
330
            -->
331
            <xsl:when test="$TraceSubjectSubdivisions='1'">
332
                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=<xsl:call-template name="subfieldSelect">
333
                        <xsl:with-param name="codes">abcdvxyz</xsl:with-param>
334
                        <xsl:with-param name="delimeter"> and </xsl:with-param>
335
                        <xsl:with-param name="prefix">(su<xsl:value-of select="$SubjectModifier"/>:<xsl:value-of select="$TracingQuotesLeft"/></xsl:with-param>
336
                        <xsl:with-param name="suffix"><xsl:value-of select="$TracingQuotesRight"/>)</xsl:with-param>
337
                    </xsl:call-template>
338
                </xsl:attribute>
311
            </xsl:when>
339
            </xsl:when>
312
            <xsl:otherwise>
340
            <xsl:otherwise>
313
                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=su:<xsl:value-of select="marc:subfield[@code='a']"/></xsl:attribute>
341
                <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>
314
            </xsl:otherwise>
342
            </xsl:otherwise>
315
            </xsl:choose>
343
            </xsl:choose>
316
            <xsl:call-template name="chopPunctuation">
344
            <xsl:call-template name="chopPunctuation">
Lines 321-327 Link Here
321
                        <xsl:with-param name="subdivDelimiter">-- </xsl:with-param>
349
                        <xsl:with-param name="subdivDelimiter">-- </xsl:with-param>
322
                    </xsl:call-template>
350
                    </xsl:call-template>
323
                </xsl:with-param>
351
                </xsl:with-param>
324
            </xsl:call-template></a>
352
            </xsl:call-template>
353
            </a>
325
            <xsl:choose>
354
            <xsl:choose>
326
            <xsl:when test="position()=last()"></xsl:when>
355
            <xsl:when test="position()=last()"></xsl:when>
327
            <xsl:otherwise> | </xsl:otherwise>
356
            <xsl:otherwise> | </xsl:otherwise>
(-)a/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslimUtils.xsl (-2 / +3 lines)
Lines 25-37 Link Here
25
		<xsl:param name="delimeter"><xsl:text> </xsl:text></xsl:param>
25
		<xsl:param name="delimeter"><xsl:text> </xsl:text></xsl:param>
26
		<xsl:param name="subdivCodes"/>
26
		<xsl:param name="subdivCodes"/>
27
		<xsl:param name="subdivDelimiter"/>
27
		<xsl:param name="subdivDelimiter"/>
28
        <xsl:param name="prefix"/>
29
        <xsl:param name="suffix"/>
28
		<xsl:variable name="str">
30
		<xsl:variable name="str">
29
			<xsl:for-each select="marc:subfield">
31
			<xsl:for-each select="marc:subfield">
30
				<xsl:if test="contains($codes, @code)">
32
				<xsl:if test="contains($codes, @code)">
31
                    <xsl:if test="contains($subdivCodes, @code)">
33
                    <xsl:if test="contains($subdivCodes, @code)">
32
                        <xsl:value-of select="$subdivDelimiter"/>
34
                        <xsl:value-of select="$subdivDelimiter"/>
33
                    </xsl:if>
35
                    </xsl:if>
34
					<xsl:value-of select="text()"/><xsl:value-of select="$delimeter"/>
36
					<xsl:value-of select="$prefix"/><xsl:value-of select="text()"/><xsl:value-of select="$suffix"/><xsl:value-of select="$delimeter"/>
35
				</xsl:if>
37
				</xsl:if>
36
			</xsl:for-each>
38
			</xsl:for-each>
37
		</xsl:variable>
39
		</xsl:variable>
38
- 

Return to bug 7537