[Koha-cvs] koha cataloguing/value_builder/unimarc_field_4X... [rel_3_0]
paul poulain
paul at koha-fr.org
Tue Jan 30 11:04:16 CET 2007
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: paul poulain <tipaul> 07/01/30 10:04:16
Modified files:
cataloguing/value_builder: unimarc_field_4XX.pl
koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder:
unimarc_field_4XX.tmpl
Log message:
- removing 2.2 style
- it's more perlish to use subfield('xxx','x') instead of field('xx')->subfield('x')
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/value_builder/unimarc_field_4XX.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.11&r2=1.1.2.12
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_4XX.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.4&r2=1.1.2.5
Patches:
Index: cataloguing/value_builder/unimarc_field_4XX.pl
===================================================================
RCS file: /sources/koha/koha/cataloguing/value_builder/Attic/unimarc_field_4XX.pl,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -b -r1.1.2.11 -r1.1.2.12
--- cataloguing/value_builder/unimarc_field_4XX.pl 22 Dec 2006 15:02:56 -0000 1.1.2.11
+++ cataloguing/value_builder/unimarc_field_4XX.pl 30 Jan 2007 10:04:16 -0000 1.1.2.12
@@ -98,46 +98,46 @@
my $subfield_value_a;
if ($marcrecord->field('700')){
$subfield_value_a=$marcrecord->field('700')->subfield("a");
- $subfield_value_a.=", ".$marcrecord->field('700')->subfield("b") if ($marcrecord->field('700')->subfield("b"));
- $subfield_value_a.=" ".$marcrecord->field('700')->subfield("d") if ($marcrecord->field('700')->subfield("d"));
- $subfield_value_a.=" (".$marcrecord->field('700')->subfield("c")." - " if ($marcrecord->field('700')->subfield("c"));
- $subfield_value_a.=" (" if (($marcrecord->field('700')->subfield("f")) and not( $marcrecord->field('700')->subfield("c")));
- $subfield_value_a.=$marcrecord->field('700')->subfield("f") if ($marcrecord->field('700')->subfield("f"));
- $subfield_value_a.=")" if ($marcrecord->field('701')->subfield("f")) or ($marcrecord->field('701')->subfield("c"));
+ $subfield_value_a.=", ".$marcrecord->subfield('700',"b") if $marcrecord->subfield('700','b');
+ $subfield_value_a.=" ".$marcrecord->subfield('700',"d") if $marcrecord->subfield('700','d');
+ $subfield_value_a.=" (".$marcrecord->subfield('700','c')." - " if $marcrecord->subfield('700','c');
+ $subfield_value_a.=" (" if ($marcrecord->subfield('700','f') and not( $marcrecord->subfield('700','c')));
+ $subfield_value_a.=$marcrecord->subfield('700','f') if ($marcrecord->subfield('700','f'));
+ $subfield_value_a.=")" if ($marcrecord->subfield('701','f') or $marcrecord->subfield('701','c'));
} elsif ($marcrecord->field('702')){
- $subfield_value_a=$marcrecord->field('702')->subfield("a");
- $subfield_value_a.=", ".$marcrecord->field('702')->subfield("b") if ($marcrecord->field('702')->subfield("b"));
- $subfield_value_a.=" ".$marcrecord->field('702')->subfield("d") if ($marcrecord->field('702')->subfield("d"));
- $subfield_value_a.=" (".$marcrecord->field('702')->subfield("c")."; " if ($marcrecord->field('702')->subfield("c"));
- $subfield_value_a.=" (" if (($marcrecord->field('702')->subfield("f")) and not($marcrecord->field('702')->subfield("c")) );
- $subfield_value_a.=$marcrecord->field('702')->subfield("f") if ($marcrecord->field('702')->subfield("f"));
- $subfield_value_a.=")" if ($marcrecord->field('702')->subfield("f")) or ($marcrecord->field('702')->subfield("c"));
+ $subfield_value_a=$marcrecord->subfield('702','a');
+ $subfield_value_a.=", ".$marcrecord->subfield('702','b') if $marcrecord->subfield('702','b');
+ $subfield_value_a.=" ".$marcrecord->subfield('702','d') if $marcrecord->subfield('702','d');
+ $subfield_value_a.=" (".$marcrecord->subfield('702','c')."; " if $marcrecord->subfield('702','c');
+ $subfield_value_a.=" (" if $marcrecord->subfield('702','f') and not $marcrecord->subfield('702','c');
+ $subfield_value_a.=$marcrecord->subfield('702','f') if $marcrecord->subfield('702','f');
+ $subfield_value_a.=")" if $marcrecord->subfield('702','f') or $marcrecord->subfield('702','c');
} elsif ($marcrecord->field('710')){
- $subfield_value_a=$marcrecord->field('710')->subfield("d")." " if ($marcrecord->field('710')->subfield("d"));
- $subfield_value_a.=$marcrecord->field('710')->subfield("a") if ($marcrecord->field('710')->subfield("a"));
- $subfield_value_a.=", ".$marcrecord->field('710')->subfield("b") if ($marcrecord->field('710')->subfield("b"));
- $subfield_value_a.=" (".$marcrecord->field('710')->subfield("f")." - " if ($marcrecord->field('710')->subfield("f"));
- $subfield_value_a.=" (" if (($marcrecord->field('710')->subfield("e")) and not( $marcrecord->field('710')->subfield("f")));
- $subfield_value_a.=$marcrecord->field('710')->subfield("e") if ($marcrecord->field('710')->subfield("e"));
- $subfield_value_a.=")" if (($marcrecord->field('710')->subfield("e")) or ($marcrecord->field('710')->subfield("f")));
+ $subfield_value_a=$marcrecord->subfield('710','d')." " if $marcrecord->subfield('710','d');
+ $subfield_value_a.=$marcrecord->subfield('710','a') if $marcrecord->subfield('710','a');
+ $subfield_value_a.=", ".$marcrecord->subfield('710','b') if $marcrecord->subfield('710');
+ $subfield_value_a.=" (".$marcrecord->subfield('710','f')." - " if $marcrecord->subfield('710','f');
+ $subfield_value_a.=" (" if $marcrecord->subfield('710','e') and not $marcrecord->subfield('710','f');
+ $subfield_value_a.=$marcrecord->subfield('710','e') if $marcrecord->subfield('710','e');
+ $subfield_value_a.=")" if $marcrecord->subfield('710','e') or $marcrecord->subfield('710','f');
} elsif ($marcrecord->field('701')){
- $subfield_value_a=$marcrecord->field('701')->subfield("a");
- $subfield_value_a.=", ".$marcrecord->field('701')->subfield("b") if ($marcrecord->field('701')->subfield("b"));
- $subfield_value_a.=" ".$marcrecord->field('701')->subfield("d") if ($marcrecord->field('701')->subfield("d"));
- $subfield_value_a.=" (".$marcrecord->field('701')->subfield("c")." - " if ($marcrecord->field('701')->subfield("c"));
- $subfield_value_a.=" (" if (($marcrecord->field('701')->subfield("f")) and not( $marcrecord->field('701')->subfield("c")));
- $subfield_value_a.=$marcrecord->field('701')->subfield("f") if ($marcrecord->field('701')->subfield("f"));
- $subfield_value_a.=")" if ($marcrecord->field('701')->subfield("f")) or ($marcrecord->field('701')->subfield("c"));
+ $subfield_value_a=$marcrecord->subfield('701','a');
+ $subfield_value_a.=", ".$marcrecord->subfield('701','b') if $marcrecord->subfield('701','b');
+ $subfield_value_a.=" ".$marcrecord->subfield('701','d',) if $marcrecord->subfield('701','d');
+ $subfield_value_a.=" (".$marcrecord->subfield('701','c')." - " if $marcrecord->subfield('701','c');
+ $subfield_value_a.=" (" if $marcrecord->subfield('701','f') and not( $marcrecord->subfield('701','c'));
+ $subfield_value_a.=$marcrecord->subfield('701','f') if $marcrecord->subfield('701','f');
+ $subfield_value_a.=")" if $marcrecord->subfield('701','f') or $marcrecord->subfield('701','c');
} elsif ($marcrecord->field('712')){
- $subfield_value_a=$marcrecord->field('712')->subfield("d")." " if ($marcrecord->field('712')->subfield("d"));
- $subfield_value_a.=$marcrecord->field('712')->subfield("a") if ($marcrecord->field('712')->subfield("a"));
- $subfield_value_a.=", ".$marcrecord->field('712')->subfield("b") if ($marcrecord->field('712')->subfield("b"));
- $subfield_value_a.=" (".$marcrecord->field('712')->subfield("f")." - " if ($marcrecord->field('712')->subfield("f"));
- $subfield_value_a.=" (" if (($marcrecord->field('712')->subfield("e")) and not( $marcrecord->field('712')->subfield("f")));
- $subfield_value_a.=$marcrecord->field('712')->subfield("e") if ($marcrecord->field('712')->subfield("e"));
- $subfield_value_a.=")" if (($marcrecord->field('712')->subfield("e")) or ($marcrecord->field('712')->subfield("f")));
+ $subfield_value_a=$marcrecord->subfield('712','d')." " if $marcrecord->subfield('712','d');
+ $subfield_value_a.=$marcrecord->subfield('712','a') if $marcrecord->subfield('712','a');
+ $subfield_value_a.=", ".$marcrecord->subfield('712','b') if $marcrecord->subfield('712','b');
+ $subfield_value_a.=" (".$marcrecord->subfield('712','f')." - " if $marcrecord->subfield('712','f');
+ $subfield_value_a.=" (" if $marcrecord->field('712',"e") and not $marcrecord->subfield('712','f');
+ $subfield_value_a.=$marcrecord->subfield('712','e') if $marcrecord->subfield('712','e');
+ $subfield_value_a.=")" if $marcrecord->subfield('712','e') or $marcrecord->subfield('712','f');
} elsif ($marcrecord->field('200')){
- $subfield_value_a=$marcrecord->field('200')->subfield("f");
+ $subfield_value_a=$marcrecord->subfield('200','f');
}
my $subfield_value_c = $marcrecord->field('210')->subfield("a") if ($marcrecord->field('210'));
my $subfield_value_d = $marcrecord->field('210')->subfield("d") if ($marcrecord->field('210'));
Index: koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_4XX.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/Attic/unimarc_field_4XX.tmpl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_4XX.tmpl 24 Nov 2006 21:45:34 -0000 1.1.2.4
+++ koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_4XX.tmpl 30 Jan 2007 10:04:16 -0000 1.1.2.5
@@ -156,21 +156,7 @@
</script>
- <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
- <style type="text/css">
- .catalogue {
- background-color:#ad11ad;
- color:#FFFFFF;
- background-image:none;
- text-decoration: normal;
- }
- a.catalogue:hover {
- background-color: #ad11ad;
- color: #FFFFFF;
- text-decoration: none;
- }
-
- </style>
+ <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/intranet.css">
</head>
<body>
@@ -198,11 +184,11 @@
<p align="left"><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha</p>
<!-- /TMPL_IF -->
</head>
- <div id="mainbloc">
- <h1 class="catalogue" >KOHA : INTRANET : Catalogue </h1>
+ <div id="main">
+ <h1>KOHA : INTRANET : Catalogue </h1>
<!--TMPL_IF Name = "Search"-->
- <div id="bloc25">
- <h2 class="catalogue" > Search On </h2>
+ <div id="unimarc_field_4XX_search">
+ <h2> Search On </h2>
<form name="f" method="post" action="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl">
<p>
@@ -214,8 +200,8 @@
<input type="text" name="search" id="keyword" size="35">
</p>
<p>
- <input type="submit" value="Start search" class="button catalogue">
- <input type="reset" value="Clear All Fields" class="button catalogue">
+ <input type="submit" value="Start search">
+ <input type="reset" value="Clear All Fields">
</p>
</div>
@@ -224,18 +210,18 @@
<!--TMPL_ELSE-->
- <h2 class="catalogue">Search results</h2>
- <div id="resultnumber">
+ <h2>Search results</h2>
+ <div id="unimarc_field_4XX_resultnumber">
<p><!-- TMPL_IF NAME="displayprev" --> <a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&index=<!--TMPL_VAR Name="index"-->&startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search"><<Previous</a><!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="numbers" --><!-- TMPL_IF NAME="highlight" --> <span class="highlight"><!-- TMPL_VAR NAME="number" --></span><!-- TMPL_ELSE --> <a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&index=<!--TMPL_VAR Name="index"-->&startfrom=<!-- TMPL_VAR NAME="startfrom" -->&<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search"><!-- TMPL_VAR NAME="number" --></a><!-- /TMPL_IF --><!-- /TMPL_LOOP --> <!-- TMPL_IF NAME="displaynext" --><a class="resultnumber" href="/cgi-bin/koha/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&index=<!--TMPL_VAR Name="index"-->&startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search">Next>></a><!-- /TMPL_IF --></p>
<p class="resultcount"><!-- TMPL_IF NAME="total" -->Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --><!-- TMPL_ELSE -->No results found.<!-- /TMPL_IF --></p></div>
<div id="resultlist">
<table>
<tr>
- <th class="catalogue">Summary</th>
- <th class="catalogue">Item Count</th>
- <th class="catalogue">Location</th>
- <th class="catalogue"> </th>
+ <th>Summary</th>
+ <th>Item Count</th>
+ <th>Location</th>
+ <th> </th>
</tr>
<!-- TMPL_LOOP NAME="result" -->
<tr>
@@ -259,7 +245,7 @@
<!-- TMPL_VAR NAME="CN" -->
</td>
<td>
- <a href="javascript:jumpfull('/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&index=<!--TMPL_VAR Name="index"-->&bibnum=<!--TMPL_VAR Name="biblionumber"-->&type=intranet&op=fillinput')"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/arrow.gif" alt="choose" width="32" hspace="0" vspace="0" border="0"></a>
+ <a href="javascript:jumpfull('/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&index=<!--TMPL_VAR Name="index"-->&bibnum=<!--TMPL_VAR Name="biblionumber"-->&type=intranet&op=fillinput')">Choose</a>
</td>
</tr>
More information about the Koha-cvs
mailing list