[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha cataloguing/addbiblio.pl koha-tmpl/intrane... [rel_3_0]
|
From: |
paul poulain |
|
Subject: |
[Koha-cvs] koha cataloguing/addbiblio.pl koha-tmpl/intrane... [rel_3_0] |
|
Date: |
Mon, 29 Jan 2007 17:00:49 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: paul poulain <tipaul> 07/01/29 17:00:49
Modified files:
cataloguing : addbiblio.pl
koha-tmpl/intranet-tmpl/prog/en/cataloguing: addbiblio.tmpl
Log message:
MARC editor fixes to get a 2.2 like behaviour (was broken on upSubfield
& subfield change & some other features)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/addbiblio.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.14.2.23&r2=1.14.2.24
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.18&r2=1.1.2.19
Patches:
Index: cataloguing/addbiblio.pl
===================================================================
RCS file: /sources/koha/koha/cataloguing/addbiblio.pl,v
retrieving revision 1.14.2.23
retrieving revision 1.14.2.24
diff -u -b -r1.14.2.23 -r1.14.2.24
--- cataloguing/addbiblio.pl 24 Jan 2007 13:53:07 -0000 1.14.2.23
+++ cataloguing/addbiblio.pl 29 Jan 2007 17:00:48 -0000 1.14.2.24
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: addbiblio.pl,v 1.14.2.23 2007/01/24 13:53:07 tipaul Exp $
+# $Id: addbiblio.pl,v 1.14.2.24 2007/01/29 17:00:48 tipaul Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -33,6 +33,10 @@
use MARC::File::USMARC;
use MARC::File::XML;
+if (C4::Context->preference('marcflavour') eq 'UNIMARC') {
+ MARC::File::XML->default_record_format( 'UNIMARC' );
+}
+
use vars qw( $tagslib);
use vars qw( $authorised_values_sth);
use vars qw( $is_a_modif );
@@ -92,13 +96,9 @@
$sth->execute($id);
my ($file,$marc,$encoding) = $sth->fetchrow;
if ($marc) {
+# $marc =~ s/frey0103/frey50 /;
my $record = MARC::Record->new_from_usmarc($marc);
- #my $record = MARC::File::USMARC::decode($marc);
-
- my @warnings = $record->warnings();
- foreach my $warning (@warnings) {
- warn "WARNING".$warning;
- }
+# warn "REC : $marc = ".$record->as_formatted;
if (ref($record) eq undef) {
return -1;
} else {
Index: koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -b -r1.1.2.18 -r1.1.2.19
--- koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl 11 Jan 2007
16:28:42 -0000 1.1.2.18
+++ koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl 29 Jan 2007
17:00:49 -0000 1.1.2.19
@@ -88,7 +88,7 @@
<!-- /TMPL_UNLESS -->
<!-- TMPL_UNLESS name="hide_marc" -->
<img style="cursor: crosshair; color: grey; font-size:
80%;" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF
--> src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png"
onclick="upSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR
name="index" -->')"/>
- <input title="<!-- TMPL_VAR NAME="marc_lib_plain" -->"
style=" <!-- TMPL_IF NAME="fixedfield" -->display:none; <!-- /TMPL_IF
-->border:0;" type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield"
-->" size="1" maxlength="1" class="flat" DISABLE READONLY tabindex=-1 />
+ <input title="<!-- TMPL_VAR NAME="marc_lib_plain" -->"
style=" <!-- TMPL_IF NAME="fixedfield" -->display:none; <!-- /TMPL_IF
-->border:0;" type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield"
-->" size="1" maxlength="1" class="flat" tabindex=-1 />
<!-- TMPL_ELSE -->
<input type="hidden" name="subfield" value="<!-- TMPL_VAR
NAME="subfield" -->"/>
<!-- /TMPL_UNLESS -->
@@ -123,15 +123,15 @@
<input type="hidden" name="tag_mandatory"
value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
<!-- /TMPL_LOOP -->
</div>
- <!-- TMPL_IF name="oldbiblionumtagfield" -->
- <input type="hidden" name="tag" value="<!-- TMPL_VAR
NAME="oldbiblionumtagfield" -->">
- <input type="hidden" name="subfield" value="<!--
TMPL_VAR NAME="oldbiblionumtagsubfield" -->">
- <input type="hidden" name="field_value" value="<!--
TMPL_VAR NAME="oldbiblionumber" -->">
+ <!-- TMPL_IF name="biblionumtagfield" -->
+ <input type="hidden" name="tag" value="<!-- TMPL_VAR
NAME="biblionumtagfield" -->">
+ <input type="hidden" name="subfield" value="<!--
TMPL_VAR NAME="biblionumtagsubfield" -->">
+ <input type="hidden" name="field_value" value="<!--
TMPL_VAR NAME="biblionumber" -->">
<input type="hidden" name="mandatory" value="0">
<input type="hidden" name="kohafield" value="<!--
TMPL_VAR NAME="kohafield" -->">
- <input type="hidden" name="tag" value="<!-- TMPL_VAR
NAME="oldbiblioitemnumtagfield" -->">
- <input type="hidden" name="subfield" value="<!--
TMPL_VAR NAME="oldbiblioitemnumtagsubfield" -->">
- <input type="hidden" name="field_value" value="<!--
TMPL_VAR NAME="oldbiblioitemnumber" -->">
+ <input type="hidden" name="tag" value="<!-- TMPL_VAR
NAME="biblioitemnumtagfield" -->">
+ <input type="hidden" name="subfield" value="<!--
TMPL_VAR NAME="biblioitemnumtagsubfield" -->">
+ <input type="hidden" name="field_value" value="<!--
TMPL_VAR NAME="biblioitemnumber" -->">
<input type="hidden" name="mandatory" value="0">
<input type="hidden" name="kohafield" value="<!--
TMPL_VAR NAME="kohafield" -->">
<input type="hidden" name="tag_mandatory" value="<!--
TMPL_VAR NAME="tag_mandatory" -->">
@@ -339,6 +339,9 @@
try{
CloneButtonPlus = clone.getElementsByTagName('a')[0];
CloneButtonPlus.setAttribute('onclick',"cloneSubfield('" + index +
index + "')");
+ var buttonUp = clone.getElementsByTagName('img')[0];
+// alert(buttonUp.getAttribute('id'));
+ buttonUp.setAttribute('onclick',"upSubfield('" + index + index + "')");
}
catch(e){
// do nothig if ButtonPlus & CloneButtonPlus don't exist.