[Koha-patches] [PATCH] various bugfixes for MARC21 Z39.50 targets
Galen Charlton
galen.charlton at liblime.com
Tue May 20 18:09:16 CEST 2008
[1] Added MARC-8 as an encoding choice on the target
administration page.
[2] Fixed TMPL coding errors.
[3] Set the correct encoding (as it happens, 'MARC-8')
for all of the English sample Z39.50 targets.
Documentation note: due to this patch and the ones from
Frederic, screenshots of the page for editing a Z39.50
target should be redone.
---
.../mysql/en/optional/sample_z3950_servers.sql | 12 +-
.../prog/en/modules/admin/z3950servers.tmpl | 119 ++++++++++----------
2 files changed, 68 insertions(+), 63 deletions(-)
diff --git a/installer/data/mysql/en/optional/sample_z3950_servers.sql b/installer/data/mysql/en/optional/sample_z3950_servers.sql
index ad3b03d..58e4400 100644
--- a/installer/data/mysql/en/optional/sample_z3950_servers.sql
+++ b/installer/data/mysql/en/optional/sample_z3950_servers.sql
@@ -1,7 +1,7 @@
INSERT INTO `z3950servers`
-(`host`, `port`, `db`, `userid`, `password`, `name`, `id`, `checked`, `rank`, `syntax`) VALUES
-('z3950.loc.gov',7090,'Voyager','','','LIBRARY OF CONGRESS',1,1,1,'USMARC'),
-('bobcat.nyu.edu',210,'advance','','','NEW YORK UNIVERSITY LIBRARIES',5,0,0,'USMARC'),
-('clio-db.cc.columbia.edu',7090,'voyager','','','COLUMBIA UNIVERSITY',6,0,0,'USMARC'),
-('catnyp.nypl.org',210,'innopac','','','NEW YORK PUBLIC LIBRARY',7,0,0,'USMARC'),
-('siris-libraries.si.edu',210,'Default','','','SMITHSONIAN INSTITUTION LIBRARIES',10,0,0,'USMARC');
+(`host`, `port`, `db`, `userid`, `password`, `name`, `id`, `checked`, `rank`, `syntax`, `encoding`) VALUES
+('z3950.loc.gov',7090,'Voyager','','','LIBRARY OF CONGRESS',1,1,1,'USMARC','MARC-8'),
+('bobcat.nyu.edu',210,'advance','','','NEW YORK UNIVERSITY LIBRARIES',5,0,0,'USMARC','MARC-8'),
+('clio-db.cc.columbia.edu',7090,'voyager','','','COLUMBIA UNIVERSITY',6,0,0,'USMARC','MARC-8'),
+('catnyp.nypl.org',210,'innopac','','','NEW YORK PUBLIC LIBRARY',7,0,0,'USMARC','MARC-8'),
+('siris-libraries.si.edu',210,'Default','','','SMITHSONIAN INSTITUTION LIBRARIES',10,0,0,'USMARC','MARC-8');
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
index cb8c6da..ed9dc9e 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
@@ -114,106 +114,111 @@
</li>
<li><label for="syntax">Syntax (z3950 can send<br /> records in various format. Choose one): </label>
<select name="syntax">
-<!-- TMPL_IF NAME="syntaxUNIMARC">
+<!-- TMPL_IF NAME="syntaxUNIMARC" -->
<option value="UNIMARC" selected="selected">UNIMARC</option>
-<!-- TMPL_ELSE>
+<!-- TMPL_ELSE -->
<option value="UNIMARC">UNIMARC</option>
-<!-- /TMPL_IF>
-<!-- TMPL_IF NAME="syntaxINTERMARC">
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="syntaxINTERMARC" -->
<option value="INTERMARC" selected="selected">INTERMARC</option>
-<!-- TMPL_ELSE>
+<!-- TMPL_ELSE -->
<option value="INTERMARC">INTERMARC</option>
-<!-- /TMPL_IF>
-<!-- TMPL_IF NAME="syntaxCCF">
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="syntaxCCF" -->
<option value="CCF" selected="selected">CCF</option>
-<!-- TMPL_ELSE>
+<!-- TMPL_ELSE -->
<option value="CCF">CCF</option>
-<!-- /TMPL_IF>
-<!-- TMPL_IF NAME="syntaxUSMARC">
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="syntaxUSMARC" -->
<option value="USMARC" selected="selected">MARC21/USMARC</option>
-<!-- TMPL_ELSE>
+<!-- TMPL_ELSE -->
<option value="USMARC">MARC21/USMARC</option>
-<!-- /TMPL_IF>
-<!-- TMPL_IF NAME="syntaxUKMARC">
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="syntaxUKMARC" -->
<option value="UKMARC" selected="selected">UKMARC</option>
-<!-- TMPL_ELSE>
+<!-- TMPL_ELSE -->
<option value="UKMARC">UKMARC</option>
-<!-- /TMPL_IF>
-<!-- TMPL_IF NAME="syntaxNORMARC">
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="syntaxNORMARC" -->
<option value="NORMARC" selected="selected">NORMARC</option>
-<!-- TMPL_ELSE>
+<!-- TMPL_ELSE -->
<option value="NORMARC">NORMARC</option>
-<!-- /TMPL_IF>
-<!-- TMPL_IF NAME="syntaxLIBRISMARC">
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="syntaxLIBRISMARC" -->
<option value="LIBRISMARC" selected="selected">LIBRISMARC</option>
-<!-- TMPL_ELSE>
+<!-- TMPL_ELSE -->
<option value="LIBRISMARC">LIBRISMARC</option>
-<!-- /TMPL_IF>
-<!-- TMPL_IF NAME="syntaxDANMARC">
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="syntaxDANMARC" -->
<option value="DANMARC" selected="selected">DANMARC</option>
-<!-- TMPL_ELSE>
+<!-- TMPL_ELSE -->
<option value="DANMARC">DANMARC</option>
-<!-- /TMPL_IF>
-<!-- TMPL_IF NAME="syntaxFINMARC">
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="syntaxFINMARC" -->
<option value="FINMARC" selected="selected">FINMARC</option>
-<!-- TMPL_ELSE>
+<!-- TMPL_ELSE -->
<option value="FINMARC">FINMARC</option>
-<!-- /TMPL_IF>
-<!-- TMPL_IF NAME="syntaxCANMARC">
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="syntaxCANMARC" -->
<option value="CANMARC" selected="selected">CANMARC</option>
-<!-- TMPL_ELSE>
+<!-- TMPL_ELSE -->
<option value="CANMARC">CANMARC</option>
-<!-- /TMPL_IF>
-<!-- TMPL_IF NAME="syntaxSBN">
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="syntaxSBN" -->
<option value="SBN" selected="selected">SBN</option>
-<!-- TMPL_ELSE>
+<!-- TMPL_ELSE -->
<option value="SBN">SBN</option>
-<!-- /TMPL_IF>
-<!-- TMPL_IF NAME="syntaxPICAMARC">
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="syntaxPICAMARC" -->
<option value="PICAMARC" selected="selected">PICAMARC</option>
-<!-- TMPL_ELSE>
+<!-- TMPL_ELSE -->
<option value="PICAMARC">PICAMARC</option>
-<!-- /TMPL_IF>
-<!-- TMPL_IF NAME="syntaxAUSMARC">
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="syntaxAUSMARC" -->
<option value="AUSMARC" selected="selected">AUSMARC</option>
-<!-- TMPL_ELSE>
+<!-- TMPL_ELSE -->
<option value="AUSMARC">AUSMARC</option>
-<!-- /TMPL_IF>
-<!-- TMPL_IF NAME="syntaxIBERMARC">
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="syntaxIBERMARC" -->
<option value="IBERMARC" selected="selected">IBERMARC</option>
-<!-- TMPL_ELSE>
+<!-- TMPL_ELSE -->
<option value="IBERMARC">IBERMARC</option>
-<!-- /TMPL_IF>
-<!-- TMPL_IF NAME="syntaxCATMARC">
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="syntaxCATMARC" -->
<option value="CATMARC" selected="selected">CATMARC</option>
-<!-- TMPL_ELSE>
+<!-- TMPL_ELSE -->
<option value="CATMARC">CATMARC</option>
-<!-- /TMPL_IF>
-<!-- TMPL_IF NAME="syntaxMALMARC">
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="syntaxMALMARC" -->
<option value="MALMARC" selected="selected">MALMARC</option>
-<!-- TMPL_ELSE>
+<!-- TMPL_ELSE -->
<option value="MALMARC">MALMARC</option>
-<!-- /TMPL_IF>
+<!-- /TMPL_IF -->
</select>
</li>
<li><label for="encoding">Encoding (z3950 can send<br /> records in various encodings. Choose one): </label>
<select name="encoding">
-<!-- TMPL_IF NAME="encodingutf8">
+<!-- TMPL_IF NAME="encodingutf8" -->
<option value="utf8" selected="selected">UTF-8</option>
-<!-- TMPL_ELSE>
+<!-- TMPL_ELSE -->
<option value="utf8">UTF-8</option>
-<!-- /TMPL_IF>
-<!-- TMPL_IF NAME="encodingISO_5426">
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="encodingISO_5426" -->
<option value="ISO_5426" selected="selected">ISO_5426</option>
-<!-- TMPL_ELSE>
+<!-- TMPL_ELSE -->
<option value="ISO_5426">ISO_5426</option>
-<!-- /TMPL_IF>
-<!-- TMPL_IF NAME="encodingISO_6937">
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="encodingISO_6937" -->
<option value="ISO_6937" selected="selected">ISO_6937</option>
-<!-- TMPL_ELSE>
+<!-- TMPL_ELSE -->
<option value="ISO_6937">ISO_6937</option>
-<!-- /TMPL_IF>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="encodingMARC-8" -->
+<option value="MARC-8" selected="selected">MARC-8</option>
+<!-- TMPL_ELSE -->
+<option value="MARC-8">MARC-8</option>
+<!-- /TMPL_IF -->
</select>
</li>
</ol>
--
1.5.5.rc0.16.g02b00
More information about the Koha-patches
mailing list