Commit graph

62 commits

Author SHA1 Message Date
Jared Camins-Esakov
0f39c4fcc3 Bug 4276 follow-up: quote strings with curly braces
Previous fix used the wrong characters for quoting. I should have used curly
braces instead of double quotes. Some searches using double quotes will fail
(the problem seems to be punctuation, although there may be other circumstances
where double quotes fail as well).

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 10:37:53 +12:00
Jared Camins-Esakov
36ca010cc4 Bug 4276: XSLT subject tracings only use subfield a
When XSLT is enabled, the subject tracings on the details view (both OPAC and
Intranet) previously only searched on the subfield 'a'. In addition, searches
failed when the tracing included parentheses, and the XSLT display did not
include subfields other than abcdvxyz, even for those 6xx tags that have other
subfields.

This patch adds a syspref: TraceSubjectSubdivisons. When
TraceSubjectSubdivisions is set to "Don't include" (default), the subject
tracings in the XSLT details view will only search on subfield 'a'. When
TraceSubjectSubdivisions is set to "Include", the subject tracings will search
on all subfields, not just subfield 'a'.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-28 09:47:05 +13:00
ruth@bywatersolutions.com
6e59b9a295 Bug 5954: 490$a not used to create search link in XSLT
This bug corrects a minor XSLT bug that is causing 490$t (which is not defined) to create
search links when XSLT is enabled

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-27 21:02:33 +13:00
Jared Camins-Esakov
1deadb34c3 Bug 5919: Display MARC21 fields 583, 586, 530
This patch adds the MARC21 fields 583 (Action note), 586 (Awards note), and
530 (Additional physical form available note) to the OPAC details display in the
XSLT-controlled portion of the page. In order to allow libraries to hide these
notes if they do not want them added, the notes have been given CSS classes.

Depends on patch for Bug 3098.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-24 20:16:33 +13:00
Jared Camins-Esakov
009036b537 Bug 3098 follow-up: Clean up formatting
This patch cleans up the formatting of the 856 display code in
MARC21slim2OPACDetail.xsl. Tabstops are correct, and the OPACURLOpenInNewWindow
syspref check is moved to control the use of a 'target="_blank"' attribute,
rather than having two blocks of almost-identical code.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-24 20:13:46 +13:00
Jared Camins-Esakov
eeaf2e7c9e Bug 3382: Add CSS classes to OPAC XSLT <img> tags
This patch adds materialtype, format, and natureofcontents CSS classes to the
<img> tags produced by the OPAC XSLT stylesheets for use with CSS and jQuery.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-23 21:13:50 +13:00
1b57668d7e 5622: Improve display of MARC21 773 field in XSLT detail view
Applies change to OPAC and staff detail view.
Chops punctuation. Adds 773g. Strips MARC org code from URL.
Utils code is used as basis for patches #5662 and #5663 too.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-18 11:05:11 +13:00
Jared Camins-Esakov
de4619b849 Bug 5816: XSLT doesn't display enhanced contents
This patch corrects and standardizes the display of enhanced contents (MARC 505
with ind2='0').

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-17 12:32:41 +13:00
1ff13b5aa6 Bug 5848: Same position for the tabs of Normal, MARC and ISBD view in opac detail
Adjusts three opac detail templates. Moves few styles to css.
Removes duplicate view info from XSLT file.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-14 20:50:03 +13:00
Jared Camins-Esakov
4bc293c3aa Bug 5810: Subject tracings search complete subfields
This patch adds the syspref TraceCompleteSubfields. When TraceCompleteSubfields
is set to "force," clicking on links in non-authority controlled subject
tracings will only find other records where the entire subfields match. Leaving
it at "don't force" keeps the current behavior of doing a keyword search of the
subject indexes.

This patch implements complete-subfield subject tracings in MARC21 XSLTs (OPAC
and Staff) and all Normal mode interfaces. UNIMARC XSLTs have not been updated.

This patch also adds the syspref UseAuthoritiesForTracings. When set to "Do not"
tracings in the XSLT detail displays will never generate links using authority
numbers, but rather use the heading strings (NB: the tracings currently use only
subfield 'a' for generating links).

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Jane Wagner <jwagner@ptfs.com>
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-13 15:02:59 +13:00
3f0eeb9c28 Proposed fix for Bug 5106 - Simplify MARC view choices in the OPAC (Conflict marker fix 2nd try)
- Eliminates the "Extended MARC View" tab
- Points the "MARC View" tab to opac-MARCDetail.pl as it is when XSLT is off
- Offers a "view plain" link on opac-MARCDetail.pl. Clicking this link
  replaces the standard labeled MARC view with an unformatted view similar to the
  one displayed in the pop-up modal MARC view.
