From truth_nz@users.sourceforge.net Thu May  2 19:47:37 2002
From: Gynn Lomax <truth_nz@users.sourceforge.net>
To: koha-devel@lists.koha-community.org
Subject: [Koha-devel] CVS: koha detail.pl,1.3,1.4
Date: Thu, 02 May 2002 19:48:25 +0000
Message-ID: <E173T6d-0006aj-00@usw-pr-cvs1.sourceforge.net>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0826767795949352635=="

--===============0826767795949352635==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv25277

Modified Files:
	detail.pl=20
Log Message:
Bug fixes to get the new acqui.simple system working.


Index: detail.pl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/koha/koha/detail.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** detail.pl	15 Mar 2001 10:17:33 -0000	1.3
--- detail.pl	3 May 2002 02:47:33 -0000	1.4
***************
*** 5,9 ****
 =20
  use strict;
- #use DBI;
  use C4::Search;
  use CGI;
--- 5,8 ----
***************
*** 11,53 ****
 =20
  my $input =3D new CGI;
! print $input->header;
! #whether it is called from the opac of the intranet
! my $type=3D$input->param('type');
! if ($type eq ''){
!   $type=3D'intra';
! }
! #setup colours
  my $main;
  my $secondary;
  if ($type eq 'opac'){
!   $main=3D'#99cccc';
!   $secondary=3D'#efe5ef';
  } else {
!   $main=3D'#cccc99';
!   $secondary=3D'#ffffcc';
! }
  print startpage();
  print startmenu($type);
- #print $type;
- my $blah;
- my $bib=3D$input->param('bib');
- my $title=3D$input->param('title');
- if ($type ne 'opac'){
-   print "<a href=3Drequest.pl?bib=3D$bib><img height=3D42  WIDTH=3D120 BORD=
ER=3D0 src=3D\"/images/requests.gif\" align=3Dright border=3D0></a>";
- }
 =20
 =20
- my @items=3DItemInfo(\$blah,$bib,$type);
- my $dat=3Dbibdata($bib);
- my $count=3D@items;
- my ($count3,$addauthor)=3Daddauthor($bib);
- my $additional=3D$addauthor->[0]->{'author'};                              =
                              =20
- for (my $i=3D1;$i<$count3;$i++){                                           =
                              =20
-   $additional=3D$additional."|".$addauthor->[$i]->{'author'};              =
                              =20
- } =20
- my @temp=3Dsplit('\t',$items[0]);
  if ($type eq 'catmain'){
    print mkheadr(3,"Catalogue Maintenance");
! }
  if ($dat->{'author'} ne ''){
    print mkheadr(3,"$dat->{'title'} ($dat->{'author'}) $temp[4]");
--- 10,56 ----
 =20
  my $input =3D new CGI;
! my $type  =3D $input->param('type');
! my $bib   =3D $input->param('bib');
! my $title =3D $input->param('title');
! my @items =3D &ItemInfo(undef, $bib, $type);
! my $dat   =3D &bibdata($bib);
! my $count =3D @items;
! my ($count3, $addauthor) =3D &addauthor($bib);
! my $additional =3D $addauthor->[0]->{'author'};
! my @temp       =3D split('\t', $items[0]);
  my $main;
  my $secondary;
+=20
+ if ($type eq ''){
+     $type =3D 'opac';
+ } # if
+=20
+ # setup colours
  if ($type eq 'opac'){
!     $main      =3D '#99cccc';
!     $secondary =3D '#efe5ef';
  } else {
!     $main      =3D '#cccc99';
!     $secondary =3D '#ffffcc';
! } # else
!=20
! print $input->header;
  print startpage();
  print startmenu($type);
 =20
+ if ($type ne 'opac'){
+     print << "EOF";
+ <a href=3Drequest.pl?bib=3D$bib><img height=3D42  WIDTH=3D120 BORDER=3D0 sr=
c=3D\"/images/requests.gif\" align=3Dright border=3D0></a>
+ EOF
+ } # if
+=20
+ for (my $i =3D 1; $i < $count3; $i++) {
+     $additional .=3D "|" . $addauthor->[$i]->{'author'};
+ } # for
 =20
  if ($type eq 'catmain'){
    print mkheadr(3,"Catalogue Maintenance");
! } # if
!=20
  if ($dat->{'author'} ne ''){
    print mkheadr(3,"$dat->{'title'} ($dat->{'author'}) $temp[4]");
***************
*** 55,59 ****
    print mkheadr(3,"$dat->{'title'} $temp[4]");
  }
! print <<printend
 =20
  <TABLE  CELLSPACING=3D0  CELLPADDING=3D5 border=3D1 align=3Dleft width=3D"2=
20">
--- 58,62 ----
    print mkheadr(3,"$dat->{'title'} $temp[4]");
  }
