[Koha-cvs] CVS: koha/updater updatedatabase,1.118,1.119

[Paul POULAIN]

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

Modified Files:
	updatedatabase 
Log Message:
Synch really broke this script...

Index: updatedatabase
===================================================================
RCS file: /cvsroot/koha/koha/updater/updatedatabase,v
retrieving revision 1.118
retrieving revision 1.119
diff -C2 -r1.118 -r1.119
*** updatedatabase	4 Aug 2005 16:02:55 -0000	1.118
--- updatedatabase	4 Aug 2005 16:07:58 -0000	1.119
***************
*** 73,79 ****
--- 73,98 ----
  				    PRIMARY KEY ( `timestamp` , `user` )
  			    )",
+ 	letter		=> "(
+ 					module varchar(20) NOT NULL default '',
+ 					code varchar(20) NOT NULL default '',
+ 					name varchar(100) NOT NULL default '',
+ 					title varchar(200) NOT NULL default '',
+ 					content text,
+ 					PRIMARY KEY  (module,code)
+ 				)",
+ 	alert		=>"(
+ 					alertid int(11) NOT NULL auto_increment,
+ 					borrowernumber int(11) NOT NULL default '0',
+ 					type varchar(10) NOT NULL default '',
+ 					externalid varchar(20) NOT NULL default '',
+ 					PRIMARY KEY  (alertid),
+ 					KEY borrowernumber (borrowernumber),
+ 					KEY type (type,externalid)
+ 				)",
+ 
  );
  
  my %requirefields = (
+ 	subscription => { 'letter' => 'char(20) NULL'},
  #    tablename        => { 'field' => 'fieldtype' },
  );
***************
*** 123,127 ****
  	    type		=> 'YesNo',
          },
! 
      ],
  
--- 142,154 ----
  	    type		=> 'YesNo',
          },
! 		{
!             uniquefieldrequired => 'variable',
!             variable            => 'ReturnBeforeExpiry',
!             value               => 'Off',
! 	    forceupdate		=> { 'explanation' => 1,
! 	    			     'type' => 1},
!             explanation         => 'If Yes, Returndate on issuing can\'t be after borrower card expiry',
! 	    type		=> 'YesNo',
!         },
      ],
  
***************
*** 352,355 ****
--- 379,385 ----
  
  # $Log$
+ # Revision 1.119  2005/08/04 16:07:58  tipaul
+ # Synch really broke this script...
+ #
  # Revision 1.118  2005/08/04 16:02:55  tipaul
  # oops... error in synch between 2.2 and head