Skip to content

Commit fdad82c

Browse files
respinosrespinos
committed
avoid non existent nameresolver
1 parent 143b8ab commit fdad82c

File tree

6 files changed

+70
-32
lines changed

6 files changed

+70
-32
lines changed

‎src/js/text/viewers/viewer-mirador.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,20 @@ window.addEventListener('message', (event) => {
164164
history.pushState({}, document.title, newHref);
165165
document.querySelector('.breadcrumb li:last-child').setAttribute('href', newHref);
166166

167+
const bookmarkItem = document.querySelector('dt[data-key="bookmark-item"] + dd span.url');
168+
if ( bookmarkItem ) {
169+
let itemHref = bookmarkItem.innerText.trim();
170+
if ( itemHref.indexOf('/cgi/') > -1 ) {
171+
// just use newHref
172+
bookmarkItem.innerText = newHref;
173+
} else {
174+
// just pop on the new seq?
175+
let tmp = itemHref.split('/');
176+
tmp[tmp.length - 1] = newSeq.replace(/^0+/, '');
177+
bookmarkItem.innerText = tmp.join('/');
178+
}
179+
}
180+
167181
tocbot.refresh();
168182

169183
ScreenReaderMessenger.getMessenger().say(`Viewing ${label}`);

‎templates/text/langmap.en.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,7 @@
439439
<Item key="default-badge">more_vert</Item>
440440
</Lookup>
441441
<Lookup id="uplift">
442+
<Item key="results.str.singlepage"> scan</Item>
442443
<Item key="uplift.str.contents">Item Information</Item>
443444
<Item key="uplift.str.page.contents">Browse: Collection Contents</Item>
444445
<Item key="uplift.str.page.browse">Browse: Collection Contents</Item>

‎templates/text/qbat/qbat.pageviewer.xsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@
476476
</span>
477477
</xsl:template>
478478

479-
<xsl:template match="qui:field[@key='bookmark']" priority="101">
479+
<xsl:template match="qui:field[contains(@key, 'bookmark')]" priority="101">
480480
<xsl:call-template name="build-content-copy-metadata">
481481
<xsl:with-param name="term"><xsl:value-of select="qui:label" /></xsl:with-param>
482482
<xsl:with-param name="key"><xsl:value-of select="@key" /></xsl:with-param>

‎templates/text/qui/includes/qui.header-common.xsl

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,12 @@
6161
<qui:label>Link to this Item</qui:label>
6262
<qui:values>
6363
<qui:value>
64-
<xsl:text>https://name.umdl.umich.edu/</xsl:text>
64+
<xsl:value-of select="//ApiUrl" />
65+
<xsl:text>/</xsl:text>
66+
<xsl:value-of select="substring($collid, 1, 1)" />
67+
<xsl:text>/</xsl:text>
68+
<xsl:value-of select="$collid" />
69+
<xsl:text>/</xsl:text>
6570
<xsl:choose>
6671
<xsl:when test="local-name($item) = 'Item' and $item/@idno">
6772
<xsl:value-of select="$item/@idno" />
@@ -979,7 +984,7 @@
979984
<xsl:when test="contains(normalize-space(.), 'believed to be in the public domain')">
980985
<xsl:apply-templates select="key('get-statement', 'u-m-research-access-believed')" mode="copy-guts" />
981986
</xsl:when>
982-
<xsl:when test="contains(normalize-space(.), 'are likely to be in the public domain.')">
987+
<xsl:when test="contains(normalize-space(.), 'are likely in the public domain.')">
983988
<xsl:apply-templates select="key('get-statement', 'u-m-research-access-believed')" mode="copy-guts" />
984989
</xsl:when>
985990
<xsl:when test="contains(normalize-space(.), 'with permission from copyright holder')">

‎templates/text/qui/qui.header.xsl

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,17 @@
6161

6262
<xsl:template name="build-contents-navigation">
6363
<qui:nav role="contents">
64-
<xsl:if test="
65-
/Top/AuthRequired != 'true' and
66-
/Top/Item/DocEncodingType != 'serialissue' and
67-
/Top/Item/ItemHeader/HEADER/@TYPE != 'noocr'">
68-
<qui:link href="{//ViewEntireTextLink}" role="view-text">
69-
<xsl:value-of select="key('get-lookup','header.str.viewentiretext')"/>
70-
</qui:link>
71-
</xsl:if>
72-
<!-- <qui:link rel="bookmark" href="{/Top/BookbagAddHref}" label="{key('get-lookup', 'results.str.21')}" /> -->
64+
<xsl:choose>
65+
<xsl:when test="/Top/AuthRequired = 'true'"></xsl:when>
66+
<xsl:when test="/Top/Item/DocEncodingType = 'serialissue'"></xsl:when>
67+
<xsl:when test="/Top/Item/ItemHeader/HEADER/@TYPE = 'noocr'"></xsl:when>
68+
<xsl:when test="//ViewEntireTextLink">
69+
<qui:link href="{//ViewEntireTextLink}" role="view-text">
70+
<xsl:value-of select="key('get-lookup','header.str.viewentiretext')"/>
71+
</qui:link>
72+
</xsl:when>
73+
<xsl:otherwise></xsl:otherwise>
74+
</xsl:choose>
7375
<xsl:choose>
7476
<xsl:when test="/Top/BookbagResults/Item[@idno=$idno]">
7577
<qui:form slot="bookbag" rel="remove" href="{/Top/BookbagResults/Item[@idno=$idno]/AddRemoveUrl}" data-identifier="{$idno}">

‎templates/text/qui/qui.pageviewer.xsl

Lines changed: 36 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -509,26 +509,42 @@
509509
</qui:values>
510510
</qui:field> -->
511511

512-
<qui:field key="bookmark" component="input">
513-
<qui:label>Link to this Item</qui:label>
514-
<qui:values>
515-
<qui:value>
516-
<xsl:text>https://name.umdl.umich.edu/</xsl:text>
517-
<xsl:choose>
518-
<xsl:when test="//Param[@name='node']">
519-
<xsl:value-of select="//Param[@name='node']" />
520-
<xsl:if test="//Param[@name='seq']">
521-
<xsl:text>/</xsl:text>
522-
<xsl:value-of select="//Param[@name='seq']" />
523-
</xsl:if>
524-
</xsl:when>
525-
<xsl:otherwise>
526-
<xsl:value-of select="dlxs:downcase(//Param[@name='idno'])" />
527-
</xsl:otherwise>
528-
</xsl:choose>
529-
</qui:value>
530-
</qui:values>
531-
</qui:field>
512+
<xsl:call-template name="build-bookmarkable-link">
513+
<xsl:with-param name="item" select="/Top/DocMeta" />
514+
</xsl:call-template>
515+
516+
<xsl:if test="//Param[@name='seq'] or
517+
( //Param[@name='node'] and //Param[@name='node'] != //Param[@name='idno'] )">
518+
<qui:field key="bookmark-item" component="input">
519+
<qui:label>Link to this <xsl:value-of select="key('get-lookup', 'results.str.singlepage')" /></qui:label>
520+
<qui:values>
521+
<qui:value>
522+
<xsl:value-of select="//ApiUrl" />
523+
<xsl:text>/</xsl:text>
524+
<xsl:value-of select="substring($collid, 1, 1)" />
525+
<xsl:text>/</xsl:text>
526+
<xsl:value-of select="$collid" />
527+
<xsl:text>/</xsl:text>
528+
<xsl:choose>
529+
<xsl:when test="//Param[@name='node']">
530+
<xsl:value-of select="//Param[@name='node']" />
531+
<xsl:if test="//Param[@name='seq']">
532+
<xsl:text>/</xsl:text>
533+
<xsl:value-of select="//Param[@name='seq']" />
534+
</xsl:if>
535+
</xsl:when>
536+
<xsl:otherwise>
537+
<xsl:value-of select="dlxs:downcase(//Param[@name='idno'])" />
538+
<xsl:if test="//Param[@name='seq']">
539+
<xsl:text>/</xsl:text>
540+
<xsl:value-of select="//Param[@name='seq']" />
541+
</xsl:if>
542+
</xsl:otherwise>
543+
</xsl:choose>
544+
</qui:value>
545+
</qui:values>
546+
</qui:field>
547+
</xsl:if>
532548

533549
</qui:section>
534550
<!-- </qui:block> -->

0 commit comments

Comments
 (0)