! print << "EOF";
 =20
  <TABLE  CELLSPACING=3D0  CELLPADDING=3D5 border=3D1 align=3Dleft width=3D"2=
20">
***************
*** 67,83 ****
 =20
  <td  bgcolor=3D"$main"=20
! printend
! ;
  if ($type ne 'opac'){
   print "background=3D\"/images/background-mem.gif\"";
  }
! print <<printend
  ><B>BIBLIO RECORD=20
! printend
! ;
  if ($type ne 'opac'){
    print "$bib";
  }
! print <<printend
  </TD></TR>
 =20
--- 70,86 ----
 =20
  <td  bgcolor=3D"$main"=20
! EOF
!=20
  if ($type ne 'opac'){
   print "background=3D\"/images/background-mem.gif\"";
  }
! print << "EOF";
  ><B>BIBLIO RECORD=20
! EOF
!=20
  if ($type ne 'opac'){
    print "$bib";
  }
! print << "EOF";
  </TD></TR>
 =20
***************
*** 85,103 ****
  <tr VALIGN=3DTOP  >
  <TD>
! printend
! ;
  if ($type ne 'opac'){
    print "<INPUT TYPE=3D\"image\" name=3D\"submit\"  VALUE=3D\"modify\" heig=
ht=3D42  WIDTH=3D93 BORDER=3D0 src=3D\"/images/modify-mem.gif\">=20
    <INPUT TYPE=3D\"image\" name=3D\"delete\"  VALUE=3D\"delete\" height=3D42=
  WIDTH=3D93 BORDER=3D0 src=3D\"/images/delete-mem.gif\">";
  }
! print <<printend
  <br>
  <FONT SIZE=3D2  face=3D"arial, helvetica">
! printend
! ;
 =20
 =20
  if ($type ne 'opac'){
! print <<printend
  <b>Subtitle:</b> $dat->{'subtitle'}<br>
  <b>Author:</b> $dat->{'author'}<br>
--- 88,105 ----
  <tr VALIGN=3DTOP  >
  <TD>
! EOF
!=20
  if ($type ne 'opac'){
    print "<INPUT TYPE=3D\"image\" name=3D\"submit\"  VALUE=3D\"modify\" heig=
ht=3D42  WIDTH=3D93 BORDER=3D0 src=3D\"/images/modify-mem.gif\">=20
    <INPUT TYPE=3D\"image\" name=3D\"delete\"  VALUE=3D\"delete\" height=3D42=
  WIDTH=3D93 BORDER=3D0 src=3D\"/images/delete-mem.gif\">";
  }
! print << "EOF";
  <br>
  <FONT SIZE=3D2  face=3D"arial, helvetica">
! EOF
 =20
 =20
  if ($type ne 'opac'){
! print << "EOF";
  <b>Subtitle:</b> $dat->{'subtitle'}<br>
  <b>Author:</b> $dat->{'author'}<br>
***************
*** 113,118 ****
  <b>Total Number of Items:</b> $count
  <p>
! printend
! ;
  }
  else {
--- 115,120 ----
  <b>Total Number of Items:</b> $count
  <p>
! EOF
!=20
  }
  else {
***************
*** 149,153 ****
 =20
  }
! print <<printend
  </form>
  </font></TD>
--- 151,155 ----
 =20
  }
