[Bio] / Sprout / Sprout.pm Repository:
ViewVC logotype

Diff of /Sprout/Sprout.pm

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.47, Thu Oct 20 12:02:43 2005 UTC revision 1.48, Thu Oct 20 12:33:00 2005 UTC
# Line 1176  Line 1176 
1176          # Get the annotation fields.          # Get the annotation fields.
1177          my ($timeStamp, $text, $user) = @{$annotation};          my ($timeStamp, $text, $user) = @{$annotation};
1178          # Check to see if this is a functional assignment.          # Check to see if this is a functional assignment.
1179          my ($type, $function) = _ParseAssignment($text);          my ($actualUser, $function) = _ParseAssignment($user, $text);
1180          if ($type && ! exists $retVal{$user}) {          if ($actualUser && ! exists $retVal{$actualUser}) {
1181              # Here it is a functional assignment and there has been no              # Here it is a functional assignment and there has been no
1182              # previous assignment for this user, so we stuff it in the              # previous assignment for this user, so we stuff it in the
1183              # return hash.              # return hash.
1184              $retVal{$user} = $function;              $retVal{$actualUser} = $function;
1185          }          }
1186      }      }
1187      # Return the hash of assignments found.      # Return the hash of assignments found.
# Line 1259  Line 1259 
1259              }              }
1260          }          }
1261          # Build a query for all of the feature's annotations, sorted by date.          # Build a query for all of the feature's annotations, sorted by date.
1262          my $query = $self->Get(['IsTargetOfAnnotation', 'Annotation'],          my $query = $self->Get(['IsTargetOfAnnotation', 'Annotation', 'MadeAnnotation'],
1263                                 "IsTargetOfAnnotation(from-link) = ? ORDER BY Annotation(time) DESC",                                 "IsTargetOfAnnotation(from-link) = ? ORDER BY Annotation(time) DESC",
1264                                 [$featureID]);                                 [$featureID]);
1265          my $timeSelected = 0;          my $timeSelected = 0;
1266          # Loop until we run out of annotations.          # Loop until we run out of annotations.
1267          while (my $annotation = $query->Fetch()) {          while (my $annotation = $query->Fetch()) {
1268              # Get the annotation text.              # Get the annotation text.
1269              my ($text, $time) = $annotation->Values(['Annotation(annotation)','Annotation(time)']);              my ($text, $time, $user) = $annotation->Values(['Annotation(annotation)',
1270                                                         'Annotation(time)', 'MadeAnnotation(from-link)']);
1271              # Check to see if this is a functional assignment for a trusted user.              # Check to see if this is a functional assignment for a trusted user.
1272              my ($user, $function) = _ParseAssignment($text);              my ($actualUser, $function) = _ParseAssignment($user, $text);
1273              if ($user) {              if ($actualUser) {
1274                  # Here it is a functional assignment. Check the time and the user                  # Here it is a functional assignment. Check the time and the user
1275                  # name. The time must be recent and the user must be trusted.                  # name. The time must be recent and the user must be trusted.
1276                  if ((exists $trusteeTable{$user}) && ($time > $timeSelected)) {                  if ((exists $trusteeTable{$user}) && ($time > $timeSelected)) {
# Line 1331  Line 1332 
1332          # users.          # users.
1333          my %trusteeTable = ();          my %trusteeTable = ();
1334          # Build a query for all of the feature's annotations, sorted by date.          # Build a query for all of the feature's annotations, sorted by date.
1335          my $query = $self->Get(['IsTargetOfAnnotation', 'Annotation'],          my $query = $self->Get(['IsTargetOfAnnotation', 'Annotation', 'MadeAnnotation'],
1336                                 "IsTargetOfAnnotation(from-link) = ? ORDER BY Annotation(time) DESC",                                 "IsTargetOfAnnotation(from-link) = ? ORDER BY Annotation(time) DESC",
1337                                 [$featureID]);                                 [$featureID]);
1338          my $timeSelected = 0;          my $timeSelected = 0;
1339          # Loop until we run out of annotations.          # Loop until we run out of annotations.
1340          while (my $annotation = $query->Fetch()) {          while (my $annotation = $query->Fetch()) {
1341              # Get the annotation text.              # Get the annotation text.
1342              my ($text, $time) = $annotation->Values(['Annotation(annotation)','Annotation(time)']);              my ($text, $time, $user) = $annotation->Values(['Annotation(annotation)',
1343                                                                'Annotation(time)',
1344                                                                'MadeAnnotation(user)']);
1345              # Check to see if this is a functional assignment for a trusted user.              # Check to see if this is a functional assignment for a trusted user.
1346              my ($user, $function) = _ParseAssignment($text);              my ($actualUser, $function) = _ParseAssignment($user, $text);
1347              if ($user) {              if ($actualUser) {
1348                  # Here it is a functional assignment.                  # Here it is a functional assignment.
1349                  push @retVal, [$user, $function];                  push @retVal, [$actualUser, $function];
1350              }              }
1351          }          }
1352      } else {      } else {
1353          # Here we have a non-FIG feature ID. In this case the user ID does not          # Here we have a non-FIG feature ID. In this case the user ID does not
1354          # matter. We simply get the information from the External Alias Function          # matter. We simply get the information from the External Alias Function
1355          # table.          # table.
1356          push @retVal, $self->GetEntityValues('ExternalAliasFunc', $featureID, ['ExternalAliasFunc(func)']);          my @assignments = $self->GetEntityValues('ExternalAliasFunc', $featureID,
1357                                                     ['ExternalAliasFunc(func)']);
1358            push @retVal, map { ['master', $_] } @assignments;
1359      }      }
1360      # Return the assignments found.      # Return the assignments found.
1361      return @retVal;      return @retVal;
# Line 3225  Line 3230 
3230    
3231  A functional assignment is always of the form  A functional assignment is always of the form
3232    
3233      I<XXXX>C<\nset >I<YYYY>C< function to\n>I<ZZZZZ>      C<set >I<YYYY>C< function to\n>I<ZZZZZ>
3234    
3235  where I<XXXX> is the B<assigning user>, I<YYYY> is the B<user>, and I<ZZZZ> is the  where I<YYYY> is the B<user>, and I<ZZZZ> is the actual functional role. In most cases,
3236  actual functional role. In most cases, the user and the assigning user will be the  the user and the assigning user (from MadeAnnotation) will be the same, but that is
3237  same, but that is not always the case.  not always the case.
3238    
3239  This is a static method.  This is a static method.
3240    
3241  =over 4  =over 4
3242    
3243    =item user
3244    
3245    Name of the assigning user.
3246    
3247  =item text  =item text
3248    
3249  Text of the annotation.  Text of the annotation.
# Line 3250  Line 3259 
3259    
3260  sub _ParseAssignment {  sub _ParseAssignment {
3261      # Get the parameters.      # Get the parameters.
3262      my ($text) = @_;      my ($user, $text) = @_;
3263      # Declare the return value.      # Declare the return value.
3264      my @retVal = ();      my @retVal = ();
3265      # Check to see if this is a functional assignment.      # Check to see if this is a functional assignment.
3266      my ($type, $function) = split(/\n/, $text);      my ($type, $function) = split(/\n/, $text);
3267      if ($type =~ m/^set ([^ ]+) function to$/i) {      if ($type =~ m/^set function to$/i) {
3268          # Here it is, so we return the user name (which is in $1), the functional role text,          # Here we have an assignment without a user, so we use the incoming user ID.
3269          # and the assigning user.          @retVal = ($user, $function);
3270        } elsif ($type =~ m/^set (\S+) function to$/i) {
3271            # Here we have an assignment with a user, that is passed back to the caller.
3272          @retVal = ($1, $function);          @retVal = ($1, $function);
3273      }      }
3274      # Return the result list.      # Return the result list.
# Line 3347  Line 3358 
3358      $self->Insert('HasProperty', { 'from-link' => $featureID, 'to-link' => $propID, evidence => $url });      $self->Insert('HasProperty', { 'from-link' => $featureID, 'to-link' => $propID, evidence => $url });
3359  }  }
3360    
   
   
3361  1;  1;

Legend:
Removed from v.1.47  
changed lines
  Added in v.1.48

MCS Webmaster
ViewVC Help
Powered by ViewVC 1.0.3