From 5c3d8989549c976db6a37e068ebe5922acbffbb3 Mon Sep 17 00:00:00 2001
From: Ben Woodhead <bwoodhead@upei.ca>
Date: Mon, 19 Sep 2011 13:59:57 -0300
Subject: [PATCH 1/2] server changes
---
.CollectionClass.inc.swp | Bin 40960 -> 0 bytes
api/fedora_item.inc | 5 +++++
2 files changed, 5 insertions(+)
delete mode 100644 .CollectionClass.inc.swp
diff --git a/.CollectionClass.inc.swp b/.CollectionClass.inc.swp
deleted file mode 100644
index 123bc8be17bb1a4e9c734830c761c06d0e4902ad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 40960
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
D34Nub
diff --git a/api/fedora_item.inc b/api/fedora_item.inc
index 836e5b53..811e186d 100644
--- a/api/fedora_item.inc
+++ b/api/fedora_item.inc
@@ -76,6 +76,11 @@ class Fedora_Item {
*/
function add_datastream_from_file($datastream_file, $datastream_id, $datastream_label = NULL, $datastream_mimetype = '', $controlGroup = 'M', $logMessage = NULL) {
module_load_include('inc', 'fedora_repository', 'MimeClass');
+ if (!is_file($datastream_file)){
+ drupal_set_message("$datastream_file not found.", 'warning');
+ return;
+
+ }
if (empty($datastream_mimetype)) {
// Get mime type from the file extension.
$mimetype_helper = new MimeClass();
From 2819abd5f8b68ca4455cf97b9105b07d710e060c Mon Sep 17 00:00:00 2001
From: Ben Woodhead <bwoodhead@upei.ca>
Date: Mon, 19 Sep 2011 15:14:06 -0300
Subject: [PATCH 2/2] Copied from 1.1
---
xsl/advanced_search_results.xsl | 515 ++++++++----------
xsl/browseIndexToResultPage.xslt | 893 ++++++++++++-------------------
xsl/convertQDC.xsl | 72 +--
xsl/refworks.xsl | 298 +++--------
xsl/results.xsl | 476 ++++++++--------
xsl/romeo.xsl | 101 +---
xsl/sparql_to_html.xsl | 455 +++++++---------
xsl/specdwc.xsl | 177 ++----
xsl/unfilteredresults.xsl | 416 +++++++-------
9 files changed, 1379 insertions(+), 2024 deletions(-)
diff --git a/xsl/advanced_search_results.xsl b/xsl/advanced_search_results.xsl
index d94ca7e9..bb57c47d 100644
--- a/xsl/advanced_search_results.xsl
+++ b/xsl/advanced_search_results.xsl
@@ -1,48 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns:php="http://php.net/xsl" exclude-result-prefixes="php">
- <xsl:variable name="OBJECTSPAGE">
- <xsl:value-of select="$objectsPage"/>
- </xsl:variable>
- <xsl:variable name="ALLOWEDNAMESPACES" select="$allowedPidNameSpaces"/>
+<xsl:variable name="OBJECTSPAGE">
+ <xsl:value-of select="$objectsPage"/>
+</xsl:variable>
+ <xsl:variable name="ALLOWEDNAMESPACES" select="$allowedPidNameSpaces"/>
<!--<xsl:variable name="PATHTOMAKEIMAGE">
<xsl:value-of select="$pathToMakeImage"/>
</xsl:variable>-->
- <xsl:template match="gfindObjects">
+<xsl:template match="gfindObjects">
- <xsl:variable name="INDEXNAME" select="@indexName"/>
+<xsl:variable name="INDEXNAME" select="@indexName"/>
- <xsl:variable name="PREQUERY" select="substring-before(@query,':')"/>
+ <xsl:variable name="PREQUERY" select="substring-before(@query,':')"/>
<!--<xsl:variable name="QUERY" select="substring-after(@query,':')"/>-->
- <xsl:variable name="QUERY" select="@query"/>
- <xsl:variable name="HITPAGESTART" select="@hitPageStart"/>
- <xsl:variable name="HITPAGESIZE" select="@hitPageSize"/>
- <xsl:variable name="HITTOTAL" select="@hitTotal"/>
+ <xsl:variable name="QUERY" select="@query"/>
+ <xsl:variable name="HITPAGESTART" select="@hitPageStart"/>
+ <xsl:variable name="HITPAGESIZE" select="@hitPageSize"/>
+ <xsl:variable name="HITTOTAL" select="@hitTotal"/>
- <xsl:variable name="SEARCHURL">
+ <xsl:variable name="SEARCHURL">
<!--<xsl:value-of select="$searchUrl"/>-->
mnpl_advanced_search
- </xsl:variable>
- <xsl:variable name="TOKEN">
- <xsl:value-of select="$searchToken"/>
- </xsl:variable>
- <xsl:variable name="HITPAGEEND">
- <xsl:choose>
- <xsl:when test="$HITPAGESTART + $HITPAGESIZE - 1 > $HITTOTAL">
- <xsl:value-of select="$HITTOTAL"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$HITPAGESTART + $HITPAGESIZE - 1"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
-
- <xsl:variable name="HITPAGENO" select="ceiling($HITPAGESTART div $HITPAGESIZE)"/>
- <xsl:variable name="HITPAGENOLAST" select="ceiling($HITTOTAL div $HITPAGESIZE)"/>
- <xsl:variable name="HITPAGESTARTT" select="(($HITPAGENO - 1) * $HITPAGESIZE + 1)"/>
- <xsl:choose>
- <xsl:when test="$HITTOTAL > 0">
- <style type="text/css">
+ </xsl:variable>
+ <xsl:variable name="TOKEN">
+ <xsl:value-of select="$searchToken"/>
+ </xsl:variable>
+ <xsl:variable name="HITPAGEEND">
+ <xsl:choose>
+ <xsl:when test="$HITPAGESTART + $HITPAGESIZE - 1 > $HITTOTAL">
+ <xsl:value-of select="$HITTOTAL"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$HITPAGESTART + $HITPAGESIZE - 1"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:variable name="HITPAGENO" select="ceiling($HITPAGESTART div $HITPAGESIZE)"/>
+ <xsl:variable name="HITPAGENOLAST" select="ceiling($HITTOTAL div $HITPAGESIZE)"/>
+ <xsl:variable name="HITPAGESTARTT" select="(($HITPAGENO - 1) * $HITPAGESIZE + 1)"/>
+<xsl:choose>
+<xsl:when test="$HITTOTAL > 0">
+ <style type="text/css">
span.highlight
{
@@ -53,176 +53,143 @@
{
font-weight: bold
}
- </style>
-
- Total Hits =
- <strong>
- <xsl:value-of select="@hitTotal"/>,
- </strong>
- Number of Hits/page =
- <xsl:value-of select="$HITPAGESIZE"/>
- <br />You may not have sufficient privileges to view any or all of the items found. The objects you have rights to view will be shown below.
+</style>
+
+ Total Hits = <strong><xsl:value-of select="@hitTotal"/>,</strong>
+ Number of Hits/page = <xsl:value-of select="$HITPAGESIZE"/>
+ <br />You may not have sufficient privileges to view any or all of the items found. The objects you have rights to view will be shown below.
<!-- Current page = <xsl:value-of select="@hitPageStart"/>-->
- <br/>
- <xsl:if test="$HITTOTAL > $HITPAGESIZE">
- <div class="item-list">
- <ul class="pager">
- <xsl:if test="$HITPAGENO > 1">
- <li class="pager-previous">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/mnpl_advanced_search/
- <xsl:value-of select="$QUERY"/>/
- <xsl:value-of select="$HITPAGESTARTT - $HITPAGESIZE"/>
- </xsl:attribute>
+ <br/>
+ <xsl:if test="$HITTOTAL > $HITPAGESIZE">
+ <div class="item-list">
+ <ul class="pager">
+ <xsl:if test="$HITPAGENO > 1">
+ <li class="pager-previous">
+ <a>
+ <xsl:attribute name="href"><xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/mnpl_advanced_search/<xsl:value-of select="$QUERY"/>/<xsl:value-of select="$HITPAGESTARTT - $HITPAGESIZE"/></xsl:attribute>
< Previous
- </a>
- </li>
- </xsl:if>
- <xsl:text> </xsl:text>
- <xsl:if test="$HITPAGENO < $HITPAGENOLAST">
- <li class="pager-next">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/mnpl_advanced_search/
- <xsl:value-of select="$QUERY"/>/
- <xsl:value-of select="$HITPAGESTARTT+$HITPAGESIZE"/>
- </xsl:attribute>
+ </a>
+ </li>
+ </xsl:if><xsl:text> </xsl:text>
+ <xsl:if test="$HITPAGENO < $HITPAGENOLAST">
+ <li class="pager-next">
+ <a>
+ <xsl:attribute name="href"><xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/mnpl_advanced_search/<xsl:value-of select="$QUERY"/>/<xsl:value-of select="$HITPAGESTARTT+$HITPAGESIZE"/></xsl:attribute>
Next >
- </a>
- </li>
- </xsl:if>
- </ul>
- </div>
- </xsl:if>
+ </a>
+ </li>
+ </xsl:if>
+ </ul>
+ </div>
+ </xsl:if>
<!--<form action="/drupal-5.1/?q=search/fedora_collections" method="post" id="search-form" class="search-form">-->
- <xsl:apply-templates select="objects"/>
- <xsl:if test="$HITTOTAL > $HITPAGESIZE">
- <div class="item-list">
- <ul class="pager">
- <xsl:if test="$HITPAGENO > 1">
- <li class="pager-previous">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/mnpl_advanced_search/
- <xsl:value-of select="$QUERY"/>/
- <xsl:value-of select="$HITPAGESTARTT - $HITPAGESIZE"/>
- </xsl:attribute>
+<xsl:apply-templates select="objects"/>
+ <xsl:if test="$HITTOTAL > $HITPAGESIZE">
+ <div class="item-list">
+ <ul class="pager">
+ <xsl:if test="$HITPAGENO > 1">
+ <li class="pager-previous">
+ <a>
+ <xsl:attribute name="href"><xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/mnpl_advanced_search/<xsl:value-of select="$QUERY"/>/<xsl:value-of select="$HITPAGESTARTT - $HITPAGESIZE"/></xsl:attribute>
< Previous
- </a>
- </li>
- </xsl:if>
- <xsl:text> </xsl:text>
- <xsl:if test="$HITPAGENO < $HITPAGENOLAST">
- <li class="pager-next">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/mnpl_advanced_search/
- <xsl:value-of select="$QUERY"/>/
- <xsl:value-of select="$HITPAGESTARTT+$HITPAGESIZE"/>
- </xsl:attribute>
+ </a>
+ </li>
+ </xsl:if><xsl:text> </xsl:text>
+ <xsl:if test="$HITPAGENO < $HITPAGENOLAST">
+ <li class="pager-next">
+ <a>
+ <xsl:attribute name="href"><xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/mnpl_advanced_search/<xsl:value-of select="$QUERY"/>/<xsl:value-of select="$HITPAGESTARTT+$HITPAGESIZE"/></xsl:attribute>
Next >
- </a>
- </li>
- </xsl:if>
- </ul>
- </div>
- </xsl:if>
- </xsl:when>
- <xsl:otherwise>
- <div class="box">
-
- <h2>Your search yielded no results</h2>
-
- <div class="content">
- <ul>
- <li>Check if your spelling is correct.</li>
-
- <li>Remove quotes around phrases to match each word individually:
- <em>"blue smurf"</em> will match less than
- <em>blue smurf</em>.
- </li>
- <li>Consider loosening your query with
- <em>OR</em>:
- <em>blue smurf</em> will match less than
- <em>blue OR smurf</em>.
- </li>
- </ul>
- </div>
-
- </div>
-
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
- <xsl:template match="objects">
-
-
-
-
- <table>
- <div class="search-results">
- <xsl:for-each select="object">
- <xsl:variable name="PIDVALUE">
- <xsl:choose>
- <xsl:when test="@PID">
- <xsl:value-of select="@PID"/>
- </xsl:when>
- <xsl:when test="field[@name='PID' and @snippet='yes']">
- <xsl:value-of select="field[@name='PID']/span/text()"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="field[@name='PID']/text()"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
-
-
- <xsl:call-template name="splitBySpace">
- <xsl:with-param name="PIDVALUE" select="$PIDVALUE"></xsl:with-param>
- <xsl:with-param name="str" select="$ALLOWEDNAMESPACES"/>
- </xsl:call-template>
-
-
- </xsl:for-each>
- </div>
- </table>
-
- </xsl:template>
- <xsl:template name="splitBySpace">
- <xsl:param name="str"/>
- <xsl:param name="PIDVALUE"/>
+ </a>
+ </li>
+ </xsl:if>
+ </ul>
+ </div>
+ </xsl:if>
+</xsl:when>
+ <xsl:otherwise>
+ <div class="box">
+
+ <h2>Your search yielded no results</h2>
+
+ <div class="content"><ul>
+<li>Check if your spelling is correct.</li>
+
+<li>Remove quotes around phrases to match each word individually: <em>"blue smurf"</em> will match less than <em>blue smurf</em>.</li>
+<li>Consider loosening your query with <em>OR</em>: <em>blue smurf</em> will match less than <em>blue OR smurf</em>.</li>
+</ul></div>
+
+</div>
+
+ </xsl:otherwise>
+</xsl:choose>
+</xsl:template>
+
+<xsl:template match="objects">
+
+
+
+
+ <table><div class="search-results">
+ <xsl:for-each select="object">
+ <xsl:variable name="PIDVALUE">
+ <xsl:choose>
+ <xsl:when test="@PID">
+ <xsl:value-of select="@PID"/>
+ </xsl:when>
+ <xsl:when test="field[@name='PID' and @snippet='yes']">
+ <xsl:value-of select="field[@name='PID']/span/text()"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="field[@name='PID']/text()"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+
+ <xsl:call-template name="splitBySpace">
+ <xsl:with-param name="PIDVALUE" select="$PIDVALUE"></xsl:with-param>
+ <xsl:with-param name="str" select="$ALLOWEDNAMESPACES"/>
+ </xsl:call-template>
+
+
+ </xsl:for-each>
+ </div></table>
+
+</xsl:template>
+ <xsl:template name="splitBySpace">
+ <xsl:param name="str"/>
+ <xsl:param name="PIDVALUE"/>
- <xsl:choose>
- <xsl:when test="contains($str,' ')">
+ <xsl:choose>
+ <xsl:when test="contains($str,' ')">
<!--'DO SOMETHING WITH THE VALUE IN
{substring-before($str,' ')}-->
- <xsl:variable name="testString" select="substring-before($str,' ')"/>
+ <xsl:variable name="testString" select="substring-before($str,' ')"/>
- <xsl:if test="starts-with(php:function('strtolower',$PIDVALUE),php:function('strtolower',$testString))">
+ <xsl:if test="starts-with(php:function('strtolower',$PIDVALUE),php:function('strtolower',$testString))">
- <xsl:call-template name="showResult">
+ <xsl:call-template name="showResult">
- <xsl:with-param name="PIDVALUE" select="$PIDVALUE"/>
+ <xsl:with-param name="PIDVALUE" select="$PIDVALUE"/>
- </xsl:call-template>
+ </xsl:call-template>
- </xsl:if>
+ </xsl:if>
<!--<xsl:value-of select="substring-before($str,' ')"/>-->
- <xsl:call-template name="splitBySpace">
- <xsl:with-param name="str"
+ <xsl:call-template name="splitBySpace">
+ <xsl:with-param name="str"
select="substring-after($str,' ')"/>
- <xsl:with-param name="PIDVALUE"
+ <xsl:with-param name="PIDVALUE"
select="$PIDVALUE"/>
- </xsl:call-template>
- </xsl:when>
- <xsl:otherwise>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:otherwise>
<!-- <xsl:if test="substring-before($str, ':') = substring-before($PIDVALUE, ':')">
<xsl:call-template name="showResult">
@@ -230,27 +197,23 @@
</xsl:call-template>
</xsl:if>-->
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
- <xsl:template name="showResult">
- <xsl:param name="PIDVALUE"/>
- <xsl:variable name="DCTITLE">
- <xsl:value-of select="field[@name='dc.title']/node()"/>
- </xsl:variable>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+
+<xsl:template name="showResult">
+ <xsl:param name="PIDVALUE"/>
+ <xsl:variable name="DCTITLE">
+ <xsl:value-of select="field[@name='dc.title']/node()"/>
+ </xsl:variable>
- <xsl:variable name="CLEANTITLE">
- <xsl:value-of select="php:functionString('fedora_repository_urlencode_string', $DCTITLE)"/>
+ <xsl:variable name="CLEANTITLE">
+ <xsl:value-of select="php:functionString('fedora_repository_urlencode_string', $DCTITLE)"/>
</xsl:variable>
- <tr>
- <td valign="top">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/
- <xsl:copy-of select="$PIDVALUE"/>/-/
- <xsl:value-of select="$CLEANTITLE"/>
- </xsl:attribute>
+ <tr><td valign="top">
+ <a>
+ <xsl:attribute name="href"><xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/<xsl:copy-of select="$PIDVALUE"/>/-/<xsl:value-of select="$CLEANTITLE"/>
+ </xsl:attribute>
<!--<xsl:attribute name="href"><xsl:copy-of select="$OBJECTSPAGE"/><![CDATA[&pid=]]><xsl:value-of select="$PIDVALUE"/><![CDATA[&collection=object]]>
</xsl:attribute>-->
@@ -261,111 +224,99 @@
http://islandlives.ca:8080/adore-djatoka/resolver?url_ver=Z39.88-2004&rft_id=http://islandlives.ca/fedora/repository/<xsl:copy-of select="$PIDVALUE"/>/JPG/jpg.jpg&svc_id=info:lanl-repo/svc/getRegion&svc_val_fmt=info:ofi/fmt:kev:mtx:jpeg&svc.format=image/jpeg&svc.level=0&svc.rotate=0&svc.region=0,0,100,100</xsl:attribute>
</img>-->
- <img>
- <xsl:attribute name="src">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/
- <xsl:copy-of select="$PIDVALUE"/>/TN
- </xsl:attribute>
- </img>
- </a>
+ <img>
+ <xsl:attribute name="src"><xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/<xsl:copy-of select="$PIDVALUE"/>/TN
+ </xsl:attribute>
+ </img>
+ </a>
- </td >
+ </td >
- <td width="80%" valign="top">
- <table valign="top">
+ <td width="80%" valign="top">
+ <table valign="top">
- <tr valign="top">
- <td valign="top" class="search-results" colspan="2">
+ <tr valign="top">
+ <td valign="top" class="search-results" colspan="2">
- <xsl:value-of select="@no"/>
- <xsl:value-of select="'. '"/>
+ <xsl:value-of select="@no"/>
+ <xsl:value-of select="'. '"/>
- <a>
+ <a>
<!--<xsl:attribute name="href"><![CDATA[http://localhost/drupal-5.1/?q=node/7&pid=]]><xsl:value-of select="$PIDVALUE"/><![CDATA[&collection=object]]>-->
<!--<xsl:attribute name="href"><xsl:copy-of select="$OBJECTSPAGE"/><![CDATA[&pid=]]><xsl:value-of select="$PIDVALUE"/><![CDATA[&collection=object]]>-->
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/
- <xsl:value-of select="$PIDVALUE"/>/-/
- <xsl:value-of select="$CLEANTITLE"/>
-
- </xsl:attribute>
-
- <xsl:value-of select="$PIDVALUE"/>
- <br />
- </a>
- <span class="searchtitle">
- <span >
- Score:(
- <xsl:value-of select="@score"/>)
- </span>
- <br />
- <a>
+ <xsl:attribute name="href"><xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/<xsl:value-of select="$PIDVALUE"/>/-/<xsl:value-of select="$CLEANTITLE"/>
+
+ </xsl:attribute>
+
+ <xsl:value-of select="$PIDVALUE"/><br />
+ </a>
+ <span class="searchtitle">
+ <span >
+ Score:(<xsl:value-of select="@score"/>)
+ </span><br />
+ <a>
<!--<xsl:attribute name="href"><xsl:copy-of select="$OBJECTSPAGE"/><![CDATA[&pid=]]><xsl:value-of select="$PIDVALUE"/><![CDATA[&collection=object]]>-->
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/
- <xsl:value-of select="$PIDVALUE"/>/-/
- <xsl:value-of select="$CLEANTITLE"/>
+ <xsl:attribute name="href"><xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/<xsl:value-of select="$PIDVALUE"/>/-/<xsl:value-of select="$CLEANTITLE"/>
- </xsl:attribute>
- <xsl:value-of select="field[@name='dc.title']/node()" disable-output-escaping="yes"/>
- </a>
- </span>
+ </xsl:attribute>
+ <xsl:value-of select="field[@name='dc.title']/node()" disable-output-escaping="yes"/>
+ </a>
+ </span>
- </td>
+ </td>
- </tr>
+ </tr>
- <xsl:for-each select="field[@snippet='yes']">
- <xsl:choose>
- <xsl:when test="(@name='fgs.DS.first.text')">
+ <xsl:for-each select="field[@snippet='yes']">
+ <xsl:choose>
+ <xsl:when test="(@name='fgs.DS.first.text')">
- <tr>
- <td valign="top">
- <span class="searchtitle">
+ <tr>
+ <td valign="top">
+ <span class="searchtitle">
Text Stream<!--<xsl:value-of select="@name"/>-->
- </span>
- </td>
- <td>
- <span class="text">
- <xsl:copy-of select="node()"/>
- </span>
- </td>
- </tr>
- </xsl:when>
- <xsl:when test="(@name='dc.title')">
-
- </xsl:when>
- <xsl:otherwise>
- <tr>
- <td valign="top">
- <span class="searchtitle">
- <xsl:value-of select="@name"/>
- </span>
- </td>
- <td>
- <span class="text">
- <xsl:copy-of select="node()"/>
- </span>
- </td>
- </tr>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
-
- </table>
-
- </td>
- </tr>
- </xsl:template>
+ </span>
+ </td>
+ <td>
+ <span class="text">
+ <xsl:copy-of select="node()"/>
+ </span>
+ </td>
+ </tr>
+ </xsl:when>
+ <xsl:when test="(@name='dc.title')">
+
+ </xsl:when>
+ <xsl:otherwise>
+ <tr>
+ <td valign="top">
+ <span class="searchtitle">
+ <xsl:value-of select="@name"/>
+ </span>
+ </td>
+ <td>
+ <span class="text">
+ <xsl:copy-of select="node()"/>
+ </span>
+ </td>
+ </tr>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+
+ </table>
+
+ </td></tr>
+</xsl:template>
</xsl:stylesheet>
diff --git a/xsl/browseIndexToResultPage.xslt b/xsl/browseIndexToResultPage.xslt
index dc65ec6c..9d03d470 100644
--- a/xsl/browseIndexToResultPage.xslt
+++ b/xsl/browseIndexToResultPage.xslt
@@ -16,7 +16,7 @@
<xsl:param name="RESULTPAGEXSLT" select="resultPageXslt"/>
<xsl:param name="DATETIME" select="none"/>
<xsl:variable name="OBJECTSPAGE" select="$objectsPage"/>
- <xsl:variable name="DISPLAYNAME" select="$displayName"/>
+ <xsl:variable name="DISPLAYNAME" select="$displayName"/>
<xsl:variable name="INDEXNAME" select="lucenebrowseindex/@indexName"/>
<xsl:variable name="FIELDNAME" select="lucenebrowseindex/@fieldName"/>
@@ -32,569 +32,352 @@
termPageSize="{$TERMPAGESIZE}"
resultPageXslt="{$RESULTPAGEXSLT}"
termTotal="{$TERMTOTAL}">
- <h3>
- <xsl:value-of select="$DISPLAYNAME"/>
- </h3>
+ <h3><xsl:value-of select="$DISPLAYNAME"/></h3>
<!--start pager Div-->
<!--Start letters -->
- <div class="item-list">
- <ul class="pager">
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/A/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> A </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/B/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> B </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/C/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> C </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/D/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> D </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/E/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> E </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/F/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> F </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/G/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> G </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/H/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> H </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/I/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> I </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/J/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> J </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/K/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> K </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/L/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> L </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/M/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> M </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/N/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> N </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/O/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> O </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/P/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> P </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/Q/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> Q </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/R/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> R </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/S/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> S </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/T/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> T </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/U/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> U </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/V/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> V </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/W/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> W </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/X/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> X </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/Y/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> Y </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/Z/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> Z </span>
- </a>
- </li>
+<div class="item-list">
+ <ul class="pager">
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/A/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> A </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/B/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> B </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/C/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> C </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/D/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> D </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/E/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> E </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/F/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> F </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/G/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> G </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/H/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> H </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/I/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> I </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/J/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> J </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/K/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> K </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/L/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> L </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/M/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> M </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/N/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> N </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/O/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> O </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/P/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> P </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/Q/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> Q </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/R/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> R </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/S/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> S </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/T/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> T </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/U/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> U </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/V/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> V </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/W/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> W </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/X/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> X </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/Y/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> Y </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/Z/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> Z </span>
+ </a>
+ </li>
<!--End letters-->
- <li class="pager-next">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/
- <xsl:value-of select="$PAGELASTTERM"/>/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute> >>
- </a>
- </li>
- </ul>
+ <li class="pager-next">
+ <a>
+ <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/<xsl:value-of select="$PAGELASTTERM"/>/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> >>
+ </a>
+ </li>
+ </ul>
</div>
<!--End pager Div-->
- <br />
- <br />
+ <br /><br />
<xsl:apply-templates select="terms"/>
<br />
<!--start pager Div-->
<!--Start letters -->
- <div class="item-list">
- <ul class="pager">
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/A/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> A </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/B/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> B </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/C/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> C </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/D/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> D </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/E/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> E </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/F/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> F </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/G/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> G </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/I/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> H </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/I/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> I </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/J/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> J </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/K/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> K </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/L/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> L </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/M/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> M </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/N/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> N </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/O/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> O </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/P/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> P </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/Q/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> Q </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/R/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> R </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/S/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> S </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/T/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> T </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/U/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> U </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/V/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> V </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/W/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> W </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/X/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> X </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/Y/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> Y </span>
- </a>
- </li>
- <li class="pager-item">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/Z/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute>
- <span class="letter"> Z </span>
- </a>
- </li>
+<div class="item-list">
+ <ul class="pager">
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/A/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> A </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/B/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> B </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/C/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> C </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/D/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> D </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/E/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> E </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/F/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> F </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/G/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> G </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/I/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> H </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/I/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> I </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/J/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> J </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/K/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> K </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/L/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> L </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/M/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> M </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/N/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> N </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/O/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> O </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/P/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> P </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/Q/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> Q </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/R/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> R </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/S/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> S </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/T/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> T </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/U/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> U </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/V/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> V </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/W/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> W </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/X/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> X </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/Y/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> Y </span>
+ </a>
+ </li>
+ <li class="pager-item">
+ <a> <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/Z/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> <span class="letter"> Z </span>
+ </a>
+ </li>
<!--End letters-->
- <li class="pager-next">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/
- <xsl:value-of select='$FIELDNAME'/>/
- <xsl:value-of select="$PAGELASTTERM"/>/
- <xsl:value-of select="$DISPLAYNAME"/>
- </xsl:attribute> >>
- </a>
- </li>
- </ul>
+ <li class="pager-next">
+ <a>
+ <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/list_terms/<xsl:value-of select='$FIELDNAME'/>/<xsl:value-of select="$PAGELASTTERM"/>/<xsl:value-of select="$DISPLAYNAME"/>
+ </xsl:attribute> >>
+ </a>
+ </li>
+ </ul>
</div>
<!--End pager Div-->
<!--<xsl:copy-of select="fields"/>-->
@@ -609,10 +392,8 @@
<xsl:attribute name="href">
<!-- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/mnpl_advanced_search/<xsl:value-of select='$FIELDNAME'/>:"<xsl:value-of select="."/>" AND dc.type:collection
the commented out url is for general use the one below is for islandlives book view-->
- <xsl:variable name="SHORTFIELDNAME" select="substring-before($FIELDNAME,'TERM')"/>
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/ilives_book_search/
- <xsl:value-of select='$SHORTFIELDNAME'/>:"
- <xsl:value-of select="."/>" AND dc.type:collection
+ <xsl:variable name="SHORTFIELDNAME" select="substring-before($FIELDNAME,'TERM')"/>
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/ilives_book_search/<xsl:value-of select='$SHORTFIELDNAME'/>:"<xsl:value-of select="."/>" AND dc.type:collection
</xsl:attribute>
<xsl:value-of select="."/>
</a>
diff --git a/xsl/convertQDC.xsl b/xsl/convertQDC.xsl
index 740a4b21..e7e0d627 100644
--- a/xsl/convertQDC.xsl
+++ b/xsl/convertQDC.xsl
@@ -1,55 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
- <xsl:variable name="BASEURL">
- <xsl:value-of select="$baseUrl"/>
- </xsl:variable>
- <xsl:variable name="PATH">
- <xsl:value-of select="$path"/>
- </xsl:variable>
- <xsl:template match="/">
+ <xsl:variable name="BASEURL">
+ <xsl:value-of select="$baseUrl"/>
+ </xsl:variable>
+ <xsl:variable name="PATH">
+ <xsl:value-of select="$path"/>
+ </xsl:variable>
+<xsl:template match="/">
- <div>
- <table cellspacing="3" cellpadding="3">
- <tbody>
- <tr>
- <th colspan="3">
- <h3>MetaData</h3>
- </th>
- </tr>
- <xsl:for-each select="/*/*">
- <xsl:variable name="FULLFIELD" select="name()"/>
- <xsl:variable name="FIELD" select="substring-after(name(),':')"/>
- <xsl:variable name="DATA" select="text()"/>
- <xsl:if test="$DATA != ' '">
- <tr>
- <td>
- <strong>
- <xsl:value-of select="substring-after(name(),':')"/>
- </strong>
- </td>
- <td>
- <xsl:value-of select="text()"/>
- <xsl:for-each select="*">
- <div>
- <xsl:value-of select="substring-after(name(),':')"/> =
- <xsl:value-of select="text()"/>
- </div>
- </xsl:for-each>
- </td>
- <td>
- <a href="{$baseUrl}/search/fedora_repository/dc.{$FIELD}:{$DATA}">
- <img title="Find Similar by {$FIELD}" src="{$PATH}/images/view.gif" alt="Find Similar by {$FIELD}" />
- </a>
- </td>
- </tr>
- </xsl:if>
- </xsl:for-each>
+<div><table cellspacing="3" cellpadding="3"><tbody>
+<tr><th colspan="3"><h3>MetaData</h3></th></tr>
+<xsl:for-each select="/*/*">
+ <xsl:variable name="FULLFIELD" select="name()"/>
+ <xsl:variable name="FIELD" select="substring-after(name(),':')"/>
+ <xsl:variable name="DATA" select="text()"/>
+ <xsl:if test="$DATA != ' '">
+ <tr><td><strong><xsl:value-of select="substring-after(name(),':')"/></strong></td><td><xsl:value-of select="text()"/>
+ <xsl:for-each select="*">
+ <div>
+ <xsl:value-of select="substring-after(name(),':')"/> = <xsl:value-of select="text()"/>
+ </div>
+ </xsl:for-each>
+ </td><td><a href="{$baseUrl}/search/fedora_repository/dc.{$FIELD}:{$DATA}"><img title="Find Similar by {$FIELD}" src="{$PATH}/images/view.gif" alt="Find Similar by {$FIELD}" /></a></td></tr>
+ </xsl:if>
+ </xsl:for-each>
- </tbody>
- </table>
- </div>
+ </tbody></table></div>
- </xsl:template>
+</xsl:template>
</xsl:stylesheet>
\ No newline at end of file
diff --git a/xsl/refworks.xsl b/xsl/refworks.xsl
index e021ef2b..2ef0c8df 100644
--- a/xsl/refworks.xsl
+++ b/xsl/refworks.xsl
@@ -1,216 +1,92 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
- <xsl:output method="xml" omit-xml-declaration="yes"/>
+ <xsl:output method="xml" omit-xml-declaration="yes"/>
<!-- refworks xslt -->
- <xsl:template match="/">
- <xsl:if test="/reference/jf">
- <h2>General Information</h2>
- <table cellpadding="2" cellspacing="2">
- <tr>
- <td >
- <strong>Periodical:</strong>
- </td>
- <td>
- <xsl:value-of select="/reference/jf"/>
- </td>
- </tr>
- <tr>
- <td>
- <strong>Abbreviation:</strong>
- </td>
- <td>
- <xsl:value-of select="/reference/jo"/>
- </td>
- </tr>
- <tr>
- <td>
- <strong>Volume:</strong>
- </td>
- <td>
- <xsl:value-of select="/reference/vo"/>
- </td>
- </tr>
- <tr>
- <td>
- <strong>Issue:</strong>
- </td>
- <td>
- <xsl:value-of select="/reference/is"/>
- </td>
- </tr>
- <tr>
- <td>
- <strong>Publisher:</strong>
- </td>
- <td>
- <xsl:value-of select="/reference/pb"/>
- </td>
- </tr>
- <tr>
- <td>
- <strong>Place of Publication:</strong>
- </td>
- <td>
- <xsl:value-of select="/reference/pp"/>
- </td>
- </tr>
- <tr>
- <td>
- <strong>Edition:</strong>
- </td>
- <td>
- <xsl:value-of select="/reference/ed"/>
- </td>
- </tr>
- <tr>
- <td>
- <strong>Year:</strong>
- </td>
- <td>
- <xsl:value-of select="/reference/yr"/>
- </td>
- </tr>
- <tr>
- <td>
- <strong>Date:</strong>
- </td>
- <td>
- <xsl:value-of select="/reference/fd"/>
- </td>
- </tr>
- <tr>
- <td>
- <strong>Start Page:</strong>
- </td>
- <td>
- <xsl:value-of select="/reference/sp"/>
- </td>
- </tr>
- <tr>
- <td>
- <strong>Other Pages:</strong>
- </td>
- <td>
- <xsl:value-of select="/reference/op"/>
- </td>
- </tr>
- <tr>
- <td>
- <strong>ISSN/ISBN:</strong>
- </td>
- <td>
- <xsl:value-of select="/reference/sn"/>
- </td>
- </tr>
- <tr>
- <td>
- <strong>Language:</strong>
- </td>
- <td>
- <xsl:value-of select="/reference/la"/>
- </td>
- </tr>
- <tr>
- <td>
- <strong>UL:</strong>
- </td>
- <td>
- <xsl:value-of select="/reference/ul"/>
- </td>
- </tr>
- </table>
- </xsl:if>
- <xsl:if test="/reference/t1">
- <h2>Titles</h2>
- <ul>
- <xsl:for-each select="/reference/t1">
- <li>
- <xsl:value-of select="."/>
- </li>
- </xsl:for-each>
- </ul>
- </xsl:if>
- <xsl:if test="/reference/t2">
- <ul>
- <h3>Secondary Titles</h3>
- <xsl:for-each select="/reference/t2">
- <li>
- <xsl:value-of select="."/>
- </li>
- </xsl:for-each>
- </ul>
- </xsl:if>
- <xsl:if test="/reference/a1">
- <h2>Authors</h2>
- <ul>
- <xsl:for-each select="/reference/a1">
- <li>
- <xsl:value-of select="."/>
- </li>
- </xsl:for-each>
- </ul>
- </xsl:if>
+ <xsl:template match="/">
+ <xsl:if test="/reference/jf">
+ <h2>General Information</h2>
+ <table cellpadding="2" cellspacing="2">
+ <tr><td ><strong>Periodical:</strong></td><td><xsl:value-of select="/reference/jf"/></td></tr>
+ <tr><td><strong>Abbreviation:</strong></td><td><xsl:value-of select="/reference/jo"/></td></tr>
+ <tr><td><strong>Volume:</strong></td><td><xsl:value-of select="/reference/vo"/></td></tr>
+ <tr><td><strong>Issue:</strong></td><td><xsl:value-of select="/reference/is"/></td></tr>
+ <tr><td><strong>Publisher:</strong></td><td><xsl:value-of select="/reference/pb"/></td></tr>
+ <tr><td><strong>Place of Publication:</strong></td><td><xsl:value-of select="/reference/pp"/></td></tr>
+ <tr><td><strong>Edition:</strong></td><td><xsl:value-of select="/reference/ed"/></td></tr>
+ <tr><td><strong>Year:</strong></td><td><xsl:value-of select="/reference/yr"/></td></tr>
+ <tr><td><strong>Date:</strong></td><td><xsl:value-of select="/reference/fd"/></td></tr>
+ <tr><td><strong>Start Page:</strong></td><td><xsl:value-of select="/reference/sp"/></td></tr>
+ <tr><td><strong>Other Pages:</strong></td><td><xsl:value-of select="/reference/op"/></td></tr>
+ <tr><td><strong>ISSN/ISBN:</strong></td><td><xsl:value-of select="/reference/sn"/></td></tr>
+ <tr><td><strong>Language:</strong></td><td><xsl:value-of select="/reference/la"/></td></tr>
+ <tr><td><strong>UL:</strong></td><td><xsl:value-of select="/reference/ul"/></td></tr>
+ </table>
+ </xsl:if>
+ <xsl:if test="/reference/t1">
+ <h2>Titles</h2>
+ <ul>
+ <xsl:for-each select="/reference/t1">
+ <li><xsl:value-of select="."/></li>
+ </xsl:for-each>
+ </ul>
+ </xsl:if>
+ <xsl:if test="/reference/t2">
+ <ul>
+ <h3>Secondary Titles</h3>
+ <xsl:for-each select="/reference/t2">
+ <li><xsl:value-of select="."/></li>
+ </xsl:for-each>
+ </ul>
+ </xsl:if>
+ <xsl:if test="/reference/a1">
+ <h2>Authors</h2>
+ <ul>
+ <xsl:for-each select="/reference/a1">
+ <li><xsl:value-of select="."/></li>
+ </xsl:for-each>
+ </ul>
+ </xsl:if>
- <xsl:if test="/reference/a2">
- <ul>
- <h3>Secondary Authors</h3>
- <xsl:for-each select="/reference/a2">
- <li>
- <xsl:value-of select="."/>
- </li>
- </xsl:for-each>
- </ul>
- </xsl:if>
- <xsl:if test="/reference/k1">
- <h2>Keywords</h2>
- <ul>
- <xsl:for-each select="/reference/k1">
- <li>
- <xsl:value-of select="."/>
- </li>
- </xsl:for-each>
- </ul>
- </xsl:if>
- <xsl:if test="/reference/ab">
- <h2>Abstract</h2>
- <xsl:for-each select="/reference/ab">
- <div>
- <xsl:value-of select="."/>
- </div>
- </xsl:for-each>
- </xsl:if>
- <xsl:if test="/reference/no">
- <h2>Notes</h2>
- <xsl:for-each select="/reference/no">
- <div>
- <xsl:value-of select="."/>
- </div>
- </xsl:for-each>
- </xsl:if>
- <xsl:variable name="ISSN">
- <xsl:value-of select="/reference/sn"/>
- </xsl:variable>
- <xsl:variable name="BASEURL">
- http://articles.library.upei.ca:7888/godot/hold_tab.cgi?hold_tab_branch=PCU&issn=
- <xsl:value-of select="/reference/sn/text()"/>&date=
- <xsl:value-of select="/reference/yr/text()"/>&volume=
- <xsl:value-of select="/reference/vo/text()"/>&issue=
- <xsl:value-of select="/reference/is/text()"/>&spage=
- <xsl:value-of select="/reference/sp/text()"/>&atitle=
- <xsl:value-of select="/reference/t1"/>&stitle=
- <xsl:value-of select="/reference/jf"/>
- </xsl:variable>
- <br />
- <xsl:if test="/reference/sn">
- <div>
- <a>
- <xsl:attribute name="href">
- <xsl:value-of select="$BASEURL"/>
- </xsl:attribute>
- <xsl:attribute name="target">_blank</xsl:attribute>
- <img src="http://asin1.its.unb.ca:8000/muse/images/getit4.gif"/>
- </a>
- </div>
- </xsl:if>
- </xsl:template>
+ <xsl:if test="/reference/a2">
+ <ul>
+ <h3>Secondary Authors</h3>
+ <xsl:for-each select="/reference/a2">
+ <li><xsl:value-of select="."/></li>
+ </xsl:for-each>
+ </ul>
+ </xsl:if>
+ <xsl:if test="/reference/k1">
+ <h2>Keywords</h2>
+ <ul>
+ <xsl:for-each select="/reference/k1">
+ <li><xsl:value-of select="."/></li>
+ </xsl:for-each>
+ </ul>
+ </xsl:if>
+ <xsl:if test="/reference/ab">
+ <h2>Abstract</h2>
+ <xsl:for-each select="/reference/ab">
+ <div><xsl:value-of select="."/> </div>
+ </xsl:for-each>
+ </xsl:if>
+ <xsl:if test="/reference/no">
+ <h2>Notes</h2>
+ <xsl:for-each select="/reference/no">
+ <div><xsl:value-of select="."/> </div>
+ </xsl:for-each>
+ </xsl:if>
+ <xsl:variable name="ISSN">
+ <xsl:value-of select="/reference/sn"/>
+ </xsl:variable>
+ <xsl:variable name="BASEURL">
+ http://articles.library.upei.ca:7888/godot/hold_tab.cgi?hold_tab_branch=PCU&issn=<xsl:value-of select="/reference/sn/text()"/>&date=<xsl:value-of select="/reference/yr/text()"/>&volume=<xsl:value-of select="/reference/vo/text()"/>&issue=<xsl:value-of select="/reference/is/text()"/>&spage=<xsl:value-of select="/reference/sp/text()"/>&atitle=<xsl:value-of select="/reference/t1"/>&stitle=<xsl:value-of select="/reference/jf"/>
+ </xsl:variable>
+ <br />
+ <xsl:if test="/reference/sn">
+ <div><a>
+ <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/></xsl:attribute>
+ <xsl:attribute name="target">_blank</xsl:attribute>
+ <img src="http://asin1.its.unb.ca:8000/muse/images/getit4.gif"/> </a></div>
+ </xsl:if>
+ </xsl:template>
</xsl:stylesheet>
\ No newline at end of file
diff --git a/xsl/results.xsl b/xsl/results.xsl
index bf165a12..829822db 100644
--- a/xsl/results.xsl
+++ b/xsl/results.xsl
@@ -1,74 +1,74 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns:php="http://php.net/xsl" exclude-result-prefixes="php">
- <xsl:variable name="OBJECTSPAGE">
- <xsl:value-of select="$objectsPage"/>
- </xsl:variable>
- <xsl:variable name="ALLOWEDNAMESPACES" select="$allowedPidNameSpaces"/>
+ <xsl:variable name="OBJECTSPAGE">
+ <xsl:value-of select="$objectsPage"/>
+ </xsl:variable>
+ <xsl:variable name="ALLOWEDNAMESPACES" select="$allowedPidNameSpaces"/>
<!--<xsl:variable name="PATHTOMAKEIMAGE">
<xsl:value-of select="$pathToMakeImage"/>
</xsl:variable>-->
- <xsl:template match="gfindObjects">
- <xsl:variable name="INDEXNAME" select="@indexName"/>
-
- <xsl:variable name="PREQUERY" select="substring-before(@query,':')"/>
- <xsl:variable name="QUERY" select="substring-after(@query,':')"/>
- <xsl:variable name="HITPAGESTART" select="@hitPageStart"/>
- <xsl:variable name="HITPAGESIZE" select="@hitPageSize"/>
- <xsl:variable name="HITTOTAL" select="@hitTotal"/>
-
- <xsl:variable name="SEARCHURL">
- <xsl:value-of select="$searchUrl"/>
- </xsl:variable>
- <xsl:variable name="TOKEN">
- <xsl:value-of select="$searchToken"/>
- </xsl:variable>
- <xsl:variable name="HITPAGEEND">
- <xsl:choose>
- <xsl:when test="$HITPAGESTART + $HITPAGESIZE - 1 > $HITTOTAL">
- <xsl:value-of select="$HITTOTAL"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$HITPAGESTART + $HITPAGESIZE - 1"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
+ <xsl:template match="gfindObjects">
+ <xsl:variable name="INDEXNAME" select="@indexName"/>
+
+ <xsl:variable name="PREQUERY" select="substring-before(@query,':')"/>
+ <xsl:variable name="QUERY" select="substring-after(@query,':')"/>
+ <xsl:variable name="HITPAGESTART" select="@hitPageStart"/>
+ <xsl:variable name="HITPAGESIZE" select="@hitPageSize"/>
+ <xsl:variable name="HITTOTAL" select="@hitTotal"/>
+
+ <xsl:variable name="SEARCHURL">
+ <xsl:value-of select="$searchUrl"/>
+ </xsl:variable>
+ <xsl:variable name="TOKEN">
+ <xsl:value-of select="$searchToken"/>
+ </xsl:variable>
+ <xsl:variable name="HITPAGEEND">
+ <xsl:choose>
+ <xsl:when test="$HITPAGESTART + $HITPAGESIZE - 1 > $HITTOTAL">
+ <xsl:value-of select="$HITTOTAL"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$HITPAGESTART + $HITPAGESIZE - 1"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
- <xsl:variable name="HITPAGENO" select="ceiling($HITPAGESTART div $HITPAGESIZE)"/>
- <xsl:variable name="HITPAGENOLAST" select="ceiling($HITTOTAL div $HITPAGESIZE)"/>
- <xsl:variable name="HITPAGESTARTT" select="(($HITPAGENO - 1) * $HITPAGESIZE + 1)"/>
- <xsl:choose>
- <xsl:when test="$HITTOTAL > 0">
+ <xsl:variable name="HITPAGENO" select="ceiling($HITPAGESTART div $HITPAGESIZE)"/>
+ <xsl:variable name="HITPAGENOLAST" select="ceiling($HITTOTAL div $HITPAGESIZE)"/>
+ <xsl:variable name="HITPAGESTARTT" select="(($HITPAGENO - 1) * $HITPAGESIZE + 1)"/>
+ <xsl:choose>
+ <xsl:when test="$HITTOTAL > 0">
Total Hits =
- <strong>
- <xsl:value-of select="@hitTotal"/>,
- </strong>
+ <strong>
+ <xsl:value-of select="@hitTotal"/>,
+ </strong>
Number of Hits/page =
- <xsl:value-of select="@hitPageSize"/>
- <br />You may not have sufficient privileges to view any or all of the items found. The objects you have rights to view will be shown below.
+ <xsl:value-of select="@hitPageSize"/>
+ <br />You may not have sufficient privileges to view any or all of the items found. The objects you have rights to view will be shown below.
<!-- Current page = <xsl:value-of select="@hitPageStart"/>-->
- <br/>
+ <br/>
<!--<form action="/drupal-5.1/?q=search/fedora_collections" method="post" id="search-form" class="search-form">-->
- <form action="{$SEARCHURL}" method="post" id="search-form" class="search-form">
+ <form action="{$SEARCHURL}" method="post" id="search-form" class="search-form">
- <input type="hidden" maxlength="255" name="keys" id="edit-keys" size="40" value="{$HITPAGESTARTT+$HITPAGESIZE}:{$QUERY}" class="form-text" />
+ <input type="hidden" maxlength="255" name="keys" id="edit-keys" size="40" value="{$HITPAGESTARTT+$HITPAGESIZE}:{$QUERY}" class="form-text" />
<!--<xsl:if test="$PREQUERY = fgs.DS.first.text" >-->
- <input type="hidden" name="type" id="edit-type" value="{$PREQUERY}" />
+ <input type="hidden" name="type" id="edit-type" value="{$PREQUERY}" />
<!--</xsl:if>-->
- <xsl:if test="$HITPAGENO > 1">
- <input type="button" name="back" onClick="javascript:history.go(-1)" id="back-button" value="Previous" class="form-submit" />
- </xsl:if>
- <xsl:if test="$HITPAGENO < $HITPAGENOLAST">
- <input type="submit" name="op" id="edit-submit" value="Next" class="form-submit" />
- </xsl:if>
+ <xsl:if test="$HITPAGENO > 1">
+ <input type="button" name="back" onClick="javascript:history.go(-1)" id="back-button" value="Previous" class="form-submit" />
+ </xsl:if>
+ <xsl:if test="$HITPAGENO < $HITPAGENOLAST">
+ <input type="submit" name="op" id="edit-submit" value="Next" class="form-submit" />
+ </xsl:if>
- <input type="hidden" name="form_token" id="edit-search-form-form-token" value="{$TOKEN}" />
- <input type="hidden" name="form_id" id="edit-search-form" value="search_form" />
+ <input type="hidden" name="form_token" id="edit-search-form-form-token" value="{$TOKEN}" />
+ <input type="hidden" name="form_id" id="edit-search-form" value="search_form" />
- </form>
- <style type="text/css">
+ </form>
+ <style type="text/css">
span.highlight
{
@@ -79,232 +79,238 @@
{
font-weight: bold
}
- </style>
- <xsl:apply-templates select="objects"/>
- </xsl:when>
- <xsl:otherwise>
- <div class="box">
-
- <h2>Your search yielded no results</h2>
-
- <div class="content">
- <ul>
- <li>Check if your spelling is correct.</li>
-
- <li>Remove quotes around phrases to match each word individually:
- <em>"blue smurf"</em> will match less than
- <em>blue smurf</em>.
- </li>
- <li>Consider loosening your query with
- <em>OR</em>:
- <em>blue smurf</em> will match less than
- <em>blue OR smurf</em>.
- </li>
- </ul>
- </div>
-
- </div>
-
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
- <xsl:template match="objects">
-
-
-
-
- <table>
- <div class="search-results">
- <xsl:for-each select="object">
- <xsl:variable name="PIDVALUE">
- <xsl:choose>
- <xsl:when test="@PID">
- <xsl:value-of select="@PID"/>
- </xsl:when>
- <xsl:when test="field[@name='PID' and @snippet='yes']">
- <xsl:value-of select="field[@name='PID']/span/text()"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="field[@name='PID']/text()"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
-
-
- <xsl:call-template name="splitBySpace">
- <xsl:with-param name="PIDVALUE" select="$PIDVALUE"></xsl:with-param>
- <xsl:with-param name="str" select="$ALLOWEDNAMESPACES"/>
- </xsl:call-template>
-
-
- </xsl:for-each>
- </div>
- </table>
+ </style>
+ <xsl:apply-templates select="objects"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <div class="box">
+
+ <h2>Your search yielded no results</h2>
+
+ <div class="content">
+ <ul>
+ <li>Check if your spelling is correct.</li>
+
+ <li>Remove quotes around phrases to match each word individually:
+ <em>"blue smurf"</em> will match less than
+ <em>blue smurf</em>.
+ </li>
+ <li>Consider loosening your query with
+ <em>OR</em>:
+ <em>blue smurf</em> will match less than
+ <em>blue OR smurf</em>.
+ </li>
+ </ul>
+ </div>
+
+ </div>
+
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+
+ <xsl:template match="objects">
+
+
+
+
+ <table>
+ <div class="search-results">
+ <xsl:for-each select="object">
+ <xsl:variable name="PIDVALUE">
+ <xsl:choose>
+ <xsl:when test="@PID">
+ <xsl:value-of select="@PID"/>
+ </xsl:when>
+ <xsl:when test="field[@name='PID' and @snippet='yes']">
+ <xsl:value-of select="field[@name='PID']/span/text()"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="field[@name='PID']/text()"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+
+ <xsl:call-template name="splitBySpace">
+ <xsl:with-param name="PIDVALUE" select="$PIDVALUE"></xsl:with-param>
+ <xsl:with-param name="str" select="$ALLOWEDNAMESPACES"/>
+ </xsl:call-template>
+
+
+ </xsl:for-each>
+ </div>
+ </table>
- </xsl:template>
- <xsl:template name="splitBySpace">
- <xsl:param name="str"/>
- <xsl:param name="PIDVALUE"/>
+ </xsl:template>
+ <xsl:template name="splitBySpace">
+ <xsl:param name="str"/>
+ <xsl:param name="PIDVALUE"/>
- <xsl:choose>
- <xsl:when test="contains($str,' ')">
+ <xsl:choose>
+ <xsl:when test="contains($str,' ')">
<!--'DO SOMETHING WITH THE VALUE IN
{substring-before($str,' ')}-->
- <xsl:variable name="testString" select="substring-before($str,' ')"/>
+ <xsl:variable name="testString" select="substring-before($str,' ')"/>
- <xsl:if test="starts-with($PIDVALUE,$testString)">
+ <xsl:if test="starts-with($PIDVALUE,$testString)">
- <xsl:call-template name="showResult">
+ <xsl:call-template name="showResult">
- <xsl:with-param name="PIDVALUE" select="$PIDVALUE"/>
+ <xsl:with-param name="PIDVALUE" select="$PIDVALUE"/>
- </xsl:call-template>
+ </xsl:call-template>
- </xsl:if>
+ </xsl:if>
<!--<xsl:value-of select="substring-before($str,' ')"/>-->
- <xsl:call-template name="splitBySpace">
- <xsl:with-param name="str"
+ <xsl:call-template name="splitBySpace">
+ <xsl:with-param name="str"
select="substring-after($str,' ')"/>
- <xsl:with-param name="PIDVALUE"
+ <xsl:with-param name="PIDVALUE"
select="$PIDVALUE"/>
- </xsl:call-template>
- </xsl:when>
- <xsl:otherwise>
- <xsl:if test="substring-before($str, ':') = substring-before($PIDVALUE, ':')">
-
- <xsl:call-template name="showResult">
- <xsl:with-param name="PIDVALUE" select="$PIDVALUE"/>
- </xsl:call-template>
-
- </xsl:if>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
- <xsl:template name="showResult">
- <xsl:param name="PIDVALUE"/>
- <xsl:variable name="DCTITLE">
- <xsl:value-of select="field[@name='dc.title']/node()"/>
- </xsl:variable>
-
- <xsl:variable name="CLEANTITLE">
- <xsl:value-of select="php:functionString('fedora_repository_urlencode_string', $DCTITLE)"/>
- </xsl:variable>
- <tr>
- <td valign="top">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/<xsl:copy-of select="$PIDVALUE"/>/-/<xsl:value-of select="$CLEANTITLE"/>
- </xsl:attribute>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:if test="substring-before($str, ':') = substring-before($PIDVALUE, ':')">
+
+ <xsl:call-template name="showResult">
+ <xsl:with-param name="PIDVALUE" select="$PIDVALUE"/>
+ </xsl:call-template>
+
+ </xsl:if>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+
+ <xsl:template name="showResult">
+ <xsl:param name="PIDVALUE"/>
+ <xsl:variable name="DCTITLE">
+ <xsl:value-of select="field[@name='dc.title']/node()"/>
+ </xsl:variable>
+
+ <xsl:variable name="CLEANTITLE">
+ <xsl:value-of select="php:functionString('fedora_repository_urlencode_string', $DCTITLE)"/>
+ </xsl:variable>
+ <tr>
+ <td valign="top">
+ <a>
+ <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/
+ <xsl:copy-of select="$PIDVALUE"/>/-/
+ <xsl:value-of select="$CLEANTITLE"/>
+ </xsl:attribute>
<!--<xsl:attribute name="href"><xsl:copy-of select="$OBJECTSPAGE"/><![CDATA[&pid=]]><xsl:value-of select="$PIDVALUE"/><![CDATA[&collection=object]]>
</xsl:attribute>-->
- <img>
- <xsl:attribute name="src">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/
- <xsl:copy-of select="$PIDVALUE"/>/TN
- </xsl:attribute>
- </img>
- </a>
+ <img>
+ <xsl:attribute name="src">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/
+ <xsl:copy-of select="$PIDVALUE"/>/TN
+ </xsl:attribute>
+ </img>
+ </a>
- </td >
+ </td >
- <td width="80%" valign="top">
- <table valign="top">
+ <td width="80%" valign="top">
+ <table valign="top">
- <tr valign="top">
- <td valign="top" class="search-results" colspan="2">
+ <tr valign="top">
+ <td valign="top" class="search-results" colspan="2">
- <xsl:value-of select="@no"/>
- <xsl:value-of select="'. '"/>
+ <xsl:value-of select="@no"/>
+ <xsl:value-of select="'. '"/>
- <a>
+ <a>
<!--<xsl:attribute name="href"><![CDATA[http://localhost/drupal-5.1/?q=node/7&pid=]]><xsl:value-of select="$PIDVALUE"/><![CDATA[&collection=object]]>-->
<!--<xsl:attribute name="href"><xsl:copy-of select="$OBJECTSPAGE"/><![CDATA[&pid=]]><xsl:value-of select="$PIDVALUE"/><![CDATA[&collection=object]]>-->
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/<xsl:value-of select="$PIDVALUE"/>/-/<xsl:value-of select="$CLEANTITLE"/>
-
- </xsl:attribute>
-
- <xsl:value-of select="$PIDVALUE"/>
- <br />
- </a>
- <span class="searchtitle">
- <span >
+ <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/
+ <xsl:value-of select="$PIDVALUE"/>/-/
+ <xsl:value-of select="$CLEANTITLE"/>
+
+ </xsl:attribute>
+
+ <xsl:value-of select="$PIDVALUE"/>
+ <br />
+ </a>
+ <span class="searchtitle">
+ <span >
Score:(
- <xsl:value-of select="@score"/>)
- </span>
- <br />
- <a>
+ <xsl:value-of select="@score"/>)
+ </span>
+ <br />
+ <a>
<!--<xsl:attribute name="href"><xsl:copy-of select="$OBJECTSPAGE"/><![CDATA[&pid=]]><xsl:value-of select="$PIDVALUE"/><![CDATA[&collection=object]]>-->
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/<xsl:value-of select="$PIDVALUE"/>/-/<xsl:value-of select="$CLEANTITLE"/>
+ <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/
+ <xsl:value-of select="$PIDVALUE"/>/-/
+ <xsl:value-of select="$CLEANTITLE"/>
- </xsl:attribute>
- <xsl:value-of select="field[@name='dc.title']/node()" disable-output-escaping="yes"/>
- </a>
- </span>
+ </xsl:attribute>
+ <xsl:value-of select="field[@name='dc.title']/node()" disable-output-escaping="yes"/>
+ </a>
+ </span>
- </td>
+ </td>
- </tr>
+ </tr>
- <xsl:for-each select="field[@snippet='yes']">
- <xsl:choose>
- <xsl:when test="(@name='fgs.DS.first.text')">
+ <xsl:for-each select="field[@snippet='yes']">
+ <xsl:choose>
+ <xsl:when test="(@name='fgs.DS.first.text')">
- <tr>
- <td valign="top">
- <span class="searchtitle">
+ <tr>
+ <td valign="top">
+ <span class="searchtitle">
Text Stream<!--<xsl:value-of select="@name"/>-->
- </span>
- </td>
- <td>
- <span class="text">
- <xsl:copy-of select="node()"/>
- </span>
- </td>
- </tr>
- </xsl:when>
- <xsl:when test="(@name='dc.title')">
-
- </xsl:when>
- <xsl:otherwise>
- <tr>
- <td valign="top">
- <span class="searchtitle">
- <xsl:value-of select="@name"/>
- </span>
- </td>
- <td>
- <span class="text">
- <xsl:copy-of select="node()"/>
- </span>
- </td>
- </tr>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
-
- </table>
+ </span>
+ </td>
+ <td>
+ <span class="text">
+ <xsl:copy-of select="node()"/>
+ </span>
+ </td>
+ </tr>
+ </xsl:when>
+ <xsl:when test="(@name='dc.title')">
+
+ </xsl:when>
+ <xsl:otherwise>
+ <tr>
+ <td valign="top">
+ <span class="searchtitle">
+ <xsl:value-of select="@name"/>
+ </span>
+ </td>
+ <td>
+ <span class="text">
+ <xsl:copy-of select="node()"/>
+ </span>
+ </td>
+ </tr>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
- </td>
- </tr>
- </xsl:template>
+ </table>
+
+ </td>
+ </tr>
+ </xsl:template>
</xsl:stylesheet>
diff --git a/xsl/romeo.xsl b/xsl/romeo.xsl
index 0f1f3d3d..8fa02d4e 100644
--- a/xsl/romeo.xsl
+++ b/xsl/romeo.xsl
@@ -1,82 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<!-- romeo XSLT -->
- <xsl:template match="/">
- <table cellpadding="3" cellspacing="3">
- <tr>
- <td>
- <b>Journal: </b>
- </td>
- <td>
- <xsl:value-of select="/romeoapi/journals/journal/jtitle"/>
- </td>
- </tr>
- <tr>
- <td>
- <b>Published By: </b>
- </td>
- <td>
- <xsl:value-of select="/romeoapi/journals/journal/zetocpub"/>
- <br />
- </td>
- </tr>
- <tr>
- <td>
- <b>Publisher Url:</b>
- </td>
- <td>
- <xsl:value-of select="/romeoapi/publishers/publisher/homeurl"/>
- </td>
- </tr>
- <tr>
- <td>
- <b>Prearchiving:</b>
- </td>
- <td>
- <xsl:value-of select="/romeoapi/publishers/publisher/preprints/prearchiving"/>
- </td>
- </tr>
- <tr>
- <td>
- <b>Postprints:</b>
- </td>
- <td>
- <xsl:value-of select="/romeoapi/publishers/publisher/postprints/postarchiving"/>
- </td>
- </tr>
- </table>
- <h2>Conditions</h2>
- <ul>
- <xsl:for-each select="romeoapi/publishers/publisher/conditions/condition">
- <li>
- <xsl:value-of select="."/>
- </li>
- </xsl:for-each>
- </ul>
+ <xsl:template match="/">
+ <table cellpadding="3" cellspacing="3"><tr><td>
+ <b>Journal: </b></td><td><xsl:value-of select="/romeoapi/journals/journal/jtitle"/></td></tr>
+ <tr><td><b>Published By: </b></td><td><xsl:value-of select="/romeoapi/journals/journal/zetocpub"/><br /></td></tr>
+ <tr><td><b>Publisher Url:</b></td><td><xsl:value-of select="/romeoapi/publishers/publisher/homeurl"/></td></tr>
+ <tr><td><b>Prearchiving:</b></td><td><xsl:value-of select="/romeoapi/publishers/publisher/preprints/prearchiving"/></td></tr>
+ <tr><td><b>Postprints:</b></td><td><xsl:value-of select="/romeoapi/publishers/publisher/postprints/postarchiving"/></td></tr>
+ </table>
+ <h2>Conditions</h2>
+ <ul>
+ <xsl:for-each select="romeoapi/publishers/publisher/conditions/condition">
+ <li><xsl:value-of select="."/></li>
+ </xsl:for-each>
+ </ul>
- <span>
- <b>Rights: </b>
- <xsl:value-of select="/romeoapi/publishers/publisher/copyright/text()" disable-output-escaping="yes"/>
- </span>
- <br />
- <xsl:variable name="COLOR">
- <xsl:value-of select="/romeoapi/publishers/publisher/romeocolour"/>
- </xsl:variable>
- <span STYLE="background-color: light{$COLOR}">
- <b>Romeo Colour: </b>
- <xsl:value-of select="/romeoapi/publishers/publisher/romeocolour"/>
- </span>
- <br />
- <div align="right">
- <a href="http://www.sherpa.ac.uk/romeo.php">
- <img src="http://www.sherpa.ac.uk/images/romeotiny.gif"/>
- </a>
- </div>
- <xsl:if test = "count(/romeoapi/publishers/publisher/homeurl) < 1">
- <div>If there are no results from
- <strong>ROMEO</strong> shown above you can try searching manually by clicking
- <a href="http://www.sherpa.ac.uk/romeo.php" target="_blank">here</a>.
- </div>
- </xsl:if>
- </xsl:template>
+ <span><b>Rights: </b><xsl:value-of select="/romeoapi/publishers/publisher/copyright/text()" disable-output-escaping="yes"/></span><br />
+ <xsl:variable name="COLOR">
+ <xsl:value-of select="/romeoapi/publishers/publisher/romeocolour"/>
+ </xsl:variable>
+ <span STYLE="background-color: light{$COLOR}"><b>Romeo Colour: </b><xsl:value-of select="/romeoapi/publishers/publisher/romeocolour"/></span><br />
+ <div align="right"><a href="http://www.sherpa.ac.uk/romeo.php"><img src="http://www.sherpa.ac.uk/images/romeotiny.gif"/></a></div>
+ <xsl:if test = "count(/romeoapi/publishers/publisher/homeurl) < 1">
+ <div>If there are no results from <strong>ROMEO</strong> shown above you can try searching manually by clicking <a href="http://www.sherpa.ac.uk/romeo.php" target="_blank">here</a>.</div>
+ </xsl:if>
+ </xsl:template>
</xsl:stylesheet>
\ No newline at end of file
diff --git a/xsl/sparql_to_html.xsl b/xsl/sparql_to_html.xsl
index 3743e1a7..0c037f3e 100644
--- a/xsl/sparql_to_html.xsl
+++ b/xsl/sparql_to_html.xsl
@@ -1,104 +1,76 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:s="http://www.w3.org/2001/sw/DataAccess/rf1/result" version="1.0" xmlns:php="http://php.net/xsl" exclude-result-prefixes="php">
<!-- Red and White XSLT -->
- <xsl:variable name="BASEURL">
- <xsl:value-of select="$baseUrl"/>
- </xsl:variable>
- <xsl:variable name="PATH">
- <xsl:value-of select="$path"/>
- </xsl:variable>
- <xsl:variable name="thisPid" select="$collectionPid"/>
- <xsl:variable name="thisTitle" select="$collectionTitle"/>
- <xsl:variable name="size" select="20"/>
- <xsl:variable name="page" select="$hitPage"/>
- <xsl:variable name="start" select="((number($page) - 1) * number($size)) + 1"/>
- <xsl:variable name="end" select="($start - 1) + number($size)"/>
- <xsl:variable name="cellsPerRow" select="4"/>
- <xsl:variable name="count" select="count(s:sparql/s:results/s:result)"/>
- <xsl:template match="/">
- <xsl:if test="$count>0">
- <table cellpadding="3" cellspacing="3" width="90%">
- <tr>
- <td colspan="{$cellsPerRow}">
+ <xsl:variable name="BASEURL">
+ <xsl:value-of select="$baseUrl"/>
+ </xsl:variable>
+ <xsl:variable name="PATH">
+ <xsl:value-of select="$path"/>
+ </xsl:variable>
+ <xsl:variable name="thisPid" select="$collectionPid"/>
+ <xsl:variable name="thisTitle" select="$collectionTitle"/>
+ <xsl:variable name="size" select="20"/>
+ <xsl:variable name="page" select="$hitPage"/>
+ <xsl:variable name="start" select="((number($page) - 1) * number($size)) + 1"/>
+ <xsl:variable name="end" select="($start - 1) + number($size)"/>
+ <xsl:variable name="cellsPerRow" select="4"/>
+ <xsl:variable name="count" select="count(s:sparql/s:results/s:result)"/>
+<xsl:template match="/">
+ <xsl:if test="$count>0">
+<table cellpadding="3" cellspacing="3" width="90%">
+ <tr><td colspan="{$cellsPerRow}">
<!-- <div STYLE="text-align: center;">-->
<!-- start previous next -->
- <div class="item-list">
- <ul class="pager">
- <xsl:choose>
- <xsl:when test="$end >= $count and $start = 1">
- <xsl:value-of select="$start"/>-
- <xsl:value-of select="$count"/>
- of
- <xsl:value-of select="$count"/> 
- <br />
- </xsl:when>
- <xsl:when test="$end >= $count">
+ <div class="item-list">
+ <ul class="pager">
+ <xsl:choose>
+ <xsl:when test="$end >= $count and $start = 1">
+ <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/>
+ of <xsl:value-of select="$count"/> <br />
+ </xsl:when>
+ <xsl:when test="$end >= $count">
- <xsl:value-of select="$start"/>-
- <xsl:value-of select="$count"/>
- of
- <xsl:value-of select="$count"/> 
- <br />
- <li class="pager-previous">
- <a>
- <xsl:attribute name="href">
- <xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
- </xsl:attribute>
+ <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/>
+ of <xsl:value-of select="$count"/> <br />
+ <li class="pager-previous">
+ <a>
+ <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
+ </xsl:attribute>
<Prev
- </a>
- </li>
- </xsl:when>
- <xsl:when test="$start = 1">
- <xsl:value-of select="$start"/>-
- <xsl:value-of select="$end"/>
- of
- <xsl:value-of select="$count"/> 
- <br />
- <li class="pager-next">
- <a>
- <xsl:attribute name="href">
- <xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
- </xsl:attribute>
+ </a></li>
+ </xsl:when>
+ <xsl:when test="$start = 1">
+ <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/>
+ of <xsl:value-of select="$count"/> <br />
+ <li class="pager-next">
+ <a>
+ <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
+ </xsl:attribute>
Next>
- </a>
- </li>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$start"/>-
- <xsl:value-of select="$end"/>
- of
- <xsl:value-of select="$count"/> 
- <br />
- <li class="pager-previous">
- <a>
- <xsl:attribute name="href">
- <xsl:value-of select="$BASEURL"/>/fedora/repository/
- <xsl:value-of select="$thisPid"/>/-/
- <xsl:value-of select="$thisTitle"/>/
- <xsl:value-of select="$page - 1"/>
- </xsl:attribute>
+ </a></li>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/>
+ of <xsl:value-of select="$count"/> <br />
+ <li class="pager-previous">
+ <a>
+ <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
+ </xsl:attribute>
<Prev
- </a> 
- </li>
- <li class="pager-next">
- <a>
- <xsl:attribute name="href">
- <xsl:value-of select="$BASEURL"/>/fedora/repository/
- <xsl:value-of select="$thisPid"/>/-/
- <xsl:value-of select="$thisTitle"/>/
- <xsl:value-of select="$page + 1"/>
- </xsl:attribute>
+ </a> </li>
+ <li class="pager-next">
+ <a>
+ <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
+ </xsl:attribute>
Next>
- </a>
- </li>
- </xsl:otherwise>
- </xsl:choose>
- </ul>
- </div>
+ </a></li>
+ </xsl:otherwise>
+ </xsl:choose>
+ </ul>
+ </div>
<!-- end previous next-->
- <br clear="all" />
- </td>
- </tr>
+ <br clear="all" />
+ </td></tr>
<!--<xsl:for-each select="/sparql/results/result[position()>=$start and position() <=$end]">
<xsl:variable name='OBJECTURI' select="object/@uri"/>
@@ -118,148 +90,109 @@
</tr>
</xsl:for-each>-
-->
- <xsl:apply-templates select="s:sparql/s:results"/>
- </table>
- <br clear="all" />
+ <xsl:apply-templates select="s:sparql/s:results"/>
+</table><br clear="all" />
<!-- start previous next -->
- <div class="item-list">
- <ul class="pager">
- <xsl:choose>
- <xsl:when test="$end >= $count and $start = 1">
- <xsl:value-of select="$start"/>-
- <xsl:value-of select="$count"/>
- of
- <xsl:value-of select="$count"/> 
- <br />
- </xsl:when>
- <xsl:when test="$end >= $count">
+ <div class="item-list">
+ <ul class="pager">
+ <xsl:choose>
+ <xsl:when test="$end >= $count and $start = 1">
+ <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/>
+ of <xsl:value-of select="$count"/> <br />
+ </xsl:when>
+ <xsl:when test="$end >= $count">
- <xsl:value-of select="$start"/>-
- <xsl:value-of select="$count"/>
- of
- <xsl:value-of select="$count"/> 
- <br />
- <li class="pager-previous">
- <a>
- <xsl:attribute name="href">
- <xsl:value-of select="$BASEURL"/>/fedora/repository/
- <xsl:value-of select="$thisPid"/>/-/
- <xsl:value-of select="$thisTitle"/>/
- <xsl:value-of select="$page - 1"/>
- </xsl:attribute>
+ <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/>
+ of <xsl:value-of select="$count"/> <br />
+ <li class="pager-previous">
+ <a>
+ <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
+ </xsl:attribute>
<Prev
- </a>
- </li>
- </xsl:when>
- <xsl:when test="$start = 1">
- <xsl:value-of select="$start"/>-
- <xsl:value-of select="$end"/>
- of
- <xsl:value-of select="$count"/> 
- <br />
- <li class="pager-next">
- <a>
- <xsl:attribute name="href">
- <xsl:value-of select="$BASEURL"/>/fedora/repository/
- <xsl:value-of select="$thisPid"/>/-/
- <xsl:value-of select="$thisTitle"/>/
- <xsl:value-of select="$page + 1"/>
- </xsl:attribute>
+ </a></li>
+ </xsl:when>
+ <xsl:when test="$start = 1">
+ <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/>
+ of <xsl:value-of select="$count"/> <br />
+ <li class="pager-next">
+ <a>
+ <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
+ </xsl:attribute>
Next>
- </a>
- </li>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$start"/>-
- <xsl:value-of select="$end"/>
- of
- <xsl:value-of select="$count"/> 
- <br />
- <li class="pager-previous">
- <a>
- <xsl:attribute name="href">
- <xsl:value-of select="$BASEURL"/>/fedora/repository/
- <xsl:value-of select="$thisPid"/>/-/
- <xsl:value-of select="$thisTitle"/>/
- <xsl:value-of select="$page - 1"/>
- </xsl:attribute>
+ </a></li>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/>
+ of <xsl:value-of select="$count"/> <br />
+ <li class="pager-previous">
+ <a>
+ <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
+ </xsl:attribute>
<Prev
- </a> 
- </li>
- <li class="pager-next">
- <a>
- <xsl:attribute name="href">
- <xsl:value-of select="$BASEURL"/>/fedora/repository/
- <xsl:value-of select="$thisPid"/>/-/
- <xsl:value-of select="$thisTitle"/>/
- <xsl:value-of select="$page + 1"/>
- </xsl:attribute>
+ </a> </li>
+ <li class="pager-next">
+ <a>
+ <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
+ </xsl:attribute>
Next>
- </a>
- </li>
- </xsl:otherwise>
- </xsl:choose>
- </ul>
- </div>
+ </a></li>
+ </xsl:otherwise>
+ </xsl:choose>
+ </ul>
+ </div>
<!-- end previous next-->
- </xsl:if>
- </xsl:template>
- <xsl:template match="s:sparql/s:results">
- <xsl:for-each select="s:result[position() mod $cellsPerRow = 1 and position()>=$start and position() <=$end]">
- <tr>
- <xsl:apply-templates select=". | following-sibling::s:result[position() < $cellsPerRow]"/>
- </tr>
- </xsl:for-each>
- </xsl:template>
- <xsl:template match="s:result">
- <xsl:variable name='OBJECTURI' select="s:object/@uri"/>
- <xsl:variable name='CONTENTURI' select="s:content/@uri"/>
- <xsl:variable name='CONTENTMODEL' select="substring-after($CONTENTURI,'/')"/>
- <xsl:variable name='PID' select="substring-after($OBJECTURI,'/')"/>
- <xsl:variable name="newTitle" >
- <xsl:call-template name="replace-string">
- <xsl:with-param name="text" select="s:title"/>
- <xsl:with-param name="from" select="'_'"/>
- <xsl:with-param name="to" select="' '"/>
- </xsl:call-template>
- </xsl:variable>
- <xsl:variable name="cleanTitle">
- <xsl:value-of select="php:functionString('fedora_repository_urlencode_string', $newTitle)"/>
- </xsl:variable>
- <xsl:variable name="linkUrl">
- <xsl:choose>
- <xsl:when test="($CONTENTMODEL='islandora:collectionCModel')">
- <xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:copy-of select="$PID"/>/-/<xsl:value-of select="$cleanTitle"/>
- </xsl:when>
- <xsl:otherwise>
+ </xsl:if>
+</xsl:template>
+ <xsl:template match="s:sparql/s:results">
+ <xsl:for-each select="s:result[position() mod $cellsPerRow = 1 and position()>=$start and position() <=$end]">
+ <tr>
+ <xsl:apply-templates select=". | following-sibling::s:result[position() < $cellsPerRow]"/>
+ </tr>
+ </xsl:for-each>
+ </xsl:template>
+ <xsl:template match="s:result">
+ <xsl:variable name='OBJECTURI' select="s:object/@uri"/>
+ <xsl:variable name='CONTENTURI' select="s:content/@uri"/>
+ <xsl:variable name='CONTENTMODEL' select="substring-after($CONTENTURI,'/')"/>
+ <xsl:variable name='PID' select="substring-after($OBJECTURI,'/')"/>
+ <xsl:variable name="newTitle" >
+ <xsl:call-template name="replace-string">
+ <xsl:with-param name="text" select="s:title"/>
+ <xsl:with-param name="from" select="'_'"/>
+ <xsl:with-param name="to" select="' '"/>
+ </xsl:call-template>
+ </xsl:variable>
+ <xsl:variable name="cleanTitle">
+ <xsl:value-of select="php:functionString('fedora_repository_urlencode_string', $newTitle)"/>
+ </xsl:variable>
+ <xsl:variable name="linkUrl">
+ <xsl:choose>
+ <xsl:when test="($CONTENTMODEL='islandora:collectionCModel')">
+ <xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:copy-of select="$PID"/>/-/<xsl:value-of select="$cleanTitle"/>
+ </xsl:when>
+ <xsl:otherwise>
<!--the below is an example of going straight to a datastream instead of the details page.
<xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:copy-of select="$PID"/>/OBJ/<xsl:value-of select="s:title"/>-->
- <xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:copy-of select="$PID"/>/-/<xsl:value-of select="$cleanTitle"/>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:value-of select="s:content"/>
- </xsl:variable>
- <td valign="top" width="25%">
- <a>
- <xsl:attribute name="href">
- <xsl:value-of select="$linkUrl"/>
- </xsl:attribute>
- <img>
- <xsl:attribute name="src">
- <xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$PID"/>/TN
- </xsl:attribute>
- <xsl:attribute name="alt">
- <xsl:value-of select="$newTitle" disable-output-escaping="yes"/>
- </xsl:attribute>
- </img>
- </a>
- <br clear="all" />
- <a>
- <xsl:attribute name="href">
- <xsl:value-of select="$linkUrl"/>
- </xsl:attribute>
- <xsl:value-of select="$newTitle" disable-output-escaping="yes" />
- </a>
+ <xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:copy-of select="$PID"/>/-/<xsl:value-of select="$cleanTitle"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:value-of select="s:content"/>
+ </xsl:variable>
+ <td valign="top" width="25%">
+ <a>
+ <xsl:attribute name="href"><xsl:value-of select="$linkUrl"/>
+ </xsl:attribute>
+ <img>
+ <xsl:attribute name="src"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$PID"/>/TN
+ </xsl:attribute>
+ <xsl:attribute name="alt"><xsl:value-of select="$newTitle" disable-output-escaping="yes"/>
+ </xsl:attribute>
+ </img> </a> <br clear="all" />
+ <a>
+ <xsl:attribute name="href"><xsl:value-of select="$linkUrl"/>
+ </xsl:attribute>
+ <xsl:value-of select="$newTitle" disable-output-escaping="yes" />
+ </a>
<!-- example of a url that would drill down to the details page if the url above went directly to a datastream
<xsl:if test="($CONTENTMODEL!='islandora:collectionCModel')">
<br />[[ <a>
@@ -270,45 +203,45 @@
</a> ]]
</xsl:if>-->
- </td>
- <xsl:if test="(position() = last()) and (position() < $cellsPerRow)">
- <xsl:call-template name="FillerCells">
- <xsl:with-param name="cellCount" select="$cellsPerRow - position()"/>
- </xsl:call-template>
- </xsl:if>
- </xsl:template>
- <xsl:template name="FillerCells">
- <xsl:param name="cellCount"/>
- <td> </td>
- <xsl:if test="$cellCount > 1">
- <xsl:call-template name="FillerCells">
- <xsl:with-param name="cellCount" select="$cellCount - 1"/>
- </xsl:call-template>
- </xsl:if>
- </xsl:template>
- <xsl:template name="replace-string">
- <xsl:param name="text"/>
- <xsl:param name="from"/>
- <xsl:param name="to"/>
+ </td>
+ <xsl:if test="(position() = last()) and (position() < $cellsPerRow)">
+ <xsl:call-template name="FillerCells">
+ <xsl:with-param name="cellCount" select="$cellsPerRow - position()"/>
+ </xsl:call-template>
+ </xsl:if>
+ </xsl:template>
+ <xsl:template name="FillerCells">
+ <xsl:param name="cellCount"/>
+ <td> </td>
+ <xsl:if test="$cellCount > 1">
+ <xsl:call-template name="FillerCells">
+ <xsl:with-param name="cellCount" select="$cellCount - 1"/>
+ </xsl:call-template>
+ </xsl:if>
+ </xsl:template>
+ <xsl:template name="replace-string">
+ <xsl:param name="text"/>
+ <xsl:param name="from"/>
+ <xsl:param name="to"/>
- <xsl:choose>
- <xsl:when test="contains($text, $from)">
+ <xsl:choose>
+ <xsl:when test="contains($text, $from)">
- <xsl:variable name="before" select="substring-before($text, $from)"/>
- <xsl:variable name="after" select="substring-after($text, $from)"/>
- <xsl:variable name="prefix" select="concat($before, $to)"/>
+ <xsl:variable name="before" select="substring-before($text, $from)"/>
+ <xsl:variable name="after" select="substring-after($text, $from)"/>
+ <xsl:variable name="prefix" select="concat($before, $to)"/>
- <xsl:value-of select="$before"/>
- <xsl:value-of select="$to"/>
- <xsl:call-template name="replace-string">
- <xsl:with-param name="text" select="$after"/>
- <xsl:with-param name="from" select="$from"/>
- <xsl:with-param name="to" select="$to"/>
- </xsl:call-template>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$text"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
+ <xsl:value-of select="$before"/>
+ <xsl:value-of select="$to"/>
+ <xsl:call-template name="replace-string">
+ <xsl:with-param name="text" select="$after"/>
+ <xsl:with-param name="from" select="$from"/>
+ <xsl:with-param name="to" select="$to"/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$text"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
</xsl:stylesheet>
\ No newline at end of file
diff --git a/xsl/specdwc.xsl b/xsl/specdwc.xsl
index 725800b4..84de97d9 100644
--- a/xsl/specdwc.xsl
+++ b/xsl/specdwc.xsl
@@ -4,157 +4,40 @@
xmlns:dc="http://purl.org/dc/terms/"
xmlns:dwr="http://rs.tdwg.org/dwc/xsd/simpledarwincore/"
xmlns:dwc="http://rs.tdwg.org/dwc/terms/">
- <xs:import namespace="http://rs.tdwg.org/dwc/terms/" schemaLocation="tdwg_dwcterms.xsd"/>
+ <xs:import namespace="http://rs.tdwg.org/dwc/terms/" schemaLocation="tdwg_dwcterms.xsd"/>
<xs:import namespace="http://purl.org/dc/terms/" schemaLocation="dublin_core.xsd"/>
- <xsl:output method="xml" omit-xml-declaration="yes"/>
+ <xsl:output method="xml" omit-xml-declaration="yes"/>
<!-- SPECIMEN XSLT -->
- <xsl:template match="/">
+ <xsl:template match="/">
- <table>
- <tr cellpadding="10">
- <th>
- <b>Specimen</b>
- </th>
- </tr>
- <tr class="odd">
- <td width="200">Scientific Name</td>
- <td>
- <xsl:value-of select="//dwc:scientificName"/>
- </td>
- </tr>
- <tr class="even">
- <td width="200">Family</td>
- <td>
- <xsl:value-of select="//dwc:family"/>
- </td>
- </tr>
- <tr class="odd">
- <td width="200">Genus</td>
- <td>
- <xsl:value-of select="//dwc:genus"/>
- </td>
- </tr>
- <tr class="even">
- <td width="200">Common Name</td>
- <td>
- <xsl:value-of select="//dwc:vernacularName"/>
- </td>
- </tr>
+<table>
+ <tr cellpadding="10"><th><b>Specimen</b></th></tr>
+ <tr class="odd"><td width="200">Scientific Name</td><td><xsl:value-of select="//dwc:scientificName"/></td></tr>
+ <tr class="even"><td width="200">Family</td><td><xsl:value-of select="//dwc:family"/></td></tr>
+ <tr class="odd"><td width="200">Genus</td><td><xsl:value-of select="//dwc:genus"/></td></tr>
+ <tr class="even"><td width="200">Common Name</td><td><xsl:value-of select="//dwc:vernacularName"/></td></tr>
- <tr cellpadding="10">
- <th>
- <b>Location</b>
- </th>
- </tr>
- <tr class="odd">
- <td width="200">Continent</td>
- <td>
- <xsl:value-of select="//dwc:continent"/>
- </td>
- </tr>
- <tr class="even">
- <td width="200">Country</td>
- <td>
- <xsl:value-of select="//dwc:country"/>
- </td>
- </tr>
- <tr class="odd">
- <td width="200">Country Code</td>
- <td>
- <xsl:value-of select="//dwc:countryCode"/>
- </td>
- </tr>
- <tr class="even">
- <td width="200">State/Province</td>
- <td>
- <xsl:value-of select="//dwc:stateProvince"/>
- </td>
- </tr>
- <tr class="odd">
- <td width="200">County</td>
- <td>
- <xsl:value-of select="//dwc:county"/>
- </td>
- </tr>
- <tr class="even">
- <td width="200">Locality</td>
- <td>
- <xsl:value-of select="//dwc:locality"/>
- </td>
- </tr>
- <tr class="odd">
- <td width="200">Habitat</td>
- <td>
- <xsl:value-of select="//dwc:habitat"/>
- </td>
- </tr>
+ <tr cellpadding="10"><th><b>Location</b></th></tr>
+ <tr class="odd"><td width="200">Continent</td><td><xsl:value-of select="//dwc:continent"/></td></tr>
+ <tr class="even"><td width="200">Country</td><td><xsl:value-of select="//dwc:country"/></td></tr>
+ <tr class="odd"><td width="200">Country Code</td><td><xsl:value-of select="//dwc:countryCode"/></td></tr>
+ <tr class="even"><td width="200">State/Province</td><td><xsl:value-of select="//dwc:stateProvince"/></td></tr>
+ <tr class="odd"><td width="200">County</td><td><xsl:value-of select="//dwc:county"/></td></tr>
+ <tr class="even"><td width="200">Locality</td><td><xsl:value-of select="//dwc:locality"/></td></tr>
+ <tr class="odd"><td width="200">Habitat</td><td><xsl:value-of select="//dwc:habitat"/></td></tr>
- <tr cellpadding="10">
- <th>
- <b>Record</b>
- </th>
- </tr>
- <tr class="odd">
- <td width="200">Record Type</td>
- <td>
- <xsl:value-of select="//dc:type"/>
- </td>
- </tr>
- <tr class="even">
- <td width="200">Language- </td>
- <td>
- <xsl:value-of select="//dc:language"/>
- </td>
- </tr>
- <tr class="odd">
- <td width="100">Record Basis</td>
- <td>
- <xsl:value-of select="//dwc:basisOfRecord"/>
- </td>
- </tr>
- <tr class="even">
- <td width="200">Occurence Remarks</td>
- <td>
- <xsl:value-of select="//dwc:occurenceRemarks"/>
- </td>
- </tr>
- <tr class="odd">
- <td width="200">Occurence ID</td>
- <td>
- <xsl:value-of select="//dwc:occurenceID"/>
- </td>
- </tr>
- <tr class="even">
- <td width="200">Institution Code</td>
- <td>
- <xsl:value-of select="//dwc:institutionCode"/>
- </td>
- </tr>
- <tr class="odd">
- <td width="200">Collection Code</td>
- <td>
- <xsl:value-of select="//dwc:collectionCode"/>
- </td>
- </tr>
- <tr class="even">
- <td width="200">Catalog Number</td>
- <td>
- <xsl:value-of select="//dwc:catalogNumber"/>
- </td>
- </tr>
- <tr class="odd">
- <td width="200">Recorded By</td>
- <td>
- <xsl:value-of select="//dwc:recordedBy"/>
- </td>
- </tr>
- <tr class="even">
- <td width="200">Event Date200</td>
- <td>
- <xsl:value-of select="//dwc:eventDate"/>
- </td>
- </tr>
- </table>
- </xsl:template>
+ <tr cellpadding="10"><th><b>Record</b></th></tr>
+ <tr class="odd"><td width="200">Record Type</td><td><xsl:value-of select="//dc:type"/></td></tr>
+ <tr class="even"><td width="200">Language- </td><td><xsl:value-of select="//dc:language"/></td></tr>
+ <tr class="odd"><td width="100">Record Basis</td><td><xsl:value-of select="//dwc:basisOfRecord"/></td></tr>
+ <tr class="even"><td width="200">Occurence Remarks</td><td><xsl:value-of select="//dwc:occurenceRemarks"/></td></tr>
+ <tr class="odd"><td width="200">Occurence ID</td><td><xsl:value-of select="//dwc:occurenceID"/></td></tr>
+ <tr class="even"><td width="200">Institution Code</td><td><xsl:value-of select="//dwc:institutionCode"/></td></tr>
+ <tr class="odd"><td width="200">Collection Code</td><td><xsl:value-of select="//dwc:collectionCode"/></td></tr>
+ <tr class="even"><td width="200">Catalog Number</td><td><xsl:value-of select="//dwc:catalogNumber"/></td></tr>
+ <tr class="odd"><td width="200">Recorded By</td><td><xsl:value-of select="//dwc:recordedBy"/></td></tr>
+ <tr class="even"><td width="200">Event Date200</td><td><xsl:value-of select="//dwc:eventDate"/></td></tr>
+</table>
+ </xsl:template>
</xsl:stylesheet>
diff --git a/xsl/unfilteredresults.xsl b/xsl/unfilteredresults.xsl
index e2f31114..110f5ea5 100644
--- a/xsl/unfilteredresults.xsl
+++ b/xsl/unfilteredresults.xsl
@@ -1,70 +1,70 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns:php="http://php.net/xsl" exclude-result-prefixes="php">
- <xsl:variable name="OBJECTSPAGE">
- <xsl:value-of select="$objectsPage"/>
- </xsl:variable>
+ <xsl:variable name="OBJECTSPAGE">
+ <xsl:value-of select="$objectsPage"/>
+ </xsl:variable>
- <xsl:template match="gfindObjects">
- <xsl:variable name="INDEXNAME" select="@indexName"/>
-
- <xsl:variable name="PREQUERY" select="substring-before(@query,':')"/>
- <xsl:variable name="QUERY" select="substring-after(@query,':')"/>
- <xsl:variable name="HITPAGESTART" select="@hitPageStart"/>
- <xsl:variable name="HITPAGESIZE" select="@hitPageSize"/>
- <xsl:variable name="HITTOTAL" select="@hitTotal"/>
-
- <xsl:variable name="SEARCHURL">
- <xsl:value-of select="$searchUrl"/>
- </xsl:variable>
- <xsl:variable name="TOKEN">
- <xsl:value-of select="$searchToken"/>
- </xsl:variable>
- <xsl:variable name="HITPAGEEND">
- <xsl:choose>
- <xsl:when test="$HITPAGESTART + $HITPAGESIZE - 1 > $HITTOTAL">
- <xsl:value-of select="$HITTOTAL"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$HITPAGESTART + $HITPAGESIZE - 1"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
+ <xsl:template match="gfindObjects">
+ <xsl:variable name="INDEXNAME" select="@indexName"/>
- <xsl:variable name="HITPAGENO" select="ceiling($HITPAGESTART div $HITPAGESIZE)"/>
- <xsl:variable name="HITPAGENOLAST" select="ceiling($HITTOTAL div $HITPAGESIZE)"/>
- <xsl:variable name="HITPAGESTARTT" select="(($HITPAGENO - 1) * $HITPAGESIZE + 1)"/>
- <xsl:choose>
- <xsl:when test="$HITTOTAL > 0">
+ <xsl:variable name="PREQUERY" select="substring-before(@query,':')"/>
+ <xsl:variable name="QUERY" select="substring-after(@query,':')"/>
+ <xsl:variable name="HITPAGESTART" select="@hitPageStart"/>
+ <xsl:variable name="HITPAGESIZE" select="@hitPageSize"/>
+ <xsl:variable name="HITTOTAL" select="@hitTotal"/>
+
+ <xsl:variable name="SEARCHURL">
+ <xsl:value-of select="$searchUrl"/>
+ </xsl:variable>
+ <xsl:variable name="TOKEN">
+ <xsl:value-of select="$searchToken"/>
+ </xsl:variable>
+ <xsl:variable name="HITPAGEEND">
+ <xsl:choose>
+ <xsl:when test="$HITPAGESTART + $HITPAGESIZE - 1 > $HITTOTAL">
+ <xsl:value-of select="$HITTOTAL"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$HITPAGESTART + $HITPAGESIZE - 1"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:variable name="HITPAGENO" select="ceiling($HITPAGESTART div $HITPAGESIZE)"/>
+ <xsl:variable name="HITPAGENOLAST" select="ceiling($HITTOTAL div $HITPAGESIZE)"/>
+ <xsl:variable name="HITPAGESTARTT" select="(($HITPAGENO - 1) * $HITPAGESIZE + 1)"/>
+ <xsl:choose>
+ <xsl:when test="$HITTOTAL > 0">
Total Hits =
- <strong>
- <xsl:value-of select="@hitTotal"/>,
- </strong>
+ <strong>
+ <xsl:value-of select="@hitTotal"/>,
+ </strong>
Number of Hits/page =
- <xsl:value-of select="@hitPageSize"/>
+ <xsl:value-of select="@hitPageSize"/>
<!-- Current page = <xsl:value-of select="@hitPageStart"/>-->
- <br/>
+ <br/>
<!--<form action="/drupal-5.1/?q=search/fedora_collections" method="post" id="search-form" class="search-form">-->
- <form action="{$SEARCHURL}" method="post" id="search-form" class="search-form">
+ <form action="{$SEARCHURL}" method="post" id="search-form" class="search-form">
- <input type="hidden" maxlength="255" name="keys" id="edit-keys" size="40" value="{$HITPAGESTARTT+$HITPAGESIZE}:{$QUERY}" class="form-text" />
+ <input type="hidden" maxlength="255" name="keys" id="edit-keys" size="40" value="{$HITPAGESTARTT+$HITPAGESIZE}:{$QUERY}" class="form-text" />
<!--<xsl:if test="$PREQUERY = fgs.DS.first.text" >-->
- <input type="hidden" name="type" id="edit-type" value="{$PREQUERY}" />
+ <input type="hidden" name="type" id="edit-type" value="{$PREQUERY}" />
<!--</xsl:if>-->
- <xsl:if test="$HITPAGENO > 1">
- <input type="button" name="back" onClick="javascript:history.go(-1)" id="back-button" value="Previous" class="form-submit" />
- </xsl:if>
- <xsl:if test="$HITPAGENO < $HITPAGENOLAST">
- <input type="submit" name="op" id="edit-submit" value="Next" class="form-submit" />
- </xsl:if>
+ <xsl:if test="$HITPAGENO > 1">
+ <input type="button" name="back" onClick="javascript:history.go(-1)" id="back-button" value="Previous" class="form-submit" />
+ </xsl:if>
+ <xsl:if test="$HITPAGENO < $HITPAGENOLAST">
+ <input type="submit" name="op" id="edit-submit" value="Next" class="form-submit" />
+ </xsl:if>
- <input type="hidden" name="form_token" id="edit-search-form-form-token" value="{$TOKEN}" />
- <input type="hidden" name="form_id" id="edit-search-form" value="search_form" />
+ <input type="hidden" name="form_token" id="edit-search-form-form-token" value="{$TOKEN}" />
+ <input type="hidden" name="form_id" id="edit-search-form" value="search_form" />
- </form>
- <style type="text/css">
+ </form>
+ <style type="text/css">
span.highlight
{
@@ -75,195 +75,195 @@
{
font-weight: bold
}
- </style>
- <xsl:apply-templates select="objects"/>
- </xsl:when>
- <xsl:otherwise>
- <div class="box">
-
- <h2>Your search yielded no results</h2>
-
- <div class="content">
- <ul>
- <li>Check if your spelling is correct.</li>
-
- <li>Remove quotes around phrases to match each word individually:
- <em>"blue smurf"</em> will match less than
- <em>blue smurf</em>.
- </li>
- <li>Consider loosening your query with
- <em>OR</em>:
- <em>blue smurf</em> will match less than
- <em>blue OR smurf</em>.
- </li>
- </ul>
- </div>
-
- </div>
-
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
- <xsl:template match="objects">
-
-
-
-
- <table>
- <div class="search-results">
- <xsl:for-each select="object">
- <xsl:variable name="PIDVALUE">
- <xsl:choose>
- <xsl:when test="@PID">
- <xsl:value-of select="@PID"/>
- </xsl:when>
- <xsl:when test="field[@name='PID' and @snippet='yes']">
- <xsl:value-of select="field[@name='PID']/span/text()"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="field[@name='PID']/text()"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
-
-
- <xsl:call-template name="showResult">
- <xsl:with-param name="PIDVALUE" select="$PIDVALUE"/>
- </xsl:call-template>
-
- </xsl:for-each>
- </div>
- </table>
+ </style>
+ <xsl:apply-templates select="objects"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <div class="box">
- </xsl:template>
+ <h2>Your search yielded no results</h2>
+ <div class="content">
+ <ul>
+ <li>Check if your spelling is correct.</li>
- <xsl:template name="showResult">
- <xsl:param name="PIDVALUE"/>
- <xsl:variable name="DCTITLE">
- <xsl:value-of select="field[@name='dc.title']/node()"/>
- </xsl:variable>
+ <li>Remove quotes around phrases to match each word individually:
+ <em>"blue smurf"</em> will match less than
+ <em>blue smurf</em>.
+ </li>
+ <li>Consider loosening your query with
+ <em>OR</em>:
+ <em>blue smurf</em> will match less than
+ <em>blue OR smurf</em>.
+ </li>
+ </ul>
+ </div>
- <xsl:variable name="CLEANTITLE">
- <xsl:value-of select="php:functionString('fedora_repository_urlencode_string', $DCTITLE)"/>
- </xsl:variable>
- <tr>
- <td valign="top">
- <a>
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/
- <xsl:copy-of select="$PIDVALUE"/>/-/
- <xsl:value-of select="$CLEANTITLE"/>
- </xsl:attribute>
+ </div>
+
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+
+ <xsl:template match="objects">
+
+
+
+
+ <table>
+ <div class="search-results">
+ <xsl:for-each select="object">
+ <xsl:variable name="PIDVALUE">
+ <xsl:choose>
+ <xsl:when test="@PID">
+ <xsl:value-of select="@PID"/>
+ </xsl:when>
+ <xsl:when test="field[@name='PID' and @snippet='yes']">
+ <xsl:value-of select="field[@name='PID']/span/text()"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="field[@name='PID']/text()"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+
+ <xsl:call-template name="showResult">
+ <xsl:with-param name="PIDVALUE" select="$PIDVALUE"/>
+ </xsl:call-template>
+
+ </xsl:for-each>
+ </div>
+ </table>
+
+ </xsl:template>
+
+
+ <xsl:template name="showResult">
+ <xsl:param name="PIDVALUE"/>
+ <xsl:variable name="DCTITLE">
+ <xsl:value-of select="field[@name='dc.title']/node()"/>
+ </xsl:variable>
+
+ <xsl:variable name="CLEANTITLE">
+ <xsl:value-of select="php:functionString('fedora_repository_urlencode_string', $DCTITLE)"/>
+ </xsl:variable>
+ <tr>
+ <td valign="top">
+ <a>
+ <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/
+ <xsl:copy-of select="$PIDVALUE"/>/-/
+ <xsl:value-of select="$CLEANTITLE"/>
+ </xsl:attribute>
<!--<xsl:attribute name="href"><xsl:copy-of select="$OBJECTSPAGE"/><![CDATA[&pid=]]><xsl:value-of select="$PIDVALUE"/><![CDATA[&collection=object]]>
</xsl:attribute>-->
- <img>
- <xsl:attribute name="src">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/
- <xsl:copy-of select="$PIDVALUE"/>/TN
- </xsl:attribute>
- </img>
- </a>
+ <img>
+ <xsl:attribute name="src">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/
+ <xsl:copy-of select="$PIDVALUE"/>/TN
+ </xsl:attribute>
+ </img>
+ </a>
- </td >
+ </td >
- <td width="80%" valign="top">
- <table valign="top">
+ <td width="80%" valign="top">
+ <table valign="top">
- <tr valign="top">
- <td valign="top" class="search-results" colspan="2">
+ <tr valign="top">
+ <td valign="top" class="search-results" colspan="2">
- <xsl:value-of select="@no"/>
- <xsl:value-of select="'. '"/>
+ <xsl:value-of select="@no"/>
+ <xsl:value-of select="'. '"/>
- <a>
+ <a>
<!--<xsl:attribute name="href"><![CDATA[http://localhost/drupal-5.1/?q=node/7&pid=]]><xsl:value-of select="$PIDVALUE"/><![CDATA[&collection=object]]>-->
<!--<xsl:attribute name="href"><xsl:copy-of select="$OBJECTSPAGE"/><![CDATA[&pid=]]><xsl:value-of select="$PIDVALUE"/><![CDATA[&collection=object]]>-->
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/
- <xsl:value-of select="$PIDVALUE"/>/-/
- <xsl:value-of select="$CLEANTITLE"/>
-
- </xsl:attribute>
-
- <xsl:value-of select="$PIDVALUE"/>
- <br />
- </a>
- <span class="searchtitle">
- <span >
+ <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/
+ <xsl:value-of select="$PIDVALUE"/>/-/
+ <xsl:value-of select="$CLEANTITLE"/>
+
+ </xsl:attribute>
+
+ <xsl:value-of select="$PIDVALUE"/>
+ <br />
+ </a>
+ <span class="searchtitle">
+ <span >
Score:(
- <xsl:value-of select="@score"/>)
- </span>
- <br />
- <a>
+ <xsl:value-of select="@score"/>)
+ </span>
+ <br />
+ <a>
<!--<xsl:attribute name="href"><xsl:copy-of select="$OBJECTSPAGE"/><![CDATA[&pid=]]><xsl:value-of select="$PIDVALUE"/><![CDATA[&collection=object]]>-->
- <xsl:attribute name="href">
- <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/
- <xsl:value-of select="$PIDVALUE"/>/-/
- <xsl:value-of select="$CLEANTITLE"/>
+ <xsl:attribute name="href">
+ <xsl:copy-of select="$OBJECTSPAGE"/>fedora/repository/
+ <xsl:value-of select="$PIDVALUE"/>/-/
+ <xsl:value-of select="$CLEANTITLE"/>
- </xsl:attribute>
- <xsl:value-of select="field[@name='dc.title']/node()" disable-output-escaping="yes"/>
- </a>
- </span>
+ </xsl:attribute>
+ <xsl:value-of select="field[@name='dc.title']/node()" disable-output-escaping="yes"/>
+ </a>
+ </span>
- </td>
+ </td>
- </tr>
+ </tr>
- <xsl:for-each select="field[@snippet='yes']">
- <xsl:choose>
- <xsl:when test="(@name='fgs.DS.first.text')">
+ <xsl:for-each select="field[@snippet='yes']">
+ <xsl:choose>
+ <xsl:when test="(@name='fgs.DS.first.text')">
- <tr>
- <td valign="top">
- <span class="searchtitle">
+ <tr>
+ <td valign="top">
+ <span class="searchtitle">
Text Stream<!--<xsl:value-of select="@name"/>-->
- </span>
- </td>
- <td>
- <span class="text">
- <xsl:copy-of select="node()"/>
- </span>
- </td>
- </tr>
- </xsl:when>
- <xsl:when test="(@name='dc.title')">
-
- </xsl:when>
- <xsl:otherwise>
- <tr>
- <td valign="top">
- <span class="searchtitle">
- <xsl:value-of select="@name"/>
- </span>
- </td>
- <td>
- <span class="text">
- <xsl:copy-of select="node()"/>
- </span>
- </td>
- </tr>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
-
- </table>
+ </span>
+ </td>
+ <td>
+ <span class="text">
+ <xsl:copy-of select="node()"/>
+ </span>
+ </td>
+ </tr>
+ </xsl:when>
+ <xsl:when test="(@name='dc.title')">
+
+ </xsl:when>
+ <xsl:otherwise>
+ <tr>
+ <td valign="top">
+ <span class="searchtitle">
+ <xsl:value-of select="@name"/>
+ </span>
+ </td>
+ <td>
+ <span class="text">
+ <xsl:copy-of select="node()"/>
+ </span>
+ </td>
+ </tr>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
- </td>
- </tr>
- </xsl:template>
+ </table>
+
+ </td>
+ </tr>
+ </xsl:template>
</xsl:stylesheet>