[Miamexpress-development] scripts/magexpress/BioAssay DerivedBioAssay_Exp.pm,1.10,1.11

[<sh...@us...>]

Update of /cvsroot/miamexpress/scripts/magexpress/BioAssay
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28529/BioAssay

Modified Files:
	DerivedBioAssay_Exp.pm 
Log Message:
1)Handling multiple hybs per FGEM column 2)handling new QTs which are among old ones in datafiles with the same authority

Index: DerivedBioAssay_Exp.pm
===================================================================
RCS file: /cvsroot/miamexpress/scripts/magexpress/BioAssay/DerivedBioAssay_Exp.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** DerivedBioAssay_Exp.pm	31 May 2005 10:50:02 -0000	1.10
--- DerivedBioAssay_Exp.pm	26 Aug 2005 14:58:18 -0000	1.11
***************
*** 91,95 ****
      $self->addDerivedBioAssayData($obj);
  
!     $ExperimentObject->addBioAssayData($obj);
  
      return $rc;
--- 91,107 ----
      $self->addDerivedBioAssayData($obj);
  
!     # Note that all DBAs point to the same unique DBAD, so we sould prevent adding it twice:
! 
!     my $array_ref = $ExperimentObject->getBioAssayData();
!     my $found = 0;
!     foreach (@$array_ref) {
! 	
! 	if ($_ == $obj) {
! 	    $found=1;
! 	    last;
! 	}
!     }
!     
!     $ExperimentObject->addBioAssayData($obj) unless ($found);
  
      return $rc;
***************
*** 178,182 ****
      my $rc = STATUS_OK;
  
!     my $bioassaymap = BioAssayMap_Exp->ReturnOwnRef();
  
      $self->addDerivedBioAssayMap($bioassaymap);
--- 190,194 ----
      my $rc = STATUS_OK;
  
!     my $bioassaymap = BioAssayMap_Exp->ReturnOwnRef($self->getSysuid(),$self->getColNumber());
  
      $self->addDerivedBioAssayMap($bioassaymap);
***************
*** 368,381 ****
      shift;
      my $uid = shift;
      my $obj;
  
!     if (!defined($DerivedBioAssayExpObject)) {
! 	
! 	$obj = DerivedBioAssay_Exp->new();
! 	$obj->setSysuid($uid);
! 	$DerivedBioAssayExpObject = $obj;
      }
!     else {
! 	$obj = $DerivedBioAssayExpObject;
      }
  
--- 380,401 ----
      shift;
      my $uid = shift;
+     my $colnumber = shift;
      my $obj;
  
! 
!     foreach (@DerivedBioAssayExpObjects) {
! 
! 	if ( ($uid eq $_->getSysuid)) {
! 	    $obj = $_;
! 	    last;
! 	}
      }
! 
!     if (!defined($obj)) {
! 
! 	$obj = DerivedBioAssay_Exp->new();
! 	$obj->setSysuid( $uid);
! 	$obj->setColNumber( $colnumber);
! 	push( @DerivedBioAssayExpObjects , $obj);
      }
  
***************
*** 404,410 ****
  
      #'DBA:'.$MX_system_options->experiment_uniqid . ":GEM";
!     return $MX_system_options->authority.":".$MX_system_options->namespace.":DerivedBioAssay".":". $MX_system_options->experiment_uniqid . "." . "GEM";
  }
  
  
  1;
--- 424,451 ----
  
      #'DBA:'.$MX_system_options->experiment_uniqid . ":GEM";
!     return $MX_system_options->authority.":".$MX_system_options->namespace.":DerivedBioAssay".":". $MX_system_options->experiment_uniqid . "." . "GEM".$self->getColNumber();
! }
! 
! 
! 
! #attributes ('colNumber'); correspond to the column for which we create this DBA object.
! 
! sub setColNumber {
!   my $self = shift;
!   croak(__PACKAGE__ . "::setColNumber: no arguments passed to setter")
!     unless @_;
!   croak(__PACKAGE__ . "::setColNumber: too many arguments passed to setter")
!     if @_ > 1;
!   my $val = shift;
!   
!   return $self->{__COLNUMBER} = $val;
  }
  
+ sub getColNumber {
+   my $self = shift;
+   croak(__PACKAGE__ . "::getColNumber: arguments passed to getter")
+     if @_;
+   return $self->{__COLNUMBER};
+ }
  
  1;