- When viewing the "plain view," clicking the "view labeled" link will return
  you to the standard labeled MARC view.
- Adds a new XSL file for displaying MARC data in a slightly-more-formatted
  manner (compared to one big <pre></pre> block).

Removed a conflict marker line from Owen's patch (Marcel).

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-21 17:01:33 +13:00
Chris Cormack
718473bdd2 Merge remote branch 'colin/QA/bug_4506' into new/enh/bug_4506 2010-12-14 21:07:15 +13:00
5633b423e3 Bug 5467: Kits shown wrong as visual material in XSLT displays
- reused icon for mixed materials for kits
- fixed missing icon for mixed materials

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-12 07:53:50 +13:00
Colin Campbell
f707e6c82b Remove some whitespace from earlier commit 2010-12-08 12:54:58 +00:00
Katrin Fischer
0800ab6fda Bug 4506: Add rcn links to host item entry = 773
Add links using control number in $w to host item entry.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-08 12:45:10 +00:00
Katrin Fischer
bc4512a600 Bug 4506: Add rcn links to 780 and 785
Add links using control number in $w to preceeding and succeeding entry.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-08 12:45:10 +00:00
Katrin Fischer
d035a581a8 Bug 4506: Add link to volumes of traced series to series record
Changed link to volumes of sets to work for traced series too.
Now if the user finds a series or set record in the database,
there is always a link to search for the associated recos with items.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-08 12:45:10 +00:00
Katrin Fischer
0f83daddd8 Bug 4506: Traced series
Add separate display of traced series.
Use $w and index rcn for link if $w exists, else show text link.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-08 12:45:10 +00:00
Katrin Fischer
26fa2de914 Bug 4506: Add links to other editions, some minor corrections
A new label 'Other editions:' is added with links to other editions.
The link starts a search for control number from 775$w in index control number.

A check for existence of $w/001 is added to always provide a fallback to a search for the link text.

Take care of repeated 773 fields.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-08 12:45:10 +00:00
Katrin Fischer
bfbf10e8e9 Bug 4506: Add volume > set link
A new label 'Set:' is added with a link to the set.
The link starts a search for control number from 773$w in index control number.
A syspref UseControlNumber will be added later, to provide a fallback to a search by 245$a, which is also the title of the set.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-08 12:45:10 +00:00
Katrin Fischer
43d0860e55 Bug 4506: Add set > volume link
A new label 'Volumes:' is added with a link 'Show volumes'.
The link starts a search fcontrol number from 001 in index rcn = Record control number.
A syspref UseControlNumber will be added later, to provide a fallback to a search by title.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-08 12:45:09 +00:00
Katrin Fischer
b705902c38 Bug 4506: New icon for sets
Show an own icon for sets - LDR 19 = a

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-08 12:45:09 +00:00
Katrin Fischer
d3605d9ae8 Bug 4506: Some work on article to serial links
- changes search links to use Title index
- show article icon in intranet like in opac

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-08 12:45:09 +00:00
Katrin Fischer
455c87d96e Bug 5175: Publisher link breaks display, if no publisher exists
If there is no publisher the empty publisher link will break the record display
in staff and intranet.

This patch adds a check for existence of subfield b.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-21 10:40:57 +13:00
c0272a6b66 Fix for Bug 5175, XSL view doesn't link publisher name to search
Fixes the doubled up display of the publisher.

This patch fixes the bug in both the OPAC and staff client

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-15 13:40:06 +13:00
c616cb5081 Bug 4472 Apply it to MARC21
For French installation of Koha using MARC21, the same issues as UNIMARC
affects handling of &nbsp; by translation scripts.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-08 16:23:37 +13:00
Katrin Fischer
9f688ad92b Bug 5370: Fix all references to koha.org
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-08 09:41:47 +13:00
192e148fa3 Fix for Bug 5223, 'related subjects' should read 'subjects'
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-01 20:34:39 +13:00
8ece6223b9 Another fix for Bug 2704, 440 Display Issues
Removing the check for 490 @ind1=0 since the
alternative 8xx tag will not display anyway

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-06 14:52:33 -04:00
b357e728bc Fix for Bug 5222 - 600 t not showing with xslt on
Original commit message was for 650 field, but fix works for 600.  See bug report.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-06 06:18:50 -04:00
0c6250f754 Bug 5187: Show place of publication (MARC21, 260$c), XSLT
Show place of puplication in
- OPAC result list
- OPAC detail
- staff detail

