[Koha-cvs] CVS: koha/updater updatedatabase,1.83,1.84

[Paul POULAIN]

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

Modified Files:
	updatedatabase 
Log Message:
DB modifs : merging tag & subfield in marc_word table

Index: updatedatabase
===================================================================
RCS file: /cvsroot/koha/koha/updater/updatedatabase,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -r1.83 -r1.84
*** updatedatabase	10 Jun 2004 08:32:02 -0000	1.83
--- updatedatabase	17 Jun 2004 08:25:21 -0000	1.84
***************
*** 266,288 ****
  						KEY authid (authid),
  						KEY tag (tag),
- 						KEY tag_indicator (tag_indicator),
- 						KEY subfieldorder (subfieldorder),
  						KEY subfieldcode (subfieldcode),
! 						KEY subfieldvalue (subfieldvalue),
! 						KEY tagorder (tagorder)
  					)",
      auth_word => "(
  				authid bigint(20) NOT NULL default '0',
! 				tag char(3) NOT NULL default '',
  				tagorder tinyint(4) NOT NULL default '1',
- 				subfieldid char(1) NOT NULL default '',
  				subfieldorder tinyint(4) NOT NULL default '1',
  				word varchar(255) NOT NULL default '',
  				sndx_word varchar(255) NOT NULL default '',
  				KEY authid (authid),
! 				KEY tag (tag),
! 				KEY tagorder (tagorder),
! 				KEY subfieldid (subfieldid),
! 				KEY subfieldorder (subfieldorder),
  				KEY word (word),
  				KEY sndx_word (sndx_word)
--- 266,281 ----
  						KEY authid (authid),
  						KEY tag (tag),
  						KEY subfieldcode (subfieldcode),
! 						KEY subfieldvalue (subfieldvalue)
  					)",
      auth_word => "(
  				authid bigint(20) NOT NULL default '0',
! 				tagsubfield char(4) NOT NULL default '',
  				tagorder tinyint(4) NOT NULL default '1',
  				subfieldorder tinyint(4) NOT NULL default '1',
  				word varchar(255) NOT NULL default '',
  				sndx_word varchar(255) NOT NULL default '',
  				KEY authid (authid),
! 				KEY marc_search (tagsubfield,word),
  				KEY word (word),
  				KEY sndx_word (sndx_word)
***************
*** 682,685 ****
--- 675,687 ----
  	    type		=> 'free'
          },
+         {
+             uniquefieldrequired => 'variable',
+             variable            => 'virtualshelves',
+ 	    forceupdate		=> { 'explanation' => 1,
+ 	    			     'type' => 1 },
+             value               => '0',
+             explanation => 'Set virtual shelves management ON or OFF',
+ 	    type		=> 'YesNo'
+         },
      ],
  
***************
*** 1150,1153 ****
--- 1152,1173 ----
  $dbh->do('ALTER TABLE marc_subfield_structure ADD PRIMARY KEY ( frameworkcode, tagfield, tagsubfield )');
  
+ # Get list of columns from marc_word table
+ my %marc_word;
+ my %nullenabled;
+ $sth = $dbh->prepare("show columns from marc_word");
+ $sth->execute;
+ while ( my ( $column, $type, $null, $key, $default, $extra ) = $sth->fetchrow )
+ {
+     $marc_word{$column} = $type;
+     $nullenabled{$column} = $null;
+ }
+ if ($marc_word{subfieldid}) {
+ 	#create field tagsubfield, copy tag+subfieldid, then drop tag and subfieldid
+ 	print "Modifying marc_word (concat on tag and subfield for better perfs)\n";
+ 	$dbh->do("ALTER TABLE `marc_word` ADD `tagsubfield` CHAR( 4 ) NOT NULL AFTER `bibid`");
+ 	$dbh->do("update marc_word set tagsubfield=concat(tag,subfieldid)");
+ 	$dbh->do("alter table marc_word drop tag");
+ 	$dbh->do("alter table marc_word drop subfieldid");
+ }
  # Populate tables with required data
  
***************
*** 1201,1204 ****
--- 1221,1227 ----
  
  # $Log$
+ # Revision 1.84  2004/06/17 08:25:21  tipaul
+ # DB modifs : merging tag & subfield in marc_word table
+ #
  # Revision 1.83  2004/06/10 08:32:02  tipaul
  # MARC authority management (continued)