[Koha-cvs] CVS: koha/marc marcschema.sql,1.13,1.14

[Paul POULAIN]

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

Modified Files:
	marcschema.sql 
Log Message:
ouuppsss... forget the 1.13 version, i made a mistake. This version works and should be the last


Index: marcschema.sql
===================================================================
RCS file: /cvsroot/koha/koha/marc/marcschema.sql,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** marcschema.sql	4 Jun 2002 07:56:56 -0000	1.13
--- marcschema.sql	4 Jun 2002 08:13:31 -0000	1.14
***************
*** 2,11 ****
  #  
  #  $Log$
! #  Revision 1.13  2002/06/04 07:56:56  tipaul
  #  New and hopefully last version of the MARC-DB. Is the fastest in benchmark, everybody agree ;-) (Sergey, Steve and me, Paul)
  #
  #  Revision 1.13 2002/06/04 Paul
  #  should be the last version... remains only 2 tables : the main table and the subfield one.
! #  benchmark shows this structure is the fastest. I had to add indicator in the subfield table. should be in a tag_table, but as it's the
  #  only real information that should be in this table, it has been thrown to subfield table (not a normal form, but an optimized one...)
  #
--- 2,14 ----
  #  
  #  $Log$
! #  Revision 1.14  2002/06/04 08:13:31  tipaul
! #  ouuppsss... forget the 1.13 version, i made a mistake. This version works and should be the last
! #
! #  Revision 1.13/1.14  2002/06/04 07:56:56  tipaul
  #  New and hopefully last version of the MARC-DB. Is the fastest in benchmark, everybody agree ;-) (Sergey, Steve and me, Paul)
  #
  #  Revision 1.13 2002/06/04 Paul
  #  should be the last version... remains only 2 tables : the main table and the subfield one.
! #  benchmark shows this structure is the fastest. I had to add indicator in the subfield table. should be in a tag_table, but as it s the
  #  only real information that should be in this table, it has been thrown to subfield table (not a normal form, but an optimized one...)
  #
***************
*** 32,46 ****
  
  CREATE TABLE marc_subfield_table (
! 	subfieldid  bigint(20) unsigned NOT NULL auto_increment,	# subfield identifier
! 	tagid bigint(20),					# tag identifier
! 	indicator char(2)					# tag indicator
! 	subfieldorder tinyint(4) NOT NULL default '0',		# display order for subfields within a tag
  	subfieldcode char(1) NOT NULL default '',		# subfield code
! 	subfieldvalue varchar(255) default NULL,			# the subfields value if not longer than 255 char
  	valuebloblink bigint(20) default NULL,			# the link to the blob, if value is longer than 255 char
  	PRIMARY KEY (subfieldid),
- 	KEY tagid (tagid),
- 	KEY tag (tag),
  	KEY bibid (bibid),
  	KEY subfieldorder (subfieldorder),
  	KEY subfieldcode (subfieldcode),
--- 35,51 ----
  
  CREATE TABLE marc_subfield_table (
! 	subfieldid  bigint(20) unsigned NOT NULL auto_increment,# subfield identifier
! 	bibid bigint(20) unsigned NOT NULL, 			# link to marc_biblio table
! 	tag char(3) NOT NULL,					# tag number
! 	tagorder tinyint(4) NOT NULL default '1',		# display order for tags within a biblio when a tag is repeated
! 	tag_indicator char(2) NOT NULL,				# tag indicator
  	subfieldcode char(1) NOT NULL default '',		# subfield code
! 	subfieldorder tinyint(4) NOT NULL default '1',		# display order for subfields within a tag when a subfield is repeated
! 	subfieldvalue varchar(255) default NULL,		# the subfields value if not longer than 255 char
  	valuebloblink bigint(20) default NULL,			# the link to the blob, if value is longer than 255 char
  	PRIMARY KEY (subfieldid),
  	KEY bibid (bibid),
+ 	KEY tag (tag),
+ 	KEY tag_indicator (tag_indicator),
  	KEY subfieldorder (subfieldorder),
  	KEY subfieldcode (subfieldcode),