The normal display does already show the place of publication, but it's missing from the XSLT controlled displays.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-06 06:18:46 -04:00
Jared CAMINS-ESAKOV
95b4f31fb2 bug 4422: Show article icon with DisplayOPACiconsXSLT
Show article (open book) icon on results and details screen when DisplayOPACiconsXSLT is enabled.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-07-02 12:45:59 -04:00
Jared CAMINS-ESAKOV
a4e4065da7 Fix for bug 4928, problematic 78x display in OPAC
- Add <xsl:if> wrappers around the display of subfield 'n' for 76x-78x fields
  This eliminates the issue in Firefox that caused the font size to grow
  progressively smaller on the OPAC Details page for records with multiple
  76x-78x fields

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-07-02 12:35:50 -04:00
20140de43e Fix for Bug 4821, With multiple 5XX fields, the font display gets progressively smaller
Prevent the generation of empty label spans for various
bib details fields.  A construct like

<span class="results_summary"><span class="label" />contents note</span>

is consistently misinterpreted in many web browsers, leading to
CSS oddities.  See the bug for more details.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-23 22:50:33 -04:00
f243b83ec0 bug 4018: remove duplicate unAPI link when XSLT bib details display on
The unAPI link is now added only in opac-detail.tmpl.  More than
one unAPI link in the same page was causing a bit of indigestion
for Zotero, which interprets multiple unAPI links as specifying
more than one resource on a given page.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-25 09:29:31 -04:00
Jane Wagner
f4e1363ccd Bug 4300 Display 866z summary holdings public note in OPAC
Added the 866z to the MARC21slim2OPACDetail.xsl file so that it displays
just above the 780 and 785 fields.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-11 08:58:22 -04:00
668581b720 Improve detail page MARC21 XSL file for 505 and 520 tags
Some tags weren't displayed propertly:

505  If there is no indicator 1, content label is not displayed and
     then repeated 505 tags are also incorrecly displayed. This patch
     add a default label.
502  Wasn't displayed at all. Added in this patch.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 23:36:24 -04:00
Jared CAMINS-ESAKOV
a326217179 Bug 4371: Display MARC21 field 773 w/XSLT
Display MARC21 field 773 in the OPAC detail view when XSLT is enabled.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 22:32:24 -04:00
Jared CAMINS-ESAKOV
4f11c2e728 Bug 4370: Fix ind1 semantics for MARC21 780/785
When using XSLT stylesheets for display, show MARC21 fields 780 and 785 on the OPAC details page only when ind1=0, as specified by the standard.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 22:32:23 -04:00
Jane Wagner
7bebc1e111 Bug 3750 Modify XSLT to display subfield n of 111/711 and remove period after 110/710
If a 111/711 uses a subfield n (Number of part/section/meeting), XSLT wasn't displaying it which made for an incomplete display.

	e.g., International Conference on Concurrency Theory 1999 : Eindhoven, Netherlands)
	instead of 10th International Conference on Concurrency Theory 1999 : Eindhoven, Netherlands)