! print << "EOF";
  </form>
  </font></TD>
***************
*** 156,165 ****
  </TABLE>
  <img src=3D"/images/holder.gif" width=3D16 height=3D300 align=3Dleft>
!=20
! printend
! ;
!=20
!=20
! #print @items;
 =20
  my $i=3D0;
--- 158,162 ----
  </TABLE>
  <img src=3D"/images/holder.gif" width=3D16 height=3D300 align=3Dleft>
! EOF
 =20
  my $i=3D0;
***************
*** 174,179 ****
  my $colour=3D1;
  while ($i < $count){
! #  print $items[$i],"<br>";
!   my @results=3Dsplit('\t',$items[$i]);
    if ($type ne 'opac'){
      $results[1]=3Dmklink("/cgi-bin/koha/moredetail.pl?item=3D$results[5]&bi=
b=3D$bib&bi=3D$results[8]&type=3D$type",$results[1]);
--- 171,176 ----
  my $colour=3D1;
  while ($i < $count){
!=20
!   my @results =3D split('\t', $items[$i]);
    if ($type ne 'opac'){
      $results[1]=3Dmklink("/cgi-bin/koha/moredetail.pl?item=3D$results[5]&bi=
b=3D$bib&bi=3D$results[8]&type=3D$type",$results[1]);
***************
*** 217,229 ****
  print mktablehdr();
  if ($type ne 'opac'){
! print <<printend
  <TR VALIGN=3DTOP>
  <TD  bgcolor=3D"99cc33" background=3D"/images/background-mem.gif" colspan=
=3D2><p><b>HELP</b><br>
  <b>Update Biblio for all Items:</b> Click on the <b>Modify</b> button [left=
] to amend the biblio.  Any changes you make will update the record for <b>al=
l</b> the items listed above. <p>
  <b>Updating the Biblio for only ONE or SOME Items:</b>=20
! printend
! ;
  if ($type eq 'catmain'){
! print <<printend
  If some of the items listed above need a different biblio,=20
  you need to click on the wrong item, then shift the group it belongs to, to=
 the correct biblio.
--- 214,226 ----
  print mktablehdr();
  if ($type ne 'opac'){
! print << "EOF";
  <TR VALIGN=3DTOP>
  <TD  bgcolor=3D"99cc33" background=3D"/images/background-mem.gif" colspan=
=3D2><p><b>HELP</b><br>
  <b>Update Biblio for all Items:</b> Click on the <b>Modify</b> button [left=
] to amend the biblio.  Any changes you make will update the record for <b>al=
l</b> the items listed above. <p>
  <b>Updating the Biblio for only ONE or SOME Items:</b>=20
! EOF
!=20
  if ($type eq 'catmain'){
! print << "EOF";
  If some of the items listed above need a different biblio,=20
  you need to click on the wrong item, then shift the group it belongs to, to=
 the correct biblio.
***************
*** 232,245 ****
 =20
     </TR>
! printend
! ;
  } else {
! print <<printend
  If some of the items listed above need a different biblio, or are on the wr=
ong biblio, you must use the <a href=3D"acquisitions/">acquisitions</a> proce=
ss to fix this. You will need to "re-order" the items, and delete them from t=
his biblio.
  <p>
 =20
     </TR>
! printend
! ;
  }
  }
--- 229,242 ----
 =20
     </TR>
! EOF
!=20
  } else {
! print << "EOF";
  If some of the items listed above need a different biblio, or are on the wr=
ong biblio, you must use the <a href=3D"acquisitions/">acquisitions</a> proce=
ss to fix this. You will need to "re-order" the items, and delete them from t=
his biblio.
  <p>
 =20
     </TR>
! EOF
!=20
  }
  }



--===============0826767795949352635==--