[Koha-cvs] CVS: koha detail.pl,1.25,1.26 ISBDdetail.pl,1.5,1.6 MARCdetail.pl,1.29,1.30

[Paul POULAIN]

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23879

Modified Files:
	detail.pl ISBDdetail.pl MARCdetail.pl 
Log Message:
1st commit to go to zebra.
don't update your cvs if you want to have a working head...

this commit contains :
* updater/updatedatabase : get rid with marc_* tables, but DON'T remove them. As a lot of things uses them, it would not be a good idea for instance to drop them. If you really want to play, you can rename them to test head without them but being still able to reintroduce them...
* Biblio.pm : modify MARCgetbiblio to find the raw marc record in biblioitems.marc field, not from marc_subfield_table, modify MARCfindframeworkcode to find frameworkcode in biblio.frameworkcode, modify some other subs to use biblio.biblionumber & get rid of bibid.
* other files : get rid of bibid and use biblionumber instead.

What is broken :
* does not do anything on zebra yet.
* if you rename marc_subfield_table, you can't search anymore.
* you can view a biblio & bibliodetails, go to MARC editor, but NOT save any modif.
* don't try to add a biblio, it would add data poorly... (don't try to delete either, it may work, but that would be a surprise ;-) )

IMPORTANT NOTE : you need MARC::XML package (http://search.cpan.org/~esummers/MARC-XML-0.7/lib/MARC/File/XML.pm), that requires a recent version of MARC::Record
Updatedatabase stores the iso2709 data in biblioitems.marc field & an xml version in biblioitems.marcxml Not sure we will keep it when releasing the stable version, but I think it's a good idea to have something readable in sql, at least for development stage.

Index: detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/detail.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** detail.pl	1 Mar 2005 13:40:47 -0000	1.25
--- detail.pl	9 Aug 2005 14:10:32 -0000	1.26
***************
*** 20,24 ****
  			     });
  
! my $biblionumber=$query->param('bib');
  $template->param(biblionumber => $biblionumber);
  
--- 20,24 ----
  			     });
  
! my $biblionumber=$query->param('biblionumber');
  $template->param(biblionumber => $biblionumber);
  
***************
*** 51,58 ****
  if ($marc eq "yes") {
  	my $dbh = C4::Context->dbh;
- 	my $bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblionumber);
  	my $marcflavour = C4::Context->preference("marcflavour");
! 	my $marcnotesarray = &getMARCnotes($dbh,$bibid,$marcflavour);
! 	my $marcsubjctsarray = &getMARCsubjects($dbh,$bibid,$marcflavour);
  
  	$template->param(MARCNOTES => $marcnotesarray);
--- 51,57 ----
  if ($marc eq "yes") {
  	my $dbh = C4::Context->dbh;
  	my $marcflavour = C4::Context->preference("marcflavour");
! 	my $marcnotesarray = &getMARCnotes($dbh,$biblionumber,$marcflavour);
! 	my $marcsubjctsarray = &getMARCsubjects($dbh,$biblionumber,$marcflavour);
  
  	$template->param(MARCNOTES => $marcnotesarray);

Index: ISBDdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/ISBDdetail.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** ISBDdetail.pl	1 Mar 2005 13:40:35 -0000	1.5
--- ISBDdetail.pl	9 Aug 2005 14:10:34 -0000	1.6
***************
*** 54,65 ****
  my $dbh=C4::Context->dbh;
  
! my $biblionumber=$query->param('bib');
! my $bibid = $query->param('bibid');
! $bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblionumber) unless $bibid;
! $biblionumber = &MARCfind_oldbiblionumber_from_MARCbibid($dbh,$bibid) unless $biblionumber;
! my $itemtype = &MARCfind_frameworkcode($dbh,$bibid);
  my $tagslib = &MARCgettagslib($dbh,1,$itemtype);
  
! my $record =MARCgetbiblio($dbh,$bibid);
  # open template
  my ($template, $loggedinuser, $cookie)
--- 54,62 ----
  my $dbh=C4::Context->dbh;
  
! my $biblionumber=$query->param('biblionumber');
! my $itemtype = &MARCfind_frameworkcode($dbh,$biblionumber);
  my $tagslib = &MARCgettagslib($dbh,1,$itemtype);
  
! my $record =MARCgetbiblio($dbh,$biblionumber);
  # open template
  my ($template, $loggedinuser, $cookie)

Index: MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/MARCdetail.pl,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** MARCdetail.pl	3 Aug 2005 12:50:08 -0000	1.29
--- MARCdetail.pl	9 Aug 2005 14:10:34 -0000	1.30
***************
*** 65,81 ****
  
  my $biblionumber=$query->param('bib');
! my $bibid = $query->param('bibid');
  my $itemtype = $query->param('frameworkcode');
  my $popup = $query->param('popup'); # if set to 1, then don't insert links, it's just to show the biblio
  
! $bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblionumber) unless $bibid;
! $biblionumber = &MARCfind_oldbiblionumber_from_MARCbibid($dbh,$bibid) unless $biblionumber;
! $itemtype = &MARCfind_frameworkcode($dbh,$bibid) if not ($itemtype);
  $itemtype = '' if ($itemtype eq 'Default');
! warn "itemtype :".$itemtype;
  
  my $tagslib = &MARCgettagslib($dbh,1,$itemtype);
  
! my $record =MARCgetbiblio($dbh,$bibid);
  # open template
  my ($template, $loggedinuser, $cookie)
--- 65,81 ----
  
  my $biblionumber=$query->param('bib');
! # my $bibid = $query->param('bibid');
  my $itemtype = $query->param('frameworkcode');
  my $popup = $query->param('popup'); # if set to 1, then don't insert links, it's just to show the biblio
  
! # $bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblionumber) unless $bibid;
! # $biblionumber = &MARCfind_oldbiblionumber_from_MARCbibid($dbh,$bibid) unless $biblionumber;
! $itemtype = &MARCfind_frameworkcode($dbh,$biblionumber) if not ($itemtype);
  $itemtype = '' if ($itemtype eq 'Default');
! # warn "itemtype :".$itemtype;
  
  my $tagslib = &MARCgettagslib($dbh,1,$itemtype);
  
! my $record =MARCgetbiblio($dbh,$biblionumber);
  # open template
  my ($template, $loggedinuser, $cookie)
***************
*** 226,230 ****
  						item_header_loop => \@header_value_loop,
  						biblionumber => $biblionumber,
! 						bibid => $bibid,
  						biblionumber => $biblionumber,
  						subscriptionsnumber => $subscriptionsnumber,
--- 226,230 ----
  						item_header_loop => \@header_value_loop,
  						biblionumber => $biblionumber,
! # 						bibid => $bibid,
  						biblionumber => $biblionumber,
  						subscriptionsnumber => $subscriptionsnumber,