I've added it to show before subfield a if present.  I've also removed the period that XSLT puts in the results and display after the last occurrence of a 110/710.  It's fairly standard practice for these entries to have a period in the MARC record, so the XSLT display was showing a double period.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 22:11:31 -04:00
Jane Wagner
6ecb2ddbb5 Bug 3788 XSLT does not obey viewISBD syspref
Modified XSLT.pm and MARC21slim2OPACDetail.xsl to obey the viewISBD syspref
setting in the OPAC.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 22:09:59 -04:00
ed023f75a6 Bug 3293, changes to the xslt files to fix the wrong type/icon showing for music scores. Courtesy of Bernardo Gonzalez Kriegel
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-16 07:42:40 -04:00
Jane Wagner
4afcc03655 Bug 4057 Fix spacing in XSLT OPAC display for 245 subfield f
If a 245 has a subfield f (or any of the displayed fgknps subfields after a, b,
or h) there is no spacing and the display runs together.  This happens in both
the XSLT results list and the XSLT individual title display.  I've added a
space between the a, b, h displays and the beginning of the fgknps set.
2010-01-23 15:33:23 +01:00
Jane Wagner
486a9496de Bug 3098, Bug 3108, Bug 3545 -- Make MARC21 XSLT obey sysprefs in OPAC
The MARC21slim2OPACDetail.xsl and MARC21slim2OPACResults.xsl XSLT
stylesheets do not obey any of the OPAC sysprefs, OPACURLOpenInNewWindow,
URLLinkText, or a new one added for Bug 3545, DisplayOPACiconsXSLT.
Modified C4/XSLT.pm based on code written by Fréric Demians (thanks!) to
pass the values of the sysprefs to the .xsl files.  Modified the .xsl
files to implement them.  If the respective sysprefs are set, the OPAC
results and display pages will/will not display the format/material
type/audience icons, will/will not open URLs in new browser windows,
and will/will not use the text entered in URLLinkText as generic link
text when there is no value in the 856 subfield y, 3, or z.  (Note that
if subfields y, 3, or z do contain text, the first match is what will be displayed.)

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-09-15 21:40:47 -04:00
Wolfgang Heymans
53040ea9e8 Bug 3567: Display Alternate Graphic Representation (MARC21 880) in OPAC
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-09-06 14:51:43 -04:00
Garry Collum
c147650b4a Bug 3228: Fix for Type: label in XSLT displays.
Empty nodes must be generated in the XML for MARC21slim2OPACResults - typeOf008 and MARC21slim2OPACResults - materialTypeCode when the fields in the Marc record do not exist.  This patch fixes the "Type: " label.  More testing needs to be done to see if any other labels appear in the Opac if the data is not defined in the MARC record.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-06-15 12:43:49 -05:00
Galen Charlton
391a6d3261 bug 2001, 2432: improve unAPI implementation
Improves Koha's unAPI support as follows:

* The implementation no longer depends on there being
  an accessible Zebra or SRW server.  Instead, responses
  are created by running the bib MARCXML through local
  stylesheets.
* unAPI now works for all bibs, not just ones that have
  an ISBN.  The ID format is changed from koha:isbn:ISBN
  to koha:biblionumber:BIBNUM.
* unAPI now correctly advertises the formats it supports.
* This implementation now passes validation testing at
  http://validator.unapi.info/ .
* MODS3 support now works correctly.  As a consequence, this
  patch fixes bug 2432 (Zotero support when using the XSLT
  OPAC stylesheets).

TODO: as additonal XSLT stylesheets are created to convert
UNIMARC bibs to additional formats, the stylesheet map
in opac/unapi should be updated.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-22 07:31:43 -05:00
Jane Wagner
f9c3780def Bugs 2822, 2551, 3163 fixes to XSLT
Resent with additional comments.

Bug 2822 -- for leader6 types of i (nonmusical) or j (musical), the hitlist
uses an icon and label of Sound while the record display page uses
Music.  Modified record display to use Sound.

Bug 2551 -- for leader7 type of i says it's type Serial which is incorrect.
The bug report suggested Integrating Resource" but the latest install's
hitlist page uses Continuing Resource.  Changed the record display page
to also use Continuing Resource.

Bug 3163 -- if you have a 110 or 710 with a subfield a and a subfield b,
there's no space between them (on either hitlist or record display).
The two headings run together in the display.  Modified the utils file
to force a space.

The XSLT files referenced two icons which did not exist (globe.png and
drive_remote.png. Replaced those with icons from the same subject area
(world.png and drive_web.png).  Also, corrected spelling of icon name
from pencile.png to pencil.png.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-04-28 09:00:28 -05:00
Galen Charlton
8f9618833e changes to OPAC results and detail XSLT
Various changes to OPAC search results and bib
detail display for MARC21.

* Search results

[1] 245 subfields will be displayed in order $a, $b, $h, then
    rest of subfields in the order they appear in the record.
[2] New edition field from 250$a, displayed under author
[3] New other title field from 246$a$b, displayed under call number

* Bib details

[1] 245 subfields will be displayed in order $a, $b, $h, then
    rest of subfields in the order they appear in the record.
[2] New edition field from 250$a$b, displayed under publisher
[3] New description field from 300$a$b$c$e$g, under the edition.
[4] New other title field from the 246$i$a$b$h$f$g$n$p, above the
    uniform title field.
[6] All 6XX fields are displayed in the subjects field.
[7] '--' now separates subdivisions in subject headings.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-02-27 15:21:45 -06:00
96d0ea56df Formatting changes for OPAC xslt and staff client catalog detail pages. Fixes Bug 2704, 440 Display Issues.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-12-31 10:44:02 -06:00