[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.6, Wed Jan 26 17:41:53 2005 UTC revision 1.92, Mon Oct 16 07:41:50 2006 UTC
# Line 1  Line 1 
1  package Sprout;  package Sprout;
2    
3        require Exporter;
4        use ERDB;
5        @ISA = qw(Exporter ERDB);
6          use Data::Dumper;          use Data::Dumper;
7          use strict;          use strict;
8          use Carp;          use Carp;
# Line 7  Line 10 
10          use XML::Simple;          use XML::Simple;
11          use DBQuery;          use DBQuery;
12          use DBObject;          use DBObject;
         use ERDB;  
13          use Tracer;          use Tracer;
14          use FIGRules;          use FIGRules;
15        use FidCheck;
16          use Stats;          use Stats;
17      use POSIX qw(strftime);      use POSIX qw(strftime);
18        use BasicLocation;
19    
20  =head1 Sprout Database Manipulation Object  =head1 Sprout Database Manipulation Object
21    
# Line 32  Line 35 
35  query tasks. For example, L</genomes> lists the IDs of all the genomes in the database and  query tasks. For example, L</genomes> lists the IDs of all the genomes in the database and
36  L</dna_seq> returns the DNA sequence for a specified genome location.  L</dna_seq> returns the DNA sequence for a specified genome location.
37    
38    The Sprout object is a subclass of the ERDB object and inherits all its properties and methods.
39    
40  =cut  =cut
41    
42  #: Constructor SFXlate->new_sprout_only();  #: Constructor SFXlate->new_sprout_only();
# Line 62  Line 67 
67    
68  * B<xmlFileName> name of the XML file containing the database definition (default C<SproutDBD.xml>)  * B<xmlFileName> name of the XML file containing the database definition (default C<SproutDBD.xml>)
69    
70  * B<userData> user name and password, delimited by a slash (default C<root/>)  * B<userData> user name and password, delimited by a slash (default same as SEED)
71    
72  * B<port> connection port (default C<0>)  * B<port> connection port (default C<0>)
73    
74    * B<sock> connection socket (default same as SEED)
75    
76  * B<maxSegmentLength> maximum number of residues per feature segment, (default C<4500>)  * B<maxSegmentLength> maximum number of residues per feature segment, (default C<4500>)
77    
78  * B<maxSequenceLength> maximum number of residues per sequence, (default C<8000>)  * B<maxSequenceLength> maximum number of residues per sequence, (default C<8000>)
79    
80    * B<noDBOpen> suppresses the connection to the database if TRUE, else FALSE
81    
82  =back  =back
83    
84  For example, the following constructor call specifies a database named I<Sprout> and a user name of  For example, the following constructor call specifies a database named I<Sprout> and a user name of
# Line 83  Line 92 
92  sub new {  sub new {
93          # Get the parameters.          # Get the parameters.
94          my ($class, $dbName, $options) = @_;          my ($class, $dbName, $options) = @_;
95        # Compute the DBD directory.
96        my $dbd_dir = (defined($FIG_Config::dbd_dir) ? $FIG_Config::dbd_dir :
97                                                      $FIG_Config::fig );
98          # Compute the options. We do this by starting with a table of defaults and overwriting with          # Compute the options. We do this by starting with a table of defaults and overwriting with
99          # the incoming data.          # the incoming data.
100          my $optionTable = Tracer::GetOptions({          my $optionTable = Tracer::GetOptions({
101                                             dbType               => 'mysql',                     # database type                         dbType       => $FIG_Config::dbms,
102                                             dataDir              => 'Data',                      # data file directory                                                          # database type
103                                             xmlFileName  => 'SproutDBD.xml', # database definition file name                         dataDir      => $FIG_Config::sproutData,
104                                             userData             => 'root/',                     # user name and password                                                          # data file directory
105                                             port                 => 0,                           # database connection port                         xmlFileName  => "$dbd_dir/SproutDBD.xml",
106                                                            # database definition file name
107                           userData     => "$FIG_Config::dbuser/$FIG_Config::dbpass",
108                                                            # user name and password
109                           port         => $FIG_Config::dbport,
110                                                            # database connection port
111                           sock         => $FIG_Config::dbsock,
112                           host         => $FIG_Config::dbhost,
113                                             maxSegmentLength => 4500,            # maximum feature segment length                                             maxSegmentLength => 4500,            # maximum feature segment length
114                                             maxSequenceLength => 8000,           # maximum contig sequence length                                             maxSequenceLength => 8000,           # maximum contig sequence length
115                           noDBOpen     => 0,               # 1 to suppress the database open
116                                            }, $options);                                            }, $options);
117          # Get the data directory.          # Get the data directory.
118          my $dataDir = $optionTable->{dataDir};          my $dataDir = $optionTable->{dataDir};
# Line 100  Line 120 
120          $optionTable->{userData} =~ m!([^/]*)/(.*)$!;          $optionTable->{userData} =~ m!([^/]*)/(.*)$!;
121          my ($userName, $password) = ($1, $2);          my ($userName, $password) = ($1, $2);
122          # Connect to the database.          # Connect to the database.
123          my $dbh = DBKernel->new($optionTable->{dbType}, $dbName, $userName, $password, $optionTable->{port});      my $dbh;
124        if (! $optionTable->{noDBOpen}) {
125            $dbh = DBKernel->new($optionTable->{dbType}, $dbName, $userName,
126                                    $password, $optionTable->{port}, $optionTable->{host}, $optionTable->{sock});
127        }
128          # Create the ERDB object.          # Create the ERDB object.
129          my $xmlFileName = "$optionTable->{xmlFileName}";          my $xmlFileName = "$optionTable->{xmlFileName}";
130          my $erdb = ERDB->new($dbh, $xmlFileName);      my $retVal = ERDB::new($class, $dbh, $xmlFileName);
131          # Create this object.      # Add the option table and XML file name.
132          my $self = { _erdb => $erdb, _options => $optionTable, _xmlName => $xmlFileName };      $retVal->{_options} = $optionTable;
133          # Bless and return it.      $retVal->{_xmlName} = $xmlFileName;
134          bless $self;      # Set up space for the group file data.
135          return $self;      $retVal->{groupHash} = undef;
136        # Return it.
137        return $retVal;
138  }  }
139    
140  =head3 MaxSegment  =head3 MaxSegment
# Line 124  Line 150 
150  =cut  =cut
151  #: Return Type $;  #: Return Type $;
152  sub MaxSegment {  sub MaxSegment {
153          my $self = shift @_;      my ($self) = @_;
154          return $self->{_options}->{maxSegmentLength};          return $self->{_options}->{maxSegmentLength};
155  }  }
156    
# Line 139  Line 165 
165  =cut  =cut
166  #: Return Type $;  #: Return Type $;
167  sub MaxSequence {  sub MaxSequence {
168          my $self = shift @_;      my ($self) = @_;
169          return $self->{_options}->{maxSequenceLength};          return $self->{_options}->{maxSequenceLength};
170  }  }
171    
172  =head3 Get  =head3 Load
   
 C<< my $query = $sprout->Get(\@objectNames, $filterClause, \@parameterList); >>  
   
 This method allows a general query against the Sprout data using a specified filter clause.  
   
 The filter is a standard WHERE/ORDER BY clause with question marks as parameter markers and each  
 field name represented in the form B<I<objectName>(I<fieldName>)>. For example, the  
 following call requests all B<Genome> objects for the genus specified in the variable  
 $genus.  
   
 C<< $query = $sprout->Get(['Genome'], "Genome(genus) = ?", [$genus]); >>  
   
 The WHERE clause contains a single question mark, so there is a single additional  
 parameter representing the parameter value. It would also be possible to code  
   
 C<< $query = $sprout->Get(['Genome'], "Genome(genus) = \'$genus\'"); >>  
   
 however, this version of the call would generate a syntax error if there were any quote  
 characters inside the variable C<$genus>.  
   
 The use of the strange parenthesized notation for field names enables us to distinguish  
 hyphens contained within field names from minus signs that participate in the computation  
 of the WHERE clause. All of the methods that manipulate fields will use this same notation.  
   
 It is possible to specify multiple entity and relationship names in order to retrieve more than  
 one object's data at the same time, which allows highly complex joined queries. For example,  
   
 C<< $query = $sprout->Get(['Genome', 'ComesFrom', 'Source'], "Genome(genus) = ?", [$genus]); >>  
   
 This query returns all the genomes for a particular genus and allows access to the  
 sources from which they came. The join clauses to go from Genome to Source are generated  
 automatically.  
   
 Finally, the filter clause can contain sort information. To do this, simply put an C<ORDER BY>  
 clause at the end of the filter. Field references in the ORDER BY section follow the same rules  
 as they do in the filter itself; in other words, each one must be of the form B<I<objectName>(I<fieldName>)>.  
 For example, the following filter string gets all genomes for a particular genus and sorts  
 them by species name.  
   
 C<< $query = $sprout->Get(['Genome'], "Genome(genus) = ? ORDER BY Genome(species)", [$genus]); >>  
173    
174  It is also permissible to specify I<only> an ORDER BY clause. For example, the following invocation gets  C<< $sprout->Load($rebuild); >>;
 all genomes ordered by genus and species.  
175    
176  C<< $query = $sprout->Get(['Genome'], "ORDER BY Genome(genus), Genome(species)"); >>  Load the database from files in the data directory, optionally re-creating the tables.
177    
178  Odd things may happen if one of the ORDER BY fields is in a secondary relation. So, for example, an  This method always deletes the data from the database before loading, even if the tables are not
179  attempt to order B<Feature>s by alias may (depending on the underlying database engine used) cause  re-created. The data is loaded into the relations from files in the data directory either having the
180  a single feature to appear more than once.  same name as the target relation with no extension or with an extension of C<.dtx>. Files without an
181    extension are used in preference to the files with an extension.
182    
183  If multiple names are specified, then the query processor will automatically determine a  The files are loaded based on the presumption that each line of the file is a record in the
184  join path between the entities and relationships. The algorithm used is very simplistic.  relation, and the individual fields are delimited by tabs. Tab and new-line characters inside
185  In particular, you can't specify any entity or relationship more than once, and if a  fields must be represented by the escape sequences C<\t> and C<\n>, respectively. The fields must
186  relationship is recursive, the path is determined by the order in which the entity  be presented in the order given in the relation tables produced by the L</ShowMetaData> method.
 and the relationship appear. For example, consider a recursive relationship B<IsParentOf>  
 which relates B<People> objects to other B<People> objects. If the join path is  
 coded as C<['People', 'IsParentOf']>, then the people returned will be parents. If, however,  
 the join path is C<['IsParentOf', 'People']>, then the people returned will be children.  
187    
188  =over 4  =over 4
189    
190  =item objectNames  =item rebuild
   
 List containing the names of the entity and relationship objects to be retrieved.  
   
 =item filterClause  
   
 WHERE/ORDER BY clause (without the WHERE) to be used to filter and sort the query. The WHERE clause can  
 be parameterized with parameter markers (C<?>). Each field used must be specified in the standard form  
 B<I<objectName>(I<fieldName>)>. Any parameters specified in the filter clause should be added to the  
 parameter list as additional parameters. The fields in a filter clause can come from primary  
 entity relations, relationship relations, or secondary entity relations; however, all of the  
 entities and relationships involved must be included in the list of object names.  
   
 =item parameterList  
191    
192  List of the parameters to be substituted in for the parameters marks in the filter clause.  TRUE if the data tables need to be created or re-created, else FALSE
193    
194  =item RETURN  =item RETURN
195    
196  Returns a B<DBQuery> that can be used to iterate through all of the results.  Returns a statistical object containing the number of records read, the number of duplicates found,
197    the number of errors, and a list of the error messages.
198    
199  =back  =back
200    
201  =cut  =cut
202    #: Return Type %;
203  sub Get {  sub Load {
204          # Get the parameters.          # Get the parameters.
205          my $self = shift @_;      my ($self, $rebuild) = @_;
206          my ($objectNames, $filterClause, $parameterList) = @_;      # Load the tables from the data directory.
207          # We differ from the ERDB Get method in that the parameter list is passed in as a list reference      my $retVal = $self->LoadTables($self->{_options}->{dataDir}, $rebuild);
208          # rather than a list of parameters. The next step is to convert the parameters from a reference      # Return the statistics.
209          # to a real list. We can only do this if the parameters have been specified.      return $retVal;
         my @parameters;  
         if ($parameterList) { @parameters = @{$parameterList}; }  
         return $self->{_erdb}->Get($objectNames, $filterClause, @parameters);  
210  }  }
211    
212  =head3 GetEntity  =head3 LoadUpdate
213    
214  C<< my $entityObject = $sprout->GetEntity($entityType, $ID); >>  C<< my $stats = $sprout->LoadUpdate($truncateFlag, \@tableList); >>
215    
216  Return an object describing the entity instance with a specified ID.  Load updates to one or more database tables. This method enables the client to make changes to one
217    or two tables without reloading the whole database. For each table, there must be a corresponding
218    file in the data directory, either with the same name as the table, or with a C<.dtx> suffix. So,
219    for example, to make updates to the B<FeatureTranslation> relation, there must be a
220    C<FeatureTranslation.dtx> file in the data directory. Unlike a full load, files without an extension
221    are not examined. This allows update files to co-exist with files from an original load.
222    
223  =over 4  =over 4
224    
225  =item entityType  =item truncateFlag
226    
227  Entity type name.  TRUE if the tables should be rebuilt before loading, else FALSE. A value of TRUE therefore causes
228    current data and schema of the tables to be replaced, while a value of FALSE means the new data
229    is added to the existing data in the various relations.
230    
231  =item ID  =item tableList
232    
233  ID of the desired entity.  List of the tables to be updated.
234    
235  =item RETURN  =item RETURN
236    
237  Returns a B<DBObject> representing the desired entity instance, or an undefined value if no  Returns a statistical object containing the number of records read, the number of duplicates found,
238  instance is found with the specified key.  the number of errors encountered, and a list of error messages.
239    
240  =back  =back
241    
242  =cut  =cut
243    #: Return Type $%;
244  sub GetEntity {  sub LoadUpdate {
245          # Get the parameters.          # Get the parameters.
246          my $self = shift @_;      my ($self, $truncateFlag, $tableList) = @_;
247          my ($entityType, $ID) = @_;      # Declare the return value.
248          # Create a query.      my $retVal = Stats->new();
249          my $query = $self->Get([$entityType], "$entityType(id) = ?", [$ID]);      # Get the data directory.
250          # Get the first (and only) object.      my $optionTable = $self->{_options};
251          my $retVal = $query->Fetch();      my $dataDir = $optionTable->{dataDir};
252          # Return the result.      # Loop through the incoming table names.
253        for my $tableName (@{$tableList}) {
254            # Find the table's file.
255            my $fileName = LoadFileName($dataDir, $tableName);
256            if (! $fileName) {
257                Trace("No load file found for $tableName in $dataDir.") if T(0);
258            } else {
259                # Attempt to load this table.
260                my $result = $self->LoadTable($fileName, $tableName, $truncateFlag);
261                # Accumulate the resulting statistics.
262                $retVal->Accumulate($result);
263            }
264        }
265        # Return the statistics.
266          return $retVal;          return $retVal;
267  }  }
268    
269  =head3 GetEntityValues  =head3 GenomeCounts
270    
271  C<< my @values = GetEntityValues($entityType, $ID, \@fields); >>  C<< my ($arch, $bact, $euk, $vir, $env, $unk) = $sprout->GenomeCounts($complete); >>
272    
273  Return a list of values from a specified entity instance.  Count the number of genomes in each domain. If I<$complete> is TRUE, only complete
274    genomes will be included in the counts.
275    
276  =over 4  =over 4
277    
278  =item entityType  =item complete
   
 Entity type name.  
279    
280  =item ID  TRUE if only complete genomes are to be counted, FALSE if all genomes are to be
281    counted
 ID of the desired entity.  
   
 =item fields  
   
 List of field names, each of the form I<objectName>C<(>I<fieldName>C<)>.  
282    
283  =item RETURN  =item RETURN
284    
285  Returns a flattened list of the values of the specified fields for the specified entity.  A six-element list containing the number of genomes in each of six categories--
286    Archaea, Bacteria, Eukaryota, Viral, Environmental, and Unknown, respectively.
287    
288  =back  =back
289    
290  =cut  =cut
291  #: Return Type @;  
292  sub GetEntityValues {  sub GenomeCounts {
293          # Get the parameters.          # Get the parameters.
294          my $self = shift @_;      my ($self, $complete) = @_;
295          my ($entityType, $ID, $fields) = @_;      # Set the filter based on the completeness flag.
296          # Get the specified entity.      my $filter = ($complete ? "Genome(complete) = 1" : "");
297          my $entity = $self->GetEntity($entityType, $ID);      # Get all the genomes and the related taxonomy information.
298          # Declare the return list.      my @genomes = $self->GetAll(['Genome'], $filter, [], ['Genome(id)', 'Genome(taxonomy)']);
299          my @retVal = ();      # Clear the counters.
300          # If we found the entity, push the values into the return list.      my ($arch, $bact, $euk, $vir, $env, $unk) = (0, 0, 0, 0, 0, 0);
301          if ($entity) {      # Loop through, counting the domains.
302                  push @retVal, $entity->Values($fields);      for my $genome (@genomes) {
303            if    ($genome->[1] =~ /^archaea/i)  { ++$arch }
304            elsif ($genome->[1] =~ /^bacter/i)   { ++$bact }
305            elsif ($genome->[1] =~ /^eukar/i)    { ++$euk }
306            elsif ($genome->[1] =~ /^vir/i)      { ++$vir }
307            elsif ($genome->[1] =~ /^env/i)      { ++$env }
308            else  { ++$unk }
309          }          }
310          # Return the result.      # Return the counts.
311          return @retVal;      return ($arch, $bact, $euk, $vir, $env, $unk);
312  }  }
313    
314  =head3 ShowMetaData  =head3 ContigCount
315    
316  C<< $sprout->ShowMetaData($fileName); >>  C<< my $count = $sprout->ContigCount($genomeID); >>
317    
318  This method outputs a description of the database to an HTML file in the data directory.  Return the number of contigs for the specified genome ID.
319    
320  =over 4  =over 4
321    
322  =item fileName  =item genomeID
323    
324    ID of the genome whose contig count is desired.
325    
326    =item RETURN
327    
328  Fully-qualified name to give to the output file.  Returns the number of contigs for the specified genome.
329    
330  =back  =back
331    
332  =cut  =cut
333    
334  sub ShowMetaData {  sub ContigCount {
335          # Get the parameters.          # Get the parameters.
336          my $self = shift @_;      my ($self, $genomeID) = @_;
337          my ($fileName) = @_;      # Get the contig count.
338          # Compute the file name.      my $retVal = $self->GetCount(['Contig', 'HasContig'], "HasContig(from-link) = ?", [$genomeID]);
339          my $options = $self->{_options};      # Return the result.
340          # Call the show method on the underlying ERDB object.      return $retVal;
         $self->{_erdb}->ShowMetaData($fileName);  
341  }  }
342    
343  =head3 Load  =head3 GeneMenu
   
 C<< $sprout->Load($rebuild); >>;  
   
 Load the database from files in the data directory, optionally re-creating the tables.  
344    
345  This method always deletes the data from the database before loading, even if the tables are not  C<< my $selectHtml = $sprout->GeneMenu(\%attributes, $filterString, \@params, $selected); >>
 re-created. The data is loaded into the relations from files in the data directory either having the  
 same name as the target relation with no extension or with an extension of C<.dtx>. Files without an  
 extension are used in preference to the files with an extension.  
346    
347  The files are loaded based on the presumption that each line of the file is a record in the  Return an HTML select menu of genomes. Each genome will be an option in the menu,
348  relation, and the individual fields are delimited by tabs. Tab and new-line characters inside  and will be displayed by name with the ID and a contig count attached. The selection
349  fields must be represented by the escape sequences C<\t> and C<\n>, respectively. The fields must  value will be the genome ID. The genomes will be sorted by genus/species name.
 be presented in the order given in the relation tables produced by the L</ShowMetaData> method.  
350    
351  =over 4  =over 4
352    
353  =item rebuild  =item attributes
   
 TRUE if the data tables need to be created or re-created, else FALSE  
   
 =item RETURN  
   
 Returns a statistical object containing the number of records read, the number of duplicates found,  
 the number of errors, and a list of the error messages.  
354    
355  =back  Reference to a hash mapping attributes to values for the SELECT tag generated.
   
 =cut  
 #: Return Type %;  
 sub Load {  
         # Get the parameters.  
         my $self = shift @_;  
         my ($rebuild) = @_;  
         # Get the database object.  
         my $erdb = $self->{_erdb};  
         # Load the tables from the data directory.  
         my $retVal = $erdb->LoadTables($self->{_options}->{dataDir}, $rebuild);  
         # Return the statistics.  
         return $retVal;  
 }  
356    
357  =head3 LoadUpdate  =item filterString
358    
359  C<< my %stats = $sprout->LoadUpdate($truncateFlag, \@tableList); >>  A filter string for use in selecting the genomes. The filter string must conform
360    to the rules for the C<< ERDB->Get >> method.
361    
362  Load updates to one or more database tables. This method enables the client to make changes to one  =item params
 or two tables without reloading the whole database. For each table, there must be a corresponding  
 file in the data directory, either with the same name as the table, or with a C<.dtx> suffix. So,  
 for example, to make updates to the B<FeatureTranslation> relation, there must be a  
 C<FeatureTranslation.dtx> file in the data directory. Unlike a full load, files without an extension  
 are not examined. This allows update files to co-exist with files from an original load.  
363    
364  =over 4  Reference to a list of values to be substituted in for the parameter marks in
365    the filter string.
366    
367  =item truncateFlag  =item selected (optional)
368    
369  TRUE if the tables should be rebuilt before loading, else FALSE. A value of TRUE therefore causes  ID of the genome to be initially selected.
 current data and schema of the tables to be replaced, while a value of FALSE means the new data  
 is added to the existing data in the various relations.  
370    
371  =item tableList  =item fast (optional)
372    
373  List of the tables to be updated.  If specified and TRUE, the contig counts will be omitted to improve performance.
374    
375  =item RETURN  =item RETURN
376    
377  Returns a statistical object containing the number of records read, the number of duplicates found,  Returns an HTML select menu with the specified genomes as selectable options.
 the number of errors encountered, and a list of error messages.  
378    
379  =back  =back
380    
381  =cut  =cut
382  #: Return Type %;  
383  sub LoadUpdate {  sub GeneMenu {
384          # Get the parameters.          # Get the parameters.
385          my $self = shift @_;      my ($self, $attributes, $filterString, $params, $selected, $fast) = @_;
386          my ($truncateFlag, $tableList) = @_;      my $slowMode = ! $fast;
387          # Get the database object.      # Default to nothing selected. This prevents an execution warning if "$selected"
388          my $erdb = $self->{_erdb};      # is undefined.
389          # Declare the return value.      $selected = "" unless defined $selected;
390          my $retVal = Stats->new();      Trace("Gene Menu called with slow mode \"$slowMode\" and selection \"$selected\".") if T(3);
391          # Get the data directory.      # Start the menu.
392          my $optionTable = $self->{_options};      my $retVal = "<select " .
393          my $dataDir = $optionTable->{dataDir};          join(" ", map { "$_=\"$attributes->{$_}\"" } keys %{$attributes}) .
394          # Loop through the incoming table names.          ">\n";
395          for my $tableName (@{$tableList}) {      # Get the genomes.
396                  # Find the table's file.      my @genomes = $self->GetAll(['Genome'], $filterString, $params, ['Genome(id)',
397                  my $fileName = "$dataDir/$tableName";                                                                       'Genome(genus)',
398                  if (! -e $fileName) {                                                                       'Genome(species)',
399                          $fileName = "$fileName.dtx";                                                                       'Genome(unique-characterization)']);
400                  }      # Sort them by name.
401                  # Attempt to load this table.      my @sorted = sort { lc("$a->[1] $a->[2]") cmp lc("$b->[1] $b->[2]") } @genomes;
402                  my $result = $erdb->LoadTable($fileName, $tableName, $truncateFlag);      # Loop through the genomes, creating the option tags.
403                  # Accumulate the resulting statistics.      for my $genomeData (@sorted) {
404                  $retVal->Accumulate($result);          # Get the data for this genome.
405            my ($genomeID, $genus, $species, $strain) = @{$genomeData};
406            # Get the contig count.
407            my $contigInfo = "";
408            if ($slowMode) {
409                my $count = $self->ContigCount($genomeID);
410                my $counting = ($count == 1 ? "contig" : "contigs");
411                $contigInfo = "[$count $counting]";
412            }
413            # Find out if we're selected.
414            my $selectOption = ($selected eq $genomeID ? " selected" : "");
415            # Build the option tag.
416            $retVal .= "<option value=\"$genomeID\"$selectOption>$genus $species $strain ($genomeID)$contigInfo</option>\n";
417          }          }
418          # Return the statistics.      # Close the SELECT tag.
419        $retVal .= "</select>\n";
420        # Return the result.
421          return $retVal;          return $retVal;
422  }  }
423    
# Line 463  Line 433 
433  #: Return Type ;  #: Return Type ;
434  sub Build {  sub Build {
435          # Get the parameters.          # Get the parameters.
436          my $self = shift @_;      my ($self) = @_;
437          # Create the tables.          # Create the tables.
438          $self->{_erdb}->CreateTables;      $self->CreateTables();
439  }  }
440    
441  =head3 Genomes  =head3 Genomes
# Line 478  Line 448 
448  #: Return Type @;  #: Return Type @;
449  sub Genomes {  sub Genomes {
450          # Get the parameters.          # Get the parameters.
451          my $self = shift @_;      my ($self) = @_;
452          # Get all the genomes.          # Get all the genomes.
453          my @retVal = $self->GetFlat(['Genome'], "", [], 'Genome(id)');          my @retVal = $self->GetFlat(['Genome'], "", [], 'Genome(id)');
454          # Return the list of IDs.          # Return the list of IDs.
# Line 508  Line 478 
478  #: Return Type $;  #: Return Type $;
479  sub GenusSpecies {  sub GenusSpecies {
480          # Get the parameters.          # Get the parameters.
481          my $self = shift @_;      my ($self, $genomeID) = @_;
         my ($genomeID) = @_;  
482          # Get the data for the specified genome.          # Get the data for the specified genome.
483          my @values = $self->GetEntityValues('Genome', $genomeID, ['Genome(genus)', 'Genome(species)',          my @values = $self->GetEntityValues('Genome', $genomeID, ['Genome(genus)', 'Genome(species)',
484                                                                                                                            'Genome(unique-characterization)']);                                                                                                                            'Genome(unique-characterization)']);
# Line 545  Line 514 
514  #: Return Type @;  #: Return Type @;
515  sub FeaturesOf {  sub FeaturesOf {
516          # Get the parameters.          # Get the parameters.
517          my $self = shift @_;      my ($self, $genomeID,$ftype) = @_;
         my ($genomeID,$ftype) = @_;  
518          # Get the features we want.          # Get the features we want.
519          my @features;          my @features;
520          if (!$ftype) {          if (!$ftype) {
# Line 590  Line 558 
558  =item RETURN  =item RETURN
559    
560  Returns a list of the feature's contig segments. The locations are returned as a list in a list  Returns a list of the feature's contig segments. The locations are returned as a list in a list
561  context and as a space-delimited string in a scalar context.  context and as a comma-delimited string in a scalar context.
562    
563  =back  =back
564    
# Line 599  Line 567 
567  #: Return Type $;  #: Return Type $;
568  sub FeatureLocation {  sub FeatureLocation {
569          # Get the parameters.          # Get the parameters.
570          my $self = shift @_;      my ($self, $featureID) = @_;
         my ($featureID) = @_;  
571          # Create a query for the feature locations.          # Create a query for the feature locations.
572          my $query = $self->Get(['IsLocatedIn'], "IsLocatedIn(from-link) = ? ORDER BY IsLocatedIn(locN)",          my $query = $self->Get(['IsLocatedIn'], "IsLocatedIn(from-link) = ? ORDER BY IsLocatedIn(locN)",
573                                                     [$featureID]);                                                     [$featureID]);
# Line 618  Line 585 
585                  if ($prevContig eq $contigID && $dir eq $prevDir) {                  if ($prevContig eq $contigID && $dir eq $prevDir) {
586                          # Here the new segment is in the same direction on the same contig. Insure the                          # Here the new segment is in the same direction on the same contig. Insure the
587                          # new segment's beginning is next to the old segment's end.                          # new segment's beginning is next to the old segment's end.
588                          if (($dir eq "-" && $beg == $prevBeg - $prevLen) ||              if ($dir eq "-" && $beg + $len == $prevBeg) {
589                                  ($dir eq "+" && $beg == $prevBeg + $prevLen)) {                  # Here we're merging two backward blocks, so we keep the new begin point
590                                  # Here we need to merge two segments. Adjust the beginning and length values                  # and adjust the length.
591                                  # to include both segments.                  $len += $prevLen;
592                    # Pop the old segment off. The new one will replace it later.
593                    pop @retVal;
594                } elsif ($dir eq "+" && $beg == $prevBeg + $prevLen) {
595                    # Here we need to merge two forward blocks. Adjust the beginning and
596                    # length values to include both segments.
597                                  $beg = $prevBeg;                                  $beg = $prevBeg;
598                                  $len += $prevLen;                                  $len += $prevLen;
599                                  # Pop the old segment off. The new one will replace it later.                                  # Pop the old segment off. The new one will replace it later.
# Line 630  Line 602 
602                  }                  }
603                  # Remember this specifier for the adjacent-segment test the next time through.                  # Remember this specifier for the adjacent-segment test the next time through.
604                  ($prevContig, $prevBeg, $prevDir, $prevLen) = ($contigID, $beg, $dir, $len);                  ($prevContig, $prevBeg, $prevDir, $prevLen) = ($contigID, $beg, $dir, $len);
605            # Compute the initial base pair.
606            my $start = ($dir eq "+" ? $beg : $beg + $len - 1);
607                  # Add the specifier to the list.                  # Add the specifier to the list.
608                  push @retVal, "${contigID}_$beg$dir$len";          push @retVal, "${contigID}_$start$dir$len";
609          }          }
610          # Return the list in the format indicated by the context.          # Return the list in the format indicated by the context.
611          return (wantarray ? @retVal : join(' ', @retVal));      return (wantarray ? @retVal : join(',', @retVal));
612  }  }
613    
614  =head3 ParseLocation  =head3 ParseLocation
# Line 660  Line 634 
634  =cut  =cut
635  #: Return Type @;  #: Return Type @;
636  sub ParseLocation {  sub ParseLocation {
637          # Get the parameter.      # Get the parameter. Note that if we're called as an instance method, we ignore
638        # the first parameter.
639        shift if UNIVERSAL::isa($_[0],__PACKAGE__);
640          my ($location) = @_;          my ($location) = @_;
641          # Parse it into segments.          # Parse it into segments.
642          $location =~ /^(.*)_(\d*)([+-_])(\d*)$/;      $location =~ /^(.+)_(\d+)([+\-_])(\d+)$/;
643          my ($contigID, $start, $dir, $len) = ($1, $2, $3, $4);          my ($contigID, $start, $dir, $len) = ($1, $2, $3, $4);
644          # If the direction is an underscore, convert it to a + or -.          # If the direction is an underscore, convert it to a + or -.
645          if ($dir eq "_") {          if ($dir eq "_") {
# Line 679  Line 655 
655          return ($contigID, $start, $dir, $len);          return ($contigID, $start, $dir, $len);
656  }  }
657    
658    
659    
660    =head3 PointLocation
661    
662    C<< my $found = Sprout::PointLocation($location, $point); >>
663    
664    Return the offset into the specified location of the specified point on the contig. If
665    the specified point is before the location, a negative value will be returned. If it is
666    beyond the location, an undefined value will be returned. It is assumed that the offset
667    is for the location's contig. The location can either be new-style (using a C<+> or C<->
668    and a length) or old-style (using C<_> and start and end positions.
669    
670    =over 4
671    
672    =item location
673    
674    A location specifier (see L</FeatureLocation> for a description).
675    
676    =item point
677    
678    The offset into the contig of the point in which we're interested.
679    
680    =item RETURN
681    
682    Returns the offset inside the specified location of the specified point, a negative
683    number if the point is before the location, or an undefined value if the point is past
684    the location. If the length of the location is 0, this method will B<always> denote
685    that it is outside the location. The offset will always be relative to the left-most
686    position in the location.
687    
688    =back
689    
690    =cut
691    #: Return Type $;
692    sub PointLocation {
693        # Get the parameter. Note that if we're called as an instance method, we ignore
694        # the first parameter.
695        shift if UNIVERSAL::isa($_[0],__PACKAGE__);
696        my ($location, $point) = @_;
697        # Parse out the location elements. Note that this works on both old-style and new-style
698        # locations.
699        my ($contigID, $start, $dir, $len) = ParseLocation($location);
700        # Declare the return variable.
701        my $retVal;
702        # Compute the offset. The computation is dependent on the direction of the location.
703        my $offset = (($dir == '+') ? $point - $start : $point - ($start - $len + 1));
704        # Return the offset if it's valid.
705        if ($offset < $len) {
706            $retVal = $offset;
707        }
708        # Return the offset found.
709        return $retVal;
710    }
711    
712  =head3 DNASeq  =head3 DNASeq
713    
714  C<< my $sequence = $sprout->DNASeq(\@locationList); >>  C<< my $sequence = $sprout->DNASeq(\@locationList); >>
# Line 687  Line 717 
717  should be of the form returned by L</featureLocation> when in a list context. In other words,  should be of the form returned by L</featureLocation> when in a list context. In other words,
718  each location is of the form I<contigID>C<_>I<begin>I<dir>I<end>.  each location is of the form I<contigID>C<_>I<begin>I<dir>I<end>.
719    
720    For example, the following would return the DNA sequence for contig C<83333.1:NC_000913>
721    between positions 1401 and 1532, inclusive.
722    
723        my $sequence = $sprout->DNASeq('83333.1:NC_000913_1401_1532');
724    
725  =over 4  =over 4
726    
727  =item locationList  =item locationList
728    
729  List of location specifiers, each in the form I<contigID>C<_>I<begin>I<dir>I<end> (see  List of location specifiers, each in the form I<contigID>C<_>I<begin>I<dir>I<len> or
730  L</FeatureLocation> for more about this format).  I<contigID>C<_>I<begin>C<_>I<end> (see L</FeatureLocation> for more about this format).
731    
732  =item RETURN  =item RETURN
733    
# Line 704  Line 739 
739  #: Return Type $;  #: Return Type $;
740  sub DNASeq {  sub DNASeq {
741          # Get the parameters.          # Get the parameters.
742          my $self = shift @_;      my ($self, $locationList) = @_;
         my ($locationList) = @_;  
743          # Create the return string.          # Create the return string.
744          my $retVal = "";          my $retVal = "";
745          # Loop through the locations.          # Loop through the locations.
# Line 720  Line 754 
754                  # the start point is the ending. Note that in the latter case we must reverse the DNA string                  # the start point is the ending. Note that in the latter case we must reverse the DNA string
755                  # before putting it in the return value.                  # before putting it in the return value.
756                  my ($start, $stop);                  my ($start, $stop);
757            Trace("Parse of \"$location\" is $beg$dir$len.") if T(SDNA => 4);
758                  if ($dir eq "+") {                  if ($dir eq "+") {
759                          $start = $beg;                          $start = $beg;
760                          $stop = $beg + $len - 1;                          $stop = $beg + $len - 1;
761                  } else {                  } else {
762                          $start = $beg + $len + 1;              $start = $beg - $len + 1;
763                          $stop = $beg;                          $stop = $beg;
764                  }                  }
765            Trace("Looking for sequences containing $start through $stop.") if T(SDNA => 4);
766                  my $query = $self->Get(['IsMadeUpOf','Sequence'],                  my $query = $self->Get(['IsMadeUpOf','Sequence'],
767                          "IsMadeUpOf(from-link) = ? AND IsMadeUpOf(start-position) + IsMadeUpOf(len) > ? AND " .                          "IsMadeUpOf(from-link) = ? AND IsMadeUpOf(start-position) + IsMadeUpOf(len) > ? AND " .
768                          " IsMadeUpOf(start-position) <= ? ORDER BY IsMadeUpOf(start-position)",                          " IsMadeUpOf(start-position) <= ? ORDER BY IsMadeUpOf(start-position)",
# Line 738  Line 774 
774                                  $sequence->Values(['IsMadeUpOf(start-position)', 'Sequence(sequence)',                                  $sequence->Values(['IsMadeUpOf(start-position)', 'Sequence(sequence)',
775                                                                     'IsMadeUpOf(len)']);                                                                     'IsMadeUpOf(len)']);
776                          my $stopPosition = $startPosition + $sequenceLength;                          my $stopPosition = $startPosition + $sequenceLength;
777                Trace("Sequence is from $startPosition to $stopPosition.") if T(SDNA => 4);
778                          # Figure out the start point and length of the relevant section.                          # Figure out the start point and length of the relevant section.
779                          my $pos1 = ($start < $startPosition ? 0 : $start - $startPosition);                          my $pos1 = ($start < $startPosition ? 0 : $start - $startPosition);
780                          my $len = ($stopPosition <= $stop ? $stopPosition : $stop) - $startPosition - $pos1;              my $len1 = ($stopPosition < $stop ? $stopPosition : $stop) + 1 - $startPosition - $pos1;
781                Trace("Position is $pos1 for length $len1.") if T(SDNA => 4);
782                          # Add the relevant data to the location data.                          # Add the relevant data to the location data.
783                          $locationDNA .= substr($sequenceData, $pos1, $len);              $locationDNA .= substr($sequenceData, $pos1, $len1);
784                  }                  }
785                  # Add this location's data to the return string. Note that we may need to reverse it.                  # Add this location's data to the return string. Note that we may need to reverse it.
786                  if ($dir eq '+') {                  if ($dir eq '+') {
787                          $retVal .= $locationDNA;                          $retVal .= $locationDNA;
788                  } else {                  } else {
789                          $locationDNA = join('', reverse split //, $locationDNA);              $retVal .= FIG::reverse_comp($locationDNA);
                         $retVal .= $locationDNA;  
790                  }                  }
791          }          }
792          # Return the result.          # Return the result.
# Line 778  Line 815 
815  #: Return Type @;  #: Return Type @;
816  sub AllContigs {  sub AllContigs {
817          # Get the parameters.          # Get the parameters.
818          my $self = shift @_;      my ($self, $genomeID) = @_;
         my ($genomeID) = @_;  
819          # Ask for the genome's Contigs.          # Ask for the genome's Contigs.
820          my @retVal = $self->GetFlat(['HasContig'], "HasContig(from-link) = ?", [$genomeID],          my @retVal = $self->GetFlat(['HasContig'], "HasContig(from-link) = ?", [$genomeID],
821                                                                  'HasContig(to-link)');                                                                  'HasContig(to-link)');
# Line 787  Line 823 
823          return @retVal;          return @retVal;
824  }  }
825    
826  =head3 ContigLength  =head3 GenomeLength
827    
828  C<< my $length = $sprout->ContigLength($contigID); >>  C<< my $length = $sprout->GenomeLength($genomeID); >>
829    
830  Compute the length of a contig.  Return the length of the specified genome in base pairs.
831    
832  =over 4  =over 4
833    
834  =item contigID  =item genomeID
835    
836  ID of the contig whose length is desired.  ID of the genome whose base pair count is desired.
837    
838  =item RETURN  =item RETURN
839    
840  Returns the number of positions in the contig.  Returns the number of base pairs in all the contigs of the specified
841    genome.
842    
843  =back  =back
844    
845  =cut  =cut
846  #: Return Type $;  
847  sub ContigLength {  sub GenomeLength {
848          # Get the parameters.          # Get the parameters.
849          my $self = shift @_;      my ($self, $genomeID) = @_;
850          my ($contigID) = @_;      # Declare the return variable.
         # Get the contig's last sequence.  
         my $query = $self->Get(['IsMadeUpOf'],  
                 "IsMadeUpOf(from-link) = ? ORDER BY IsMadeUpOf(start-position) DESC",  
                 [$contigID]);  
         my $sequence = $query->Fetch();  
         # Declare the return value.  
851          my $retVal = 0;          my $retVal = 0;
852          # Set it from the sequence data, if any.      # Get the genome's contig sequence lengths.
853          if ($sequence) {      my @lens = $self->GetFlat(['HasContig', 'IsMadeUpOf'], 'HasContig(from-link) = ?',
854                  my ($start, $len) = $sequence->Values(['IsMadeUpOf(start-position)', 'IsMadeUpOf(len)']);                         [$genomeID], 'IsMadeUpOf(len)');
855                  $retVal = $start + $len;      # Sum the lengths.
856          }      map { $retVal += $_ } @lens;
857          # Return the result.          # Return the result.
858          return $retVal;          return $retVal;
859  }  }
860    
861  =head3 GenesInRegion  =head3 FeatureCount
862    
863  C<< my (\@featureIDList, $beg, $end) = $sprout->GenesInRegion($contigID, $start, $stop); >>  C<< my $count = $sprout->FeatureCount($genomeID, $type); >>
864    
865  List the features which overlap a specified region in a contig.  Return the number of features of the specified type in the specified genome.
866    
867  =over 4  =over 4
868    
869  =item contigID  =item genomeID
870    
871  ID of the contig containing the region of interest.  ID of the genome whose feature count is desired.
872    
873  =item start  =item type
874    
875  Offset of the first residue in the region of interest.  Type of feature to count (eg. C<peg>, C<rna>, etc.).
876    
877  =item stop  =item RETURN
878    
879  Offset of the last residue in the region of interest.  Returns the number of features of the specified type for the specified genome.
880    
881    =back
882    
883    =cut
884    
885    sub FeatureCount {
886        # Get the parameters.
887        my ($self, $genomeID, $type) = @_;
888        # Compute the count.
889        my $retVal = $self->GetCount(['HasFeature', 'Feature'],
890                                    "HasFeature(from-link) = ? AND Feature(feature-type) = ?",
891                                    [$genomeID, $type]);
892        # Return the result.
893        return $retVal;
894    }
895    
896    =head3 GenomeAssignments
897    
898    C<< my $fidHash = $sprout->GenomeAssignments($genomeID); >>
899    
900    Return a list of a genome's assigned features. The return hash will contain each
901    assigned feature of the genome mapped to the text of its most recent functional
902    assignment.
903    
904    =over 4
905    
906    =item genomeID
907    
908    ID of the genome whose functional assignments are desired.
909    
910  =item RETURN  =item RETURN
911    
912  Returns a three-element list. The first element is a list of feature IDs for the features that  Returns a reference to a hash which maps each feature to its most recent
913  overlap the region of interest. The second and third elements are the minimum and maximum  functional assignment.
 locations of the features provided on the specified contig. These may extend outside  
 the start and stop values.  
914    
915  =back  =back
916    
917  =cut  =cut
918  #: Return Type @;  
919  sub GenesInRegion {  sub GenomeAssignments {
920          # Get the parameters.          # Get the parameters.
921          my $self = shift @_;      my ($self, $genomeID) = @_;
922          my ($contigID, $start, $stop) = @_;      # Declare the return variable.
923          # Get the maximum segment length.      my $retVal = {};
924          my $maximumSegmentLength = $self->MaxSegment;      # Query the genome's features and annotations. We'll put the oldest annotations
925          # Create a hash to receive the feature list. We use a hash so that we can eliminate      # first so that the last assignment to go into the hash will be the correct one.
926          # duplicates easily.      my $query = $self->Get(['HasFeature', 'IsTargetOfAnnotation', 'Annotation'],
927          my %featuresFound = ();                             "HasFeature(from-link) = ? ORDER BY Annotation(time)",
928          # Prime the values we'll use for the returned beginning and end.                             [$genomeID]);
929          my ($min, $max) = ($self->ContigLength($contigID), 0);      # Loop through the annotations.
930          # Create a table of parameters for each query. Each query looks for features travelling in      while (my $data = $query->Fetch) {
931          # a particular direction. The query parameters include the contig ID, the feature direction,          # Get the feature ID and annotation text.
932          # the lowest possible start position, and the highest possible start position. This works          my ($fid, $annotation) = $data->Values(['HasFeature(to-link)',
933          # because each feature segment length must be no greater than the maximum segment length.                                                  'Annotation(annotation)']);
934            # Check to see if this is an assignment. Note that the user really
935            # doesn't matter to us, other than we use it to determine whether or
936            # not this is an assignment.
937            my ($user, $assignment) = _ParseAssignment('fig', $annotation);
938            if ($user) {
939                # Here it's an assignment. We put it in the return hash, overwriting
940                # any older assignment that might be present.
941                $retVal->{$fid} = $assignment;
942            }
943        }
944        # Return the result.
945        return $retVal;
946    }
947    
948    =head3 ContigLength
949    
950    C<< my $length = $sprout->ContigLength($contigID); >>
951    
952    Compute the length of a contig.
953    
954    =over 4
955    
956    =item contigID
957    
958    ID of the contig whose length is desired.
959    
960    =item RETURN
961    
962    Returns the number of positions in the contig.
963    
964    =back
965    
966    =cut
967    #: Return Type $;
968    sub ContigLength {
969        # Get the parameters.
970        my ($self, $contigID) = @_;
971        # Get the contig's last sequence.
972        my $query = $self->Get(['IsMadeUpOf'],
973            "IsMadeUpOf(from-link) = ? ORDER BY IsMadeUpOf(start-position) DESC",
974            [$contigID]);
975        my $sequence = $query->Fetch();
976        # Declare the return value.
977        my $retVal = 0;
978        # Set it from the sequence data, if any.
979        if ($sequence) {
980            my ($start, $len) = $sequence->Values(['IsMadeUpOf(start-position)', 'IsMadeUpOf(len)']);
981            $retVal = $start + $len - 1;
982        }
983        # Return the result.
984        return $retVal;
985    }
986    
987    =head3 ClusterPEGs
988    
989    C<< my $clusteredList = $sprout->ClusterPEGs($sub, \@pegs); >>
990    
991    Cluster the PEGs in a list according to the cluster coding scheme of the specified
992    subsystem. In order for this to work properly, the subsystem object must have
993    been used recently to retrieve the PEGs using the B<get_pegs_from_cell> method.
994    This causes the cluster numbers to be pulled into the subsystem's color hash.
995    If a PEG is not found in the color hash, it will not appear in the output
996    sequence.
997    
998    =over 4
999    
1000    =item sub
1001    
1002    Sprout subsystem object for the relevant subsystem, from the L</get_subsystem>
1003    method.
1004    
1005    =item pegs
1006    
1007    Reference to the list of PEGs to be clustered.
1008    
1009    =item RETURN
1010    
1011    Returns a list of the PEGs, grouped into smaller lists by cluster number.
1012    
1013    =back
1014    
1015    =cut
1016    #: Return Type $@@;
1017    sub ClusterPEGs {
1018        # Get the parameters.
1019        my ($self, $sub, $pegs) = @_;
1020        # Declare the return variable.
1021        my $retVal = [];
1022        # Loop through the PEGs, creating arrays for each cluster.
1023        for my $pegID (@{$pegs}) {
1024            my $clusterNumber = $sub->get_cluster_number($pegID);
1025            # Only proceed if the PEG is in a cluster.
1026            if ($clusterNumber >= 0) {
1027                # Push this PEG onto the sub-list for the specified cluster number.
1028                push @{$retVal->[$clusterNumber]}, $pegID;
1029            }
1030        }
1031        # Return the result.
1032        return $retVal;
1033    }
1034    
1035    =head3 GenesInRegion
1036    
1037    C<< my (\@featureIDList, $beg, $end) = $sprout->GenesInRegion($contigID, $start, $stop); >>
1038    
1039    List the features which overlap a specified region in a contig.
1040    
1041    =over 4
1042    
1043    =item contigID
1044    
1045    ID of the contig containing the region of interest.
1046    
1047    =item start
1048    
1049    Offset of the first residue in the region of interest.
1050    
1051    =item stop
1052    
1053    Offset of the last residue in the region of interest.
1054    
1055    =item RETURN
1056    
1057    Returns a three-element list. The first element is a list of feature IDs for the features that
1058    overlap the region of interest. The second and third elements are the minimum and maximum
1059    locations of the features provided on the specified contig. These may extend outside
1060    the start and stop values. The first element (that is, the list of features) is sorted
1061    roughly by location.
1062    
1063    =back
1064    
1065    =cut
1066    #: Return Type @@;
1067    sub GenesInRegion {
1068        # Get the parameters.
1069        my ($self, $contigID, $start, $stop) = @_;
1070        # Get the maximum segment length.
1071        my $maximumSegmentLength = $self->MaxSegment;
1072        # Create a hash to receive the feature list. We use a hash so that we can eliminate
1073        # duplicates easily. The hash key will be the feature ID. The value will be a two-element
1074        # containing the minimum and maximum offsets. We will use the offsets to sort the results
1075        # when we're building the result set.
1076        my %featuresFound = ();
1077        # Prime the values we'll use for the returned beginning and end.
1078        my @initialMinMax = ($self->ContigLength($contigID), 0);
1079        my ($min, $max) = @initialMinMax;
1080        # Create a table of parameters for each query. Each query looks for features travelling in
1081        # a particular direction. The query parameters include the contig ID, the feature direction,
1082        # the lowest possible start position, and the highest possible start position. This works
1083        # because each feature segment length must be no greater than the maximum segment length.
1084          my %queryParms = (forward => [$contigID, '+', $start - $maximumSegmentLength + 1, $stop],          my %queryParms = (forward => [$contigID, '+', $start - $maximumSegmentLength + 1, $stop],
1085                                            reverse => [$contigID, '-', $start, $stop + $maximumSegmentLength - 1]);                                            reverse => [$contigID, '-', $start, $stop + $maximumSegmentLength - 1]);
1086          # Loop through the query parameters.          # Loop through the query parameters.
# Line 898  Line 1106 
1106                                          $found = 1;                                          $found = 1;
1107                                  }                                  }
1108                          } elsif ($dir eq '-') {                          } elsif ($dir eq '-') {
1109                                  $end = $beg - $len;                  # Note we switch things around so that the beginning is to the left of the
1110                                  if ($end <= $stop) {                  # ending.
1111                    ($beg, $end) = ($beg - $len, $beg);
1112                    if ($beg <= $stop) {
1113                                          # Denote we found a useful feature.                                          # Denote we found a useful feature.
1114                                          $found = 1;                                          $found = 1;
1115                                  }                                  }
1116                          }                          }
1117                          if ($found) {                          if ($found) {
1118                                  # Here we need to record the feature and update the minimum and maximum.                  # Here we need to record the feature and update the minima and maxima. First,
1119                                  $featuresFound{$featureID} = 1;                  # get the current entry for the specified feature.
1120                                  if ($beg < $min) { $min = $beg; }                  my ($loc1, $loc2) = (exists $featuresFound{$featureID} ? @{$featuresFound{$featureID}} :
1121                                  if ($end < $min) { $min = $end; }                                       @initialMinMax);
1122                                  if ($beg > $max) { $max = $beg; }                  # Merge the current segment's begin and end into the feature begin and end and the
1123                                  if ($end > $max) { $max = $end; }                  # global min and max.
1124                    if ($beg < $loc1) {
1125                        $loc1 = $beg;
1126                        $min = $beg if $beg < $min;
1127                    }
1128                    if ($end > $loc2) {
1129                        $loc2 = $end;
1130                        $max = $end if $end > $max;
1131                    }
1132                    # Store the entry back into the hash table.
1133                    $featuresFound{$featureID} = [$loc1, $loc2];
1134                          }                          }
1135                  }                  }
1136          }          }
1137          # Compute a list of the IDs for the features found.      # Now we must compute the list of the IDs for the features found. We start with a list
1138          my @list = (sort (keys %featuresFound));      # of midpoints / feature ID pairs. (It's not really a midpoint, it's twice the midpoint,
1139        # but the result of the sort will be the same.)
1140        my @list = map { [$featuresFound{$_}->[0] + $featuresFound{$_}->[1], $_] } keys %featuresFound;
1141        # Now we sort by midpoint and yank out the feature IDs.
1142        my @retVal = map { $_->[1] } sort { $a->[0] <=> $b->[0] } @list;
1143          # Return it along with the min and max.          # Return it along with the min and max.
1144          return (\@list, $min, $max);      return (\@retVal, $min, $max);
1145  }  }
1146    
1147  =head3 FType  =head3 FType
# Line 943  Line 1167 
1167  #: Return Type $;  #: Return Type $;
1168  sub FType {  sub FType {
1169          # Get the parameters.          # Get the parameters.
1170          my $self = shift @_;      my ($self, $featureID) = @_;
         my ($featureID) = @_;  
1171          # Get the specified feature's type.          # Get the specified feature's type.
1172          my ($retVal) = $self->GetEntityValues('Feature', $featureID, ['Feature(feature-type)']);          my ($retVal) = $self->GetEntityValues('Feature', $featureID, ['Feature(feature-type)']);
1173          # Return the result.          # Return the result.
# Line 953  Line 1176 
1176    
1177  =head3 FeatureAnnotations  =head3 FeatureAnnotations
1178    
1179  C<< my @descriptors = $sprout->FeatureAnnotations($featureID); >>  C<< my @descriptors = $sprout->FeatureAnnotations($featureID, $rawFlag); >>
1180    
1181  Return the annotations of a feature.  Return the annotations of a feature.
1182    
# Line 963  Line 1186 
1186    
1187  ID of the feature whose annotations are desired.  ID of the feature whose annotations are desired.
1188    
1189    =item rawFlag
1190    
1191    If TRUE, the annotation timestamps will be returned in raw form; otherwise, they
1192    will be returned in human-readable form.
1193    
1194  =item RETURN  =item RETURN
1195    
1196  Returns a list of annotation descriptors. Each descriptor is a hash with the following fields.  Returns a list of annotation descriptors. Each descriptor is a hash with the following fields.
1197    
1198  * B<featureID> ID of the relevant feature.  * B<featureID> ID of the relevant feature.
1199    
1200  * B<timeStamp> time the annotation was made, in user-friendly format.  * B<timeStamp> time the annotation was made.
1201    
1202  * B<user> ID of the user who made the annotation  * B<user> ID of the user who made the annotation
1203    
# Line 981  Line 1209 
1209  #: Return Type @%;  #: Return Type @%;
1210  sub FeatureAnnotations {  sub FeatureAnnotations {
1211          # Get the parameters.          # Get the parameters.
1212          my $self = shift @_;      my ($self, $featureID, $rawFlag) = @_;
         my ($featureID) = @_;  
1213          # Create a query to get the feature's annotations and the associated users.          # Create a query to get the feature's annotations and the associated users.
1214          my $query = $self->Get(['IsTargetOfAnnotation', 'Annotation', 'MadeAnnotation'],          my $query = $self->Get(['IsTargetOfAnnotation', 'Annotation', 'MadeAnnotation'],
1215                                                     "IsTargetOfAnnotation(from-link) = ?", [$featureID]);                                                     "IsTargetOfAnnotation(from-link) = ?", [$featureID]);
# Line 995  Line 1222 
1222                          $annotation->Values(['IsTargetOfAnnotation(from-link)',                          $annotation->Values(['IsTargetOfAnnotation(from-link)',
1223                                                                   'Annotation(time)', 'MadeAnnotation(from-link)',                                                                   'Annotation(time)', 'MadeAnnotation(from-link)',
1224                                                                   'Annotation(annotation)']);                                                                   'Annotation(annotation)']);
1225            # Convert the time, if necessary.
1226            if (! $rawFlag) {
1227                $timeStamp = FriendlyTimestamp($timeStamp);
1228            }
1229                  # Assemble them into a hash.                  # Assemble them into a hash.
1230          my $annotationHash = { featureID => $featureID,          my $annotationHash = { featureID => $featureID,
1231                                 timeStamp => FriendlyTimestamp($timeStamp),                                 timeStamp => $timeStamp,
1232                                                             user => $user, text => $text };                                                             user => $user, text => $text };
1233                  # Add it to the return list.                  # Add it to the return list.
1234                  push @retVal, $annotationHash;                  push @retVal, $annotationHash;
# Line 1011  Line 1242 
1242  C<< my %functions = $sprout->AllFunctionsOf($featureID); >>  C<< my %functions = $sprout->AllFunctionsOf($featureID); >>
1243    
1244  Return all of the functional assignments for a particular feature. The data is returned as a  Return all of the functional assignments for a particular feature. The data is returned as a
1245  hash of functional assignments to user IDs. A functional assignment is a type of annotation.  hash of functional assignments to user IDs. A functional assignment is a type of annotation,
1246  It has the format "XXXX\nset XXXX function to\nYYYYY". In this instance, XXXX is the user ID  Functional assignments are described in the L</ParseAssignment> function. Its worth noting that
1247  and YYYYY is the functional assignment text. Its worth noting that we cannot filter on the content  we cannot filter on the content of the annotation itself because it's a text field; however,
1248  of the annotation itself because it's a text field; however, this is not a big problem because most  this is not a big problem because most features only have a small number of annotations.
1249  features only have a small number of annotations. Finally, if a single user has multiple  Finally, if a single user has multiple functional assignments, we will only keep the most
1250  functional assignments, we will only keep the most recent one.  recent one.
1251    
1252  =over 4  =over 4
1253    
# Line 1026  Line 1257 
1257    
1258  =item RETURN  =item RETURN
1259    
1260  Returns a hash mapping the functional assignment IDs to user IDs.  Returns a hash mapping the user IDs to functional assignment IDs.
1261    
1262  =back  =back
1263    
# Line 1034  Line 1265 
1265  #: Return Type %;  #: Return Type %;
1266  sub AllFunctionsOf {  sub AllFunctionsOf {
1267          # Get the parameters.          # Get the parameters.
1268          my $self = shift @_;      my ($self, $featureID) = @_;
         my ($featureID) = @_;  
1269          # Get all of the feature's annotations.          # Get all of the feature's annotations.
1270      my @query = $self->GetAll(['IsTargetOfAnnotation', 'Annotation'],      my @query = $self->GetAll(['IsTargetOfAnnotation', 'Annotation', 'MadeAnnotation'],
1271                                                      "IsTargetOfAnnotation(from-link) = ?",                                                      "IsTargetOfAnnotation(from-link) = ?",
1272                              [$featureID], ['Annotation(time)', 'Annotation(annotation)']);                              [$featureID], ['Annotation(time)', 'Annotation(annotation)',
1273                                               'MadeAnnotation(from-link)']);
1274          # Declare the return hash.          # Declare the return hash.
1275          my %retVal;          my %retVal;
     # Declare a hash for insuring we only make one assignment per user.  
     my %timeHash = ();  
1276      # Now we sort the assignments by timestamp in reverse.      # Now we sort the assignments by timestamp in reverse.
1277      my @sortedQuery = sort { -($a->[0] <=> $b->[0]) } @query;      my @sortedQuery = sort { -($a->[0] <=> $b->[0]) } @query;
1278          # Loop until we run out of annotations.          # Loop until we run out of annotations.
1279      for my $annotation (@sortedQuery) {      for my $annotation (@sortedQuery) {
1280          # Get the annotation fields.          # Get the annotation fields.
1281          my ($timeStamp, $text) = @{$annotation};          my ($timeStamp, $text, $user) = @{$annotation};
1282                  # Check to see if this is a functional assignment.                  # Check to see if this is a functional assignment.
1283                  my ($user, $function) = ParseAssignment($text);          my ($actualUser, $function) = _ParseAssignment($user, $text);
1284          if ($user && ! exists $timeHash{$user}) {          if ($actualUser && ! exists $retVal{$actualUser}) {
1285              # Here it is a functional assignment and there has been no              # Here it is a functional assignment and there has been no
1286              # previous assignment for this user, so we stuff it in the              # previous assignment for this user, so we stuff it in the
1287              # return hash.              # return hash.
1288                          $retVal{$function} = $user;              $retVal{$actualUser} = $function;
             # Insure we don't assign to this user again.  
             $timeHash{$user} = 1;  
1289                  }                  }
1290          }          }
1291          # Return the hash of assignments found.          # Return the hash of assignments found.
# Line 1073  Line 1300 
1300    
1301  The functional assignment is handled differently depending on the type of feature. If  The functional assignment is handled differently depending on the type of feature. If
1302  the feature is identified by a FIG ID (begins with the string C<fig|>), then a functional  the feature is identified by a FIG ID (begins with the string C<fig|>), then a functional
1303  assignment is a type of annotation. It has the format "XXXX\nset XXXX function to\nYYYYY". In this  assignment is a type of annotation. The format of an assignment is described in
1304  instance, XXXX is the user ID and YYYYY is the functional assignment text. Its worth noting that  L</ParseAssignment>. Its worth noting that we cannot filter on the content of the
1305  we cannot filter on the content of the annotation itself because it's a text field; however, this  annotation itself because it's a text field; however, this is not a big problem because
1306  is not a big problem because most features only have a small number of annotations.  most features only have a small number of annotations.
1307    
1308  Each user has an associated list of trusted users. The assignment returned will be the most  Each user has an associated list of trusted users. The assignment returned will be the most
1309  recent one by at least one of the trusted users. If no trusted user list is available, then  recent one by at least one of the trusted users. If no trusted user list is available, then
# Line 1108  Line 1335 
1335  #: Return Type $;  #: Return Type $;
1336  sub FunctionOf {  sub FunctionOf {
1337          # Get the parameters.          # Get the parameters.
1338          my $self = shift @_;      my ($self, $featureID, $userID) = @_;
         my ($featureID, $userID) = @_;  
1339      # Declare the return value.      # Declare the return value.
1340      my $retVal;      my $retVal;
1341      # Determine the ID type.      # Determine the ID type.
# Line 1137  Line 1363 
1363              }              }
1364          }          }
1365          # 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.
1366          my $query = $self->Get(['IsTargetOfAnnotation', 'Annotation'],          my $query = $self->Get(['IsTargetOfAnnotation', 'Annotation', 'MadeAnnotation'],
1367                                 "IsTargetOfAnnotation(from-link) = ? ORDER BY Annotation(time) DESC",                                 "IsTargetOfAnnotation(from-link) = ? ORDER BY Annotation(time) DESC",
1368                                 [$featureID]);                                 [$featureID]);
1369          my $timeSelected = 0;          my $timeSelected = 0;
1370          # Loop until we run out of annotations.          # Loop until we run out of annotations.
1371          while (my $annotation = $query->Fetch()) {          while (my $annotation = $query->Fetch()) {
1372              # Get the annotation text.              # Get the annotation text.
1373              my ($text, $time) = $annotation->Values(['Annotation(annotation)','Annotation(time)']);              my ($text, $time, $user) = $annotation->Values(['Annotation(annotation)',
1374                                                         'Annotation(time)', 'MadeAnnotation(from-link)']);
1375              # 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.
1376              my ($user, $type, $function) = split(/\n/, $text);              my ($actualUser, $function) = _ParseAssignment($user, $text);
1377              if ($type =~ m/^set $user function to$/i) {              Trace("Assignment user is $actualUser, text is $function.") if T(4);
1378                if ($actualUser) {
1379                  # Here it is a functional assignment. Check the time and the user                  # Here it is a functional assignment. Check the time and the user
1380                  # name. The time must be recent and the user must be trusted.                  # name. The time must be recent and the user must be trusted.
1381                  if ((exists $trusteeTable{$user}) && ($time > $timeSelected)) {                  if ((exists $trusteeTable{$actualUser}) && ($time > $timeSelected)) {
1382                      $retVal = $function;                      $retVal = $function;
1383                      $timeSelected = $time;                      $timeSelected = $time;
1384                  }                  }
# Line 1166  Line 1394 
1394          return $retVal;          return $retVal;
1395  }  }
1396    
1397    =head3 FunctionsOf
1398    
1399    C<< my @functionList = $sprout->FunctionOf($featureID, $userID); >>
1400    
1401    Return the functional assignments of a particular feature.
1402    
1403    The functional assignment is handled differently depending on the type of feature. If
1404    the feature is identified by a FIG ID (begins with the string C<fig|>), then a functional
1405    assignment is a type of annotation. The format of an assignment is described in
1406    L</ParseAssignment>. Its worth noting that we cannot filter on the content of the
1407    annotation itself because it's a text field; however, this is not a big problem because
1408    most features only have a small number of annotations.
1409    
1410    If the feature is B<not> identified by a FIG ID, then the functional assignment
1411    information is taken from the B<ExternalAliasFunc> table. If the table does
1412    not contain an entry for the feature, an empty list is returned.
1413    
1414    =over 4
1415    
1416    =item featureID
1417    
1418    ID of the feature whose functional assignments are desired.
1419    
1420    =item RETURN
1421    
1422    Returns a list of 2-tuples, each consisting of a user ID and the text of an assignment by
1423    that user.
1424    
1425    =back
1426    
1427    =cut
1428    #: Return Type @@;
1429    sub FunctionsOf {
1430        # Get the parameters.
1431        my ($self, $featureID) = @_;
1432        # Declare the return value.
1433        my @retVal = ();
1434        # Determine the ID type.
1435        if ($featureID =~ m/^fig\|/) {
1436            # Here we have a FIG feature ID. We must build the list of trusted
1437            # users.
1438            my %trusteeTable = ();
1439            # Build a query for all of the feature's annotations, sorted by date.
1440            my $query = $self->Get(['IsTargetOfAnnotation', 'Annotation', 'MadeAnnotation'],
1441                                   "IsTargetOfAnnotation(from-link) = ? ORDER BY Annotation(time) DESC",
1442                                   [$featureID]);
1443            my $timeSelected = 0;
1444            # Loop until we run out of annotations.
1445            while (my $annotation = $query->Fetch()) {
1446                # Get the annotation text.
1447                my ($text, $time, $user) = $annotation->Values(['Annotation(annotation)',
1448                                                                'Annotation(time)',
1449                                                                'MadeAnnotation(user)']);
1450                # Check to see if this is a functional assignment for a trusted user.
1451                my ($actualUser, $function) = _ParseAssignment($user, $text);
1452                if ($actualUser) {
1453                    # Here it is a functional assignment.
1454                    push @retVal, [$actualUser, $function];
1455                }
1456            }
1457        } else {
1458            # Here we have a non-FIG feature ID. In this case the user ID does not
1459            # matter. We simply get the information from the External Alias Function
1460            # table.
1461            my @assignments = $self->GetEntityValues('ExternalAliasFunc', $featureID,
1462                                                     ['ExternalAliasFunc(func)']);
1463            push @retVal, map { ['master', $_] } @assignments;
1464        }
1465        # Return the assignments found.
1466        return @retVal;
1467    }
1468    
1469  =head3 BBHList  =head3 BBHList
1470    
1471  C<< my $bbhHash = $sprout->BBHList($genomeID, \@featureList); >>  C<< my $bbhHash = $sprout->BBHList($genomeID, \@featureList); >>
# Line 1185  Line 1485 
1485    
1486  =item RETURN  =item RETURN
1487    
1488  Returns a reference to a hash that maps the IDs of the incoming features to the IDs of  Returns a reference to a hash that maps the IDs of the incoming features to the best hits
1489  their best hits.  on the target genome.
1490    
1491  =back  =back
1492    
# Line 1194  Line 1494 
1494  #: Return Type %;  #: Return Type %;
1495  sub BBHList {  sub BBHList {
1496          # Get the parameters.          # Get the parameters.
1497          my $self = shift @_;      my ($self, $genomeID, $featureList) = @_;
         my ($genomeID, $featureList) = @_;  
1498          # Create the return structure.          # Create the return structure.
1499          my %retVal = ();          my %retVal = ();
1500          # Loop through the incoming features.          # Loop through the incoming features.
1501          for my $featureID (@{$featureList}) {          for my $featureID (@{$featureList}) {
1502                  # Create a query to get the feature's best hit.          # Ask the server for the feature's best hit.
1503                  my $query = $self->Get(['IsBidirectionalBestHitOf'],          my @bbhData = FIGRules::BBHData($featureID);
1504                                                             "IsBidirectionalBestHitOf(from-link) = ? AND IsBidirectionalBestHitOf(genome) = ?",          # Peel off the BBHs found.
1505                                                             [$featureID, $genomeID]);          my @found = ();
1506                  # Look for the best hit.          for my $bbh (@bbhData) {
1507                  my $bbh = $query->Fetch;              push @found, $bbh->[0];
                 if ($bbh) {  
                         my ($targetFeature) = $bbh->Value('IsBidirectionalBestHitOf(to-link)');  
                         $retVal{$featureID} = $targetFeature;  
1508                  }                  }
1509            $retVal{$featureID} = \@found;
1510          }          }
1511          # Return the mapping.          # Return the mapping.
1512          return \%retVal;          return \%retVal;
1513  }  }
1514    
1515    =head3 SimList
1516    
1517    C<< my %similarities = $sprout->SimList($featureID, $count); >>
1518    
1519    Return a list of the similarities to the specified feature.
1520    
1521    This method just returns the bidirectional best hits for performance reasons.
1522    
1523    =over 4
1524    
1525    =item featureID
1526    
1527    ID of the feature whose similarities are desired.
1528    
1529    =item count
1530    
1531    Maximum number of similar features to be returned, or C<0> to return them all.
1532    
1533    =back
1534    
1535    =cut
1536    #: Return Type %;
1537    sub SimList {
1538        # Get the parameters.
1539        my ($self, $featureID, $count) = @_;
1540        # Ask for the best hits.
1541        my @lists = FIGRules::BBHData($featureID);
1542        # Create the return value.
1543        my %retVal = ();
1544        for my $tuple (@lists) {
1545            $retVal{$tuple->[0]} = $tuple->[1];
1546        }
1547        # Return the result.
1548        return %retVal;
1549    }
1550    
1551    =head3 IsComplete
1552    
1553    C<< my $flag = $sprout->IsComplete($genomeID); >>
1554    
1555    Return TRUE if the specified genome is complete, else FALSE.
1556    
1557    =over 4
1558    
1559    =item genomeID
1560    
1561    ID of the genome whose completeness status is desired.
1562    
1563    =item RETURN
1564    
1565    Returns TRUE if the genome is complete, FALSE if it is incomplete, and C<undef> if it is
1566    not found.
1567    
1568    =back
1569    
1570    =cut
1571    #: Return Type $;
1572    sub IsComplete {
1573        # Get the parameters.
1574        my ($self, $genomeID) = @_;
1575        # Declare the return variable.
1576        my $retVal;
1577        # Get the genome's data.
1578        my $genomeData = $self->GetEntity('Genome', $genomeID);
1579        if ($genomeData) {
1580            # The genome exists, so get the completeness flag.
1581            ($retVal) = $genomeData->Value('Genome(complete)');
1582        }
1583        # Return the result.
1584        return $retVal;
1585    }
1586    
1587  =head3 FeatureAliases  =head3 FeatureAliases
1588    
1589  C<< my @aliasList = $sprout->FeatureAliases($featureID); >>  C<< my @aliasList = $sprout->FeatureAliases($featureID); >>
# Line 1238  Line 1607 
1607  #: Return Type @;  #: Return Type @;
1608  sub FeatureAliases {  sub FeatureAliases {
1609          # Get the parameters.          # Get the parameters.
1610          my $self = shift @_;      my ($self, $featureID) = @_;
         my ($featureID) = @_;  
1611          # Get the desired feature's aliases          # Get the desired feature's aliases
1612          my @retVal = $self->GetEntityValues('Feature', $featureID, ['Feature(alias)']);          my @retVal = $self->GetEntityValues('Feature', $featureID, ['Feature(alias)']);
1613          # Return the result.          # Return the result.
# Line 1250  Line 1618 
1618    
1619  C<< my $genomeID = $sprout->GenomeOf($featureID); >>  C<< my $genomeID = $sprout->GenomeOf($featureID); >>
1620    
1621  Return the genome that contains a specified feature.  Return the genome that contains a specified feature or contig.
1622    
1623  =over 4  =over 4
1624    
1625  =item featureID  =item featureID
1626    
1627  ID of the feature whose genome is desired.  ID of the feature or contig whose genome is desired.
1628    
1629  =item RETURN  =item RETURN
1630    
1631  Returns the ID of the genome for the specified feature. If the feature is not found, returns  Returns the ID of the genome for the specified feature or contig. If the feature or contig is not
1632  an undefined value.  found, returns an undefined value.
1633    
1634  =back  =back
1635    
# Line 1269  Line 1637 
1637  #: Return Type $;  #: Return Type $;
1638  sub GenomeOf {  sub GenomeOf {
1639          # Get the parameters.          # Get the parameters.
1640          my $self = shift @_;      my ($self, $featureID) = @_;
1641          my ($featureID) = @_;      # Create a query to find the genome associated with the incoming ID.
1642          # Create a query to find the genome associated with the feature.      my $query = $self->Get(['IsLocatedIn', 'HasContig'], "IsLocatedIn(from-link) = ? OR HasContig(to-link) = ?",
1643          my $query = $self->Get(['IsLocatedIn', 'HasContig'], "IsLocatedIn(from-link) = ?", [$featureID]);                             [$featureID, $featureID]);
1644          # Declare the return value.          # Declare the return value.
1645          my $retVal;          my $retVal;
1646          # Get the genome ID.          # Get the genome ID.
# Line 1306  Line 1674 
1674  #: Return Type %;  #: Return Type %;
1675  sub CoupledFeatures {  sub CoupledFeatures {
1676          # Get the parameters.          # Get the parameters.
1677          my $self = shift @_;      my ($self, $featureID) = @_;
1678          my ($featureID) = @_;      Trace("Looking for features coupled to $featureID.") if T(coupling => 3);
1679          # Create a query to retrieve the functionally-coupled features. Note that we depend on the      # Create a query to retrieve the functionally-coupled features.
1680          # fact that the functional coupling is physically paired. If (A,B) is in the database, then      my $query = $self->Get(['ParticipatesInCoupling', 'Coupling'],
1681          # (B,A) will also be found.                             "ParticipatesInCoupling(from-link) = ?", [$featureID]);
         my $query = $self->Get(['IsClusteredOnChromosomeWith'],  
                                                    "IsClusteredOnChromosomeWith(from-link) = ?", [$featureID]);  
1682          # This value will be set to TRUE if we find at least one coupled feature.          # This value will be set to TRUE if we find at least one coupled feature.
1683          my $found = 0;          my $found = 0;
1684          # Create the return hash.          # Create the return hash.
1685          my %retVal = ();          my %retVal = ();
1686          # Retrieve the relationship records and store them in the hash.          # Retrieve the relationship records and store them in the hash.
1687          while (my $clustering = $query->Fetch()) {          while (my $clustering = $query->Fetch()) {
1688                  my ($otherFeatureID, $score) = $clustering->Values(['IsClusteredOnChromosomeWith(to-link)',          # Get the ID and score of the coupling.
1689                                                                      'IsClusteredOnChromosomeWith(score)']);          my ($couplingID, $score) = $clustering->Values(['Coupling(id)',
1690                                                            'Coupling(score)']);
1691            Trace("$featureID coupled with score $score to ID $couplingID.") if T(coupling => 4);
1692            # Get the other feature that participates in the coupling.
1693            my ($otherFeatureID) = $self->GetFlat(['ParticipatesInCoupling'],
1694                                               "ParticipatesInCoupling(to-link) = ? AND ParticipatesInCoupling(from-link) <> ?",
1695                                               [$couplingID, $featureID], 'ParticipatesInCoupling(from-link)');
1696            Trace("$couplingID target feature is $otherFeatureID.") if T(coupling => 4);
1697            # Attach the other feature's score to its ID.
1698                  $retVal{$otherFeatureID} = $score;                  $retVal{$otherFeatureID} = $score;
1699                  $found = 1;                  $found = 1;
1700          }          }
# Line 1333  Line 1707 
1707          return %retVal;          return %retVal;
1708  }  }
1709    
1710  =head3 GetEntityTypes  =head3 CouplingEvidence
1711    
1712    C<< my @evidence = $sprout->CouplingEvidence($peg1, $peg2); >>
1713    
1714    Return the evidence for a functional coupling.
1715    
1716    A pair of features is considered evidence of a coupling between two other
1717    features if they occur close together on a contig and both are similar to
1718    the coupled features. So, if B<A1> and B<A2> are close together on a contig,
1719    B<B1> and B<B2> are considered evidence for the coupling if (1) B<B1> and
1720    B<B2> are close together, (2) B<B1> is similar to B<A1>, and (3) B<B2> is
1721    similar to B<A2>.
1722    
1723    The score of a coupling is determined by the number of pieces of evidence
1724    that are considered I<representative>. If several evidence items belong to
1725    a group of genomes that are close to each other, only one of those items
1726    is considered representative. The other evidence items are presumed to be
1727    there because of the relationship between the genomes rather than because
1728    the two proteins generated by the features have a related functionality.
1729    
1730    Each evidence item is returned as a three-tuple in the form C<[>I<$peg1a>C<,>
1731    I<$peg2a>C<,> I<$rep>C<]>, where I<$peg1a> is similar to I<$peg1>, I<$peg2a>
1732    is similar to I<$peg2>, and I<$rep> is TRUE if the evidence is representative
1733    and FALSE otherwise.
1734    
1735    =over 4
1736    
1737    =item peg1
1738    
1739    ID of the feature of interest.
1740    
1741    =item peg2
1742    
1743  C<< my @entityList = $sprout->GetEntityTypes(); >>  ID of a feature functionally coupled to the feature of interest.
1744    
1745  Return the list of supported entity types.  =item RETURN
1746    
1747    Returns a list of 3-tuples. Each tuple consists of a feature similar to the feature
1748    of interest, a feature similar to the functionally coupled feature, and a flag
1749    that is TRUE for a representative piece of evidence and FALSE otherwise.
1750    
1751    =back
1752    
1753  =cut  =cut
1754  #: Return Type @;  #: Return Type @@;
1755  sub GetEntityTypes {  sub CouplingEvidence {
1756          # Get the parameters.          # Get the parameters.
1757          my $self = shift @_;      my ($self, $peg1, $peg2) = @_;
1758          # Get the underlying database object.      # Declare the return variable.
1759          my $erdb = $self->{_erdb};      my @retVal = ();
1760          # Get its entity type list.      # Our first task is to find out the nature of the coupling: whether or not
1761          my @retVal = $erdb->GetEntityTypes();      # it exists, its score, and whether the features are stored in the same
1762        # order as the ones coming in.
1763        my ($couplingID, $inverted, $score) = $self->GetCoupling($peg1, $peg2);
1764        # Only proceed if a coupling exists.
1765        if ($couplingID) {
1766            # Determine the ordering to place on the evidence items. If we're
1767            # inverted, we want to see feature 2 before feature 1 (descending); otherwise,
1768            # we want feature 1 before feature 2 (normal).
1769            Trace("Coupling evidence for ($peg1, $peg2) with inversion flag $inverted.") if T(Coupling => 4);
1770            my $ordering = ($inverted ? "DESC" : "");
1771            # Get the coupling evidence.
1772            my @evidenceList = $self->GetAll(['IsEvidencedBy', 'PCH', 'UsesAsEvidence'],
1773                                              "IsEvidencedBy(from-link) = ? ORDER BY PCH(id), UsesAsEvidence(pos) $ordering",
1774                                              [$couplingID],
1775                                              ['PCH(used)', 'UsesAsEvidence(to-link)']);
1776            # Loop through the evidence items. Each piece of evidence is represented by two
1777            # positions in the evidence list, one for each feature on the other side of the
1778            # evidence link. If at some point we want to generalize to couplings with
1779            # more than two positions, this section of code will need to be re-done.
1780            while (@evidenceList > 0) {
1781                my $peg1Data = shift @evidenceList;
1782                my $peg2Data = shift @evidenceList;
1783                Trace("Peg 1 is " . $peg1Data->[1] . " and Peg 2 is " . $peg2Data->[1] . ".") if T(Coupling => 4);
1784                push @retVal, [$peg1Data->[1], $peg2Data->[1], $peg1Data->[0]];
1785            }
1786            Trace("Last index in evidence result is is $#retVal.") if T(Coupling => 4);
1787        }
1788        # Return the result.
1789        return @retVal;
1790  }  }
1791    
1792  =head3 ReadFasta  =head3 GetCoupling
1793    
1794  C<< my %sequenceData = Sprout::ReadFasta($fileName, $prefix); >>  C<< my ($couplingID, $inverted, $score) = $sprout->GetCoupling($peg1, $peg2); >>
1795    
1796  Read sequence data from a FASTA-format file. Each sequence in a FASTA file is represented by  Return the coupling (if any) for the specified pair of PEGs. If a coupling
1797  one or more lines of data. The first line begins with a > character and contains an ID.  exists, we return the coupling ID along with an indicator of whether the
1798  The remaining lines contain the sequence data in order.  coupling is stored as C<(>I<$peg1>C<, >I<$peg2>C<)> or C<(>I<$peg2>C<, >I<$peg1>C<)>.
1799    In the second case, we say the coupling is I<inverted>. The importance of an
1800    inverted coupling is that the PEGs in the evidence will appear in reverse order.
1801    
1802  =over 4  =over 4
1803    
1804  =item fileName  =item peg1
1805    
1806  Name of the FASTA file.  ID of the feature of interest.
1807    
1808  =item prefix (optional)  =item peg2
1809    
1810  Prefix to be put in front of each ID found.  ID of the potentially coupled feature.
1811    
1812  =item RETURN  =item RETURN
1813    
1814  Returns a hash that maps each ID to its sequence.  Returns a three-element list. The first element contains the database ID of
1815    the coupling. The second element is FALSE if the coupling is stored in the
1816    database in the caller specified order and TRUE if it is stored in the
1817    inverted order. The third element is the coupling's score. If the coupling
1818    does not exist, all three list elements will be C<undef>.
1819    
1820  =back  =back
1821    
1822  =cut  =cut
1823  #: Return Type %;  #: Return Type $%@;
1824  sub ReadFasta {  sub GetCoupling {
1825          # Get the parameters.          # Get the parameters.
1826          my ($fileName, $prefix) = @_;      my ($self, $peg1, $peg2) = @_;
1827          # Create the return hash.      # Declare the return values. We'll start with the coupling ID and undefine the
1828          my %retVal = ();      # flag and score until we have more information.
1829          # Open the file for input.      my ($retVal, $inverted, $score) = ($self->CouplingID($peg1, $peg2), undef, undef);
1830          open FASTAFILE, '<', $fileName;      # Find the coupling data.
1831          # Declare the ID variable and clear the sequence accumulator.      my @pegs = $self->GetAll(['Coupling', 'ParticipatesInCoupling'],
1832          my $sequence = "";                                   "Coupling(id) = ? ORDER BY ParticipatesInCoupling(pos)",
1833          my $id = "";                                   [$retVal], ["ParticipatesInCoupling(from-link)", "Coupling(score)"]);
1834          # Loop through the file.      # Check to see if we found anything.
1835          while (<FASTAFILE>) {      if (!@pegs) {
1836                  # Get the current line.          Trace("No coupling found.") if T(Coupling => 4);
1837                  my $line = $_;          # No coupling, so undefine the return value.
1838            $retVal = undef;
1839        } else {
1840            # We have a coupling! Get the score and check for inversion.
1841            $score = $pegs[0]->[1];
1842            my $firstFound = $pegs[0]->[0];
1843            $inverted = ($firstFound ne $peg1);
1844            Trace("Coupling score is $score. First peg is $firstFound, peg 1 is $peg1.") if T(Coupling => 4);
1845        }
1846        # Return the result.
1847        return ($retVal, $inverted, $score);
1848    }
1849    
1850    =head3 GetSynonymGroup
1851    
1852    C<< my $id = $sprout->GetSynonymGroup($fid); >>
1853    
1854    Return the synonym group name for the specified feature.
1855    
1856    =over 4
1857    
1858    =item fid
1859    
1860    ID of the feature whose synonym group is desired.
1861    
1862    =item RETURN
1863    
1864    The name of the synonym group to which the feature belongs. If the feature does
1865    not belong to a synonym group, the feature ID itself is returned.
1866    
1867    =back
1868    
1869    =cut
1870    
1871    sub GetSynonymGroup {
1872        # Get the parameters.
1873        my ($self, $fid) = @_;
1874        # Declare the return variable.
1875        my $retVal;
1876        # Find the synonym group.
1877        my @groups = $self->GetFlat(['IsSynonymGroupFor'], "IsSynonymGroupFor(to-link) = ?",
1878                                       [$fid], 'IsSynonymGroupFor(from-link)');
1879        # Check to see if we found anything.
1880        if (@groups) {
1881            $retVal = $groups[0];
1882        } else {
1883            $retVal = $fid;
1884        }
1885        # Return the result.
1886        return $retVal;
1887    }
1888    
1889    =head3 GetBoundaries
1890    
1891    C<< my ($contig, $beg, $end) = $sprout->GetBoundaries(@locList); >>
1892    
1893    Determine the begin and end boundaries for the locations in a list. All of the
1894    locations must belong to the same contig and have mostly the same direction in
1895    order for this method to produce a meaningful result. The resulting
1896    begin/end pair will contain all of the bases in any of the locations.
1897    
1898    =over 4
1899    
1900    =item locList
1901    
1902    List of locations to process.
1903    
1904    =item RETURN
1905    
1906    Returns a 3-tuple consisting of the contig ID, the beginning boundary,
1907    and the ending boundary. The beginning boundary will be left of the
1908    end for mostly-forward locations and right of the end for mostly-backward
1909    locations.
1910    
1911    =back
1912    
1913    =cut
1914    
1915    sub GetBoundaries {
1916        # Get the parameters.
1917        my ($self, @locList) = @_;
1918        # Set up the counters used to determine the most popular direction.
1919        my %counts = ( '+' => 0, '-' => 0 );
1920        # Get the last location and parse it.
1921        my $locObject = BasicLocation->new(pop @locList);
1922        # Prime the loop with its data.
1923        my ($contig, $beg, $end) = ($locObject->Contig, $locObject->Left, $locObject->Right);
1924        # Count its direction.
1925        $counts{$locObject->Dir}++;
1926        # Loop through the remaining locations. Note that in most situations, this loop
1927        # will not iterate at all, because most of the time we will be dealing with a
1928        # singleton list.
1929        for my $loc (@locList) {
1930            # Create a location object.
1931            my $locObject = BasicLocation->new($loc);
1932            # Count the direction.
1933            $counts{$locObject->Dir}++;
1934            # Get the left end and the right end.
1935            my $left = $locObject->Left;
1936            my $right = $locObject->Right;
1937            # Merge them into the return variables.
1938            if ($left < $beg) {
1939                $beg = $left;
1940            }
1941            if ($right > $end) {
1942                $end = $right;
1943            }
1944        }
1945        # If the most common direction is reverse, flip the begin and end markers.
1946        if ($counts{'-'} > $counts{'+'}) {
1947            ($beg, $end) = ($end, $beg);
1948        }
1949        # Return the result.
1950        return ($contig, $beg, $end);
1951    }
1952    
1953    =head3 CouplingID
1954    
1955    C<< my $couplingID = $sprout->CouplingID($peg1, $peg2); >>
1956    
1957    Return the coupling ID for a pair of feature IDs.
1958    
1959    The coupling ID is currently computed by joining the feature IDs in
1960    sorted order with a space. Client modules (that is, modules which
1961    use Sprout) should not, however, count on this always being the
1962    case. This method provides a way for abstracting the concept of a
1963    coupling ID. All that we know for sure about it is that it can be
1964    generated easily from the feature IDs and the order of the IDs
1965    in the parameter list does not matter (i.e. C<CouplingID("a1", "b1")>
1966    will have the same value as C<CouplingID("b1", "a1")>.
1967    
1968    =over 4
1969    
1970    =item peg1
1971    
1972    First feature of interest.
1973    
1974    =item peg2
1975    
1976    Second feature of interest.
1977    
1978    =item RETURN
1979    
1980    Returns the ID that would be used to represent a functional coupling of
1981    the two specified PEGs.
1982    
1983    =back
1984    
1985    =cut
1986    #: Return Type $;
1987    sub CouplingID {
1988        my ($self, @pegs) = @_;
1989        return $self->DigestKey(join " ", sort @pegs);
1990    }
1991    
1992    =head3 ReadFasta
1993    
1994    C<< my %sequenceData = Sprout::ReadFasta($fileName, $prefix); >>
1995    
1996    Read sequence data from a FASTA-format file. Each sequence in a FASTA file is represented by
1997    one or more lines of data. The first line begins with a > character and contains an ID.
1998    The remaining lines contain the sequence data in order.
1999    
2000    =over 4
2001    
2002    =item fileName
2003    
2004    Name of the FASTA file.
2005    
2006    =item prefix (optional)
2007    
2008    Prefix to be put in front of each ID found.
2009    
2010    =item RETURN
2011    
2012    Returns a hash that maps each ID to its sequence.
2013    
2014    =back
2015    
2016    =cut
2017    #: Return Type %;
2018    sub ReadFasta {
2019        # Get the parameters.
2020        my ($fileName, $prefix) = @_;
2021        # Create the return hash.
2022        my %retVal = ();
2023        # Open the file for input.
2024        open FASTAFILE, '<', $fileName;
2025        # Declare the ID variable and clear the sequence accumulator.
2026        my $sequence = "";
2027        my $id = "";
2028        # Loop through the file.
2029        while (<FASTAFILE>) {
2030            # Get the current line.
2031            my $line = $_;
2032                  # Check for a header line.                  # Check for a header line.
2033                  if ($line =~ m/^>\s*(.+?)(\s|\n)/) {                  if ($line =~ m/^>\s*(.+?)(\s|\n)/) {
2034                          # Here we have a new header. Store the current sequence if we have one.                          # Here we have a new header. Store the current sequence if we have one.
2035                          if ($id) {                          if ($id) {
2036                                  $retVal{$id} = $sequence;                  $retVal{$id} = lc $sequence;
2037                          }                          }
2038                          # Clear the sequence accumulator and save the new ID.                          # Clear the sequence accumulator and save the new ID.
2039                          ($id, $sequence) = ("$prefix$1", "");                          ($id, $sequence) = ("$prefix$1", "");
2040                  } else {                  } else {
2041                          # Here we have a data line, so we add it to the sequence accumulator.                          # Here we have a data line, so we add it to the sequence accumulator.
2042                          # First, we get the actual data out.              # First, we get the actual data out. Note that we normalize to lower
2043                # case.
2044                          $line =~ /^\s*(.*?)(\s|\n)/;                          $line =~ /^\s*(.*?)(\s|\n)/;
2045                          $sequence .= $1;                          $sequence .= $1;
2046                  }                  }
2047          }          }
2048          # Flush out the last sequence (if any).          # Flush out the last sequence (if any).
2049          if ($sequence) {          if ($sequence) {
2050                  $retVal {$id} = $sequence;          $retVal{$id} = lc $sequence;
2051          }          }
2052        # Close the file.
2053        close FASTAFILE;
2054          # Return the hash constructed from the file.          # Return the hash constructed from the file.
2055          return %retVal;          return %retVal;
2056  }  }
# Line 1419  Line 2061 
2061    
2062  Insure that a list of feature locations is in the Sprout format. The Sprout feature location  Insure that a list of feature locations is in the Sprout format. The Sprout feature location
2063  format is I<contig>_I<beg*len> where I<*> is C<+> for a forward gene and C<-> for a backward  format is I<contig>_I<beg*len> where I<*> is C<+> for a forward gene and C<-> for a backward
2064  gene. The old format is I<contig>_I<beg>_I<end>.  gene. The old format is I<contig>_I<beg>_I<end>. If a feature is in the new format already,
2065    it will not be changed; otherwise, it will be converted. This method can also be used to
2066    perform the reverse task-- insuring that all the locations are in the old format.
2067    
2068  =over 4  =over 4
2069    
# Line 1446  Line 2090 
2090  #: Return Type @;  #: Return Type @;
2091  sub FormatLocations {  sub FormatLocations {
2092          # Get the parameters.          # Get the parameters.
2093          my $self = shift @_;      my ($self, $prefix, $locations, $oldFormat) = @_;
         my ($prefix, $locations, $oldFormat) = @_;  
2094          # Create the return list.          # Create the return list.
2095          my @retVal = ();          my @retVal = ();
2096          # Check to see if any locations were passed in.          # Check to see if any locations were passed in.
2097          if ($locations eq '') {          if ($locations eq '') {
2098              confess "No locations specified.";          Confess("No locations specified.");
2099          } else {          } else {
2100                  # Loop through the locations, converting them to the new format.                  # Loop through the locations, converting them to the new format.
2101                  for my $location (@{$locations}) {                  for my $location (@{$locations}) {
# Line 1487  Line 2130 
2130    
2131  sub DumpData {  sub DumpData {
2132          # Get the parameters.          # Get the parameters.
2133          my $self = shift @_;      my ($self) = @_;
2134          # Get the data directory name.          # Get the data directory name.
2135          my $outputDirectory = $self->{_options}->{dataDir};          my $outputDirectory = $self->{_options}->{dataDir};
2136          # Dump the relations.          # Dump the relations.
2137          $self->{_erdb}->DumpRelations($outputDirectory);      $self->DumpRelations($outputDirectory);
2138  }  }
2139    
2140  =head3 XMLFileName  =head3 XMLFileName
# Line 1503  Line 2146 
2146  =cut  =cut
2147  #: Return Type $;  #: Return Type $;
2148  sub XMLFileName {  sub XMLFileName {
2149          my $self = shift @_;      my ($self) = @_;
2150          return $self->{_xmlName};          return $self->{_xmlName};
2151  }  }
2152    
# Line 1523  Line 2166 
2166  The next statement inserts a C<HasProperty> relationship between feature C<fig|158879.1.peg.1> and  The next statement inserts a C<HasProperty> relationship between feature C<fig|158879.1.peg.1> and
2167  property C<4> with an evidence URL of C<http://seedu.uchicago.edu/query.cgi?article_id=142>.  property C<4> with an evidence URL of C<http://seedu.uchicago.edu/query.cgi?article_id=142>.
2168    
2169  C<< $sprout->InsertObject('HasProperty', { 'from-link' => 'fig|158879.1.peg.1', 'to-link' => 4, evidence = 'http://seedu.uchicago.edu/query.cgi?article_id=142'}); >>  C<< $sprout->InsertObject('HasProperty', { 'from-link' => 'fig|158879.1.peg.1', 'to-link' => 4, evidence => 'http://seedu.uchicago.edu/query.cgi?article_id=142'}); >>
2170    
2171  =over 4  =over 4
2172    
# Line 1541  Line 2184 
2184  #: Return Type ;  #: Return Type ;
2185  sub Insert {  sub Insert {
2186          # Get the parameters.          # Get the parameters.
2187          my $self = shift @_;      my ($self, $objectType, $fieldHash) = @_;
         my ($objectType, $fieldHash) = @_;  
2188          # Call the underlying method.          # Call the underlying method.
2189          $self->{_erdb}->InsertObject($objectType, $fieldHash);      $self->InsertObject($objectType, $fieldHash);
2190  }  }
2191    
2192  =head3 Annotate  =head3 Annotate
# Line 1583  Line 2225 
2225  #: Return Type $;  #: Return Type $;
2226  sub Annotate {  sub Annotate {
2227          # Get the parameters.          # Get the parameters.
2228          my $self = shift @_;      my ($self, $fid, $timestamp, $user, $text) = @_;
         my ($fid, $timestamp, $user, $text) = @_;  
2229          # Create the annotation ID.          # Create the annotation ID.
2230          my $aid = "$fid:$timestamp";          my $aid = "$fid:$timestamp";
2231          # Insert the Annotation object.          # Insert the Annotation object.
# Line 1604  Line 2245 
2245    
2246  =head3 AssignFunction  =head3 AssignFunction
2247    
2248  C<< my $ok = $sprout->AssignFunction($featureID, $user, $function); >>  C<< my $ok = $sprout->AssignFunction($featureID, $user, $function, $assigningUser); >>
2249    
2250  This method assigns a function to a feature. Functions are a special type of annotation. The general  This method assigns a function to a feature. Functions are a special type of annotation. The general
2251  format is "XXXX\nset XXXX function to\nYYYYY" where XXXX is the feature type and YYYY is the functional  format is described in L</ParseAssignment>.
 assignment text.  
2252    
2253  =over 4  =over 4
2254    
# Line 1618  Line 2258 
2258    
2259  =item user  =item user
2260    
2261  Name of the user making the assignment. This is frequently a group name, like C<kegg> or C<fig>.  Name of the user group making the assignment, such as C<kegg> or C<fig>.
2262    
2263  =item function  =item function
2264    
2265  Text of the function being assigned.  Text of the function being assigned.
2266    
2267    =item assigningUser (optional)
2268    
2269    Name of the individual user making the assignment. If omitted, defaults to the user group.
2270    
2271  =item RETURN  =item RETURN
2272    
2273  Returns 1 if successful, 0 if an error occurred.  Returns 1 if successful, 0 if an error occurred.
# Line 1634  Line 2278 
2278  #: Return Type $;  #: Return Type $;
2279  sub AssignFunction {  sub AssignFunction {
2280          # Get the parameters.          # Get the parameters.
2281          my $self = shift @_;      my ($self, $featureID, $user, $function, $assigningUser) = @_;
2282          my ($featureID, $user, $function) = @_;      # Default the assigning user.
2283        if (! $assigningUser) {
2284            $assigningUser = $user;
2285        }
2286          # Create an annotation string from the parameters.          # Create an annotation string from the parameters.
2287          my $annotationText = "$user\nset $user function to\n$function";      my $annotationText = "$assigningUser\nset $user function to\n$function";
2288          # Get the current time.          # Get the current time.
2289          my $now = time;          my $now = time;
2290          # Declare the return variable.          # Declare the return variable.
# Line 1682  Line 2329 
2329  #: Return Type @;  #: Return Type @;
2330  sub FeaturesByAlias {  sub FeaturesByAlias {
2331          # Get the parameters.          # Get the parameters.
2332          my $self = shift @_;      my ($self, $alias) = @_;
         my ($alias) = @_;  
2333          # Declare the return variable.          # Declare the return variable.
2334          my @retVal = ();          my @retVal = ();
2335          # Parse the alias.          # Parse the alias.
# Line 1699  Line 2345 
2345          return @retVal;          return @retVal;
2346  }  }
2347    
 =head3 Exists  
   
 C<< my $found = $sprout->Exists($entityName, $entityID); >>  
   
 Return TRUE if an entity exists, else FALSE.  
   
 =over 4  
   
 =item entityName  
   
 Name of the entity type (e.g. C<Feature>) relevant to the existence check.  
   
 =item entityID  
   
 ID of the entity instance whose existence is to be checked.  
   
 =item RETURN  
   
 Returns TRUE if the entity instance exists, else FALSE.  
   
 =back  
   
 =cut  
 #: Return Type $;  
 sub Exists {  
         # Get the parameters.  
         my $self = shift @_;  
         my ($entityName, $entityID) = @_;  
         # Check for the entity instance.  
         my $testInstance = $self->GetEntity($entityName, $entityID);  
         # Return an existence indicator.  
         my $retVal = ($testInstance ? 1 : 0);  
         return $retVal;  
 }  
   
2348  =head3 FeatureTranslation  =head3 FeatureTranslation
2349    
2350  C<< my $translation = $sprout->FeatureTranslation($featureID); >>  C<< my $translation = $sprout->FeatureTranslation($featureID); >>
# Line 1756  Line 2367 
2367  #: Return Type $;  #: Return Type $;
2368  sub FeatureTranslation {  sub FeatureTranslation {
2369          # Get the parameters.          # Get the parameters.
2370          my $self = shift @_;      my ($self, $featureID) = @_;
         my ($featureID) = @_;  
2371          # Get the specified feature's translation.          # Get the specified feature's translation.
2372          my ($retVal) = $self->GetEntityValues("Feature", $featureID, ['Feature(translation)']);          my ($retVal) = $self->GetEntityValues("Feature", $featureID, ['Feature(translation)']);
2373          return $retVal;          return $retVal;
# Line 1789  Line 2399 
2399  #: Return Type @;  #: Return Type @;
2400  sub Taxonomy {  sub Taxonomy {
2401          # Get the parameters.          # Get the parameters.
2402          my $self = shift @_;      my ($self, $genome) = @_;
         my ($genome) = @_;  
2403          # Find the specified genome's taxonomy string.          # Find the specified genome's taxonomy string.
2404          my ($list) = $self->GetEntityValues('Genome', $genome, ['Genome(taxonomy)']);          my ($list) = $self->GetEntityValues('Genome', $genome, ['Genome(taxonomy)']);
2405          # Declare the return variable.          # Declare the return variable.
# Line 1833  Line 2442 
2442  #: Return Type $;  #: Return Type $;
2443  sub CrudeDistance {  sub CrudeDistance {
2444          # Get the parameters.          # Get the parameters.
2445          my $self = shift @_;      my ($self, $genome1, $genome2) = @_;
         my ($genome1, $genome2) = @_;  
2446          # Insure that the distance is commutative by sorting the genome IDs.          # Insure that the distance is commutative by sorting the genome IDs.
2447          my ($genomeA, $genomeB);          my ($genomeA, $genomeB);
2448          if ($genome2 < $genome2) {          if ($genome2 < $genome2) {
# Line 1881  Line 2489 
2489  #: Return Type $;  #: Return Type $;
2490  sub RoleName {  sub RoleName {
2491          # Get the parameters.          # Get the parameters.
2492          my $self = shift @_;      my ($self, $roleID) = @_;
         my ($roleID) = @_;  
2493          # Get the specified role's name.          # Get the specified role's name.
2494          my ($retVal) = $self->GetEntityValues('Role', $roleID, ['Role(name)']);          my ($retVal) = $self->GetEntityValues('Role', $roleID, ['Role(name)']);
2495          # Use the ID if the role has no name.          # Use the ID if the role has no name.
# Line 1915  Line 2522 
2522  #: Return Type @;  #: Return Type @;
2523  sub RoleDiagrams {  sub RoleDiagrams {
2524          # Get the parameters.          # Get the parameters.
2525          my $self = shift @_;      my ($self, $roleID) = @_;
         my ($roleID) = @_;  
2526          # Query for the diagrams.          # Query for the diagrams.
2527          my @retVal = $self->GetFlat(['RoleOccursIn'], "RoleOccursIn(from-link) = ?", [$roleID],          my @retVal = $self->GetFlat(['RoleOccursIn'], "RoleOccursIn(from-link) = ?", [$roleID],
2528                                                                  'RoleOccursIn(to-link)');                                                                  'RoleOccursIn(to-link)');
# Line 1924  Line 2530 
2530          return @retVal;          return @retVal;
2531  }  }
2532    
2533    =head3 GetProperties
2534    
2535    C<< my @list = $sprout->GetProperties($fid, $key, $value, $url); >>
2536    
2537    Return a list of the properties with the specified characteristics.
2538    
2539    Properties are arbitrary key-value pairs associated with a feature. (At some point they
2540    will also be associated with genomes.) A property value is represented by a 4-tuple of
2541    the form B<($fid, $key, $value, $url)>. These exactly correspond to the parameter
2542    
2543    =over 4
2544    
2545    =item fid
2546    
2547    ID of the feature possessing the property.
2548    
2549    =item key
2550    
2551    Name or key of the property.
2552    
2553    =item value
2554    
2555    Value of the property.
2556    
2557    =item url
2558    
2559    URL of the document that indicated the property should have this particular value, or an
2560    empty string if no such document exists.
2561    
2562    =back
2563    
2564    The parameters act as a filter for the desired data. Any non-null parameter will
2565    automatically match all the tuples returned. So, specifying just the I<$fid> will
2566    return all the properties of the specified feature; similarly, specifying the I<$key>
2567    and I<$value> parameters will return all the features having the specified property
2568    value.
2569    
2570    A single property key can have many values, representing different ideas about the
2571    feature in question. For example, one paper may declare that a feature C<fig|83333.1.peg.10> is
2572    virulent, and another may declare that it is not virulent. A query about the virulence of
2573    C<fig|83333.1.peg.10> would be coded as
2574    
2575        my @list = $sprout->GetProperties('fig|83333.1.peg.10', 'virulence', '', '');
2576    
2577    Here the I<$value> and I<$url> fields are left blank, indicating that those fields are
2578    not to be filtered. The tuples returned would be
2579    
2580        ('fig|83333.1.peg.10', 'virulence', 'yes', 'http://www.somewhere.edu/first.paper.pdf')
2581        ('fig|83333.1.peg.10', 'virulence', 'no', 'http://www.somewhere.edu/second.paper.pdf')
2582    
2583    =cut
2584    #: Return Type @@;
2585    sub GetProperties {
2586        # Get the parameters.
2587        my ($self, @parms) = @_;
2588        # Declare the return variable.
2589        my @retVal = ();
2590        # Now we need to create a WHERE clause that will get us the data we want. First,
2591        # we create a list of the columns containing the data for each parameter.
2592        my @colNames = ('HasProperty(from-link)', 'Property(property-name)',
2593                        'Property(property-value)', 'HasProperty(evidence)');
2594        # Now we build the WHERE clause and the list of parameter values.
2595        my @where = ();
2596        my @values = ();
2597        for (my $i = 0; $i <= $#colNames; $i++) {
2598            my $parm = $parms[$i];
2599            if (defined $parm && ($parm ne '')) {
2600                push @where, "$colNames[$i] = ?";
2601                push @values, $parm;
2602            }
2603        }
2604        # Format the WHERE clause.
2605        my $filter = (@values > 0 ? (join " AND ", @where) : undef);
2606        # Ask for all the propertie values with the desired characteristics.
2607        my $query = $self->Get(['HasProperty', 'Property'], $filter, \@values);
2608        while (my $valueObject = $query->Fetch()) {
2609            my @tuple = $valueObject->Values(\@colNames);
2610            push @retVal, \@tuple;
2611        }
2612        # Return the result.
2613        return @retVal;
2614    }
2615    
2616  =head3 FeatureProperties  =head3 FeatureProperties
2617    
2618  C<< my @properties = $sprout->FeatureProperties($featureID); >>  C<< my @properties = $sprout->FeatureProperties($featureID); >>
# Line 1953  Line 2642 
2642  #: Return Type @@;  #: Return Type @@;
2643  sub FeatureProperties {  sub FeatureProperties {
2644          # Get the parameters.          # Get the parameters.
2645          my $self = shift @_;      my ($self, $featureID) = @_;
         my ($featureID) = @_;  
2646          # Get the properties.          # Get the properties.
2647          my @retVal = $self->GetAll(['HasProperty', 'Property'], "HasProperty(from-link) = ?", [$featureID],          my @retVal = $self->GetAll(['HasProperty', 'Property'], "HasProperty(from-link) = ?", [$featureID],
2648                                                          ['Property(property-name)', 'Property(property-value)',                                                          ['Property(property-name)', 'Property(property-value)',
# Line 1985  Line 2673 
2673  #: Return Type $;  #: Return Type $;
2674  sub DiagramName {  sub DiagramName {
2675          # Get the parameters.          # Get the parameters.
2676          my $self = shift @_;      my ($self, $diagramID) = @_;
         my ($diagramID) = @_;  
2677          # Get the specified diagram's name and return it.          # Get the specified diagram's name and return it.
2678          my ($retVal) = $self->GetEntityValues('Diagram', $diagramID, ['Diagram(name)']);          my ($retVal) = $self->GetEntityValues('Diagram', $diagramID, ['Diagram(name)']);
2679          return $retVal;          return $retVal;
2680  }  }
2681    
2682    =head3 PropertyID
2683    
2684    C<< my $id = $sprout->PropertyID($propName, $propValue); >>
2685    
2686    Return the ID of the specified property name and value pair, if the
2687    pair exists.
2688    
2689    =over 4
2690    
2691    =item propName
2692    
2693    Name of the desired property.
2694    
2695    =item propValue
2696    
2697    Value expected for the desired property.
2698    
2699    =item RETURN
2700    
2701    Returns the ID of the name/value pair, or C<undef> if the pair does not exist.
2702    
2703    =back
2704    
2705    =cut
2706    
2707    sub PropertyID {
2708        # Get the parameters.
2709        my ($self, $propName, $propValue) = @_;
2710        # Try to find the ID.
2711        my ($retVal) = $self->GetFlat(['Property'],
2712                                      "Property(property-name) = ? AND Property(property-value) = ?",
2713                                      [$propName, $propValue], 'Property(id)');
2714        # Return the result.
2715        return $retVal;
2716    }
2717    
2718  =head3 MergedAnnotations  =head3 MergedAnnotations
2719    
2720  C<< my @annotationList = $sprout->MergedAnnotations(\@list); >>  C<< my @annotationList = $sprout->MergedAnnotations(\@list); >>
# Line 2018  Line 2741 
2741  #: Return Type @;  #: Return Type @;
2742  sub MergedAnnotations {  sub MergedAnnotations {
2743          # Get the parameters.          # Get the parameters.
2744          my $self = shift @_;      my ($self, $list) = @_;
         my ($list) = @_;  
2745          # Create a list to hold the annotation tuples found.          # Create a list to hold the annotation tuples found.
2746          my @tuples = ();          my @tuples = ();
2747          # Loop through the features in the input list.          # Loop through the features in the input list.
# Line 2067  Line 2789 
2789  #: Return Type @;  #: Return Type @;
2790  sub RoleNeighbors {  sub RoleNeighbors {
2791          # Get the parameters.          # Get the parameters.
2792          my $self = shift @_;      my ($self, $roleID) = @_;
         my ($roleID) = @_;  
2793          # Get all the diagrams containing this role.          # Get all the diagrams containing this role.
2794          my @diagrams = $self->GetFlat(['RoleOccursIn'], "RoleOccursIn(from-link) = ?", [$roleID],          my @diagrams = $self->GetFlat(['RoleOccursIn'], "RoleOccursIn(from-link) = ?", [$roleID],
2795                                                                    'RoleOccursIn(to-link)');                                                                    'RoleOccursIn(to-link)');
# Line 2110  Line 2831 
2831  #: Return Type @;  #: Return Type @;
2832  sub FeatureLinks {  sub FeatureLinks {
2833          # Get the parameters.          # Get the parameters.
2834          my $self = shift @_;      my ($self, $featureID) = @_;
         my ($featureID) = @_;  
2835          # Get the feature's links.          # Get the feature's links.
2836          my @retVal = $self->GetEntityValues('Feature', $featureID, ['Feature(link)']);          my @retVal = $self->GetEntityValues('Feature', $featureID, ['Feature(link)']);
2837          # Return the feature's links.          # Return the feature's links.
# Line 2123  Line 2843 
2843  C<< my %subsystems = $sprout->SubsystemsOf($featureID); >>  C<< my %subsystems = $sprout->SubsystemsOf($featureID); >>
2844    
2845  Return a hash describing all the subsystems in which a feature participates. Each subsystem is mapped  Return a hash describing all the subsystems in which a feature participates. Each subsystem is mapped
2846  to the role the feature performs.  to the roles the feature performs.
2847    
2848  =over 4  =over 4
2849    
# Line 2133  Line 2853 
2853    
2854  =item RETURN  =item RETURN
2855    
2856  Returns a hash mapping all the feature's subsystems to the feature's role.  Returns a hash mapping all the feature's subsystems to a list of the feature's roles.
2857    
2858  =back  =back
2859    
2860  =cut  =cut
2861  #: Return Type %;  #: Return Type %@;
2862  sub SubsystemsOf {  sub SubsystemsOf {
2863          # Get the parameters.          # Get the parameters.
2864          my $self = shift @_;      my ($self, $featureID) = @_;
2865          my ($featureID) = @_;      # Get the subsystem list.
         # Use the SSCell to connect features to subsystems.  
2866          my @subsystems = $self->GetAll(['ContainsFeature', 'HasSSCell', 'IsRoleOf'],          my @subsystems = $self->GetAll(['ContainsFeature', 'HasSSCell', 'IsRoleOf'],
2867                                                                          "ContainsFeature(to-link) = ?", [$featureID],                                                                          "ContainsFeature(to-link) = ?", [$featureID],
2868                                                                          ['HasSSCell(from-link)', 'IsRoleOf(from-link)']);                                                                          ['HasSSCell(from-link)', 'IsRoleOf(from-link)']);
2869          # Create the return value.          # Create the return value.
2870          my %retVal = ();          my %retVal = ();
2871        # Build a hash to weed out duplicates. Sometimes the same PEG and role appears
2872        # in two spreadsheet cells.
2873        my %dupHash = ();
2874          # Loop through the results, adding them to the hash.          # Loop through the results, adding them to the hash.
2875          for my $record (@subsystems) {          for my $record (@subsystems) {
2876                  $retVal{$record->[0]} = $record->[1];          # Get this subsystem and role.
2877            my ($subsys, $role) = @{$record};
2878            # Insure it's the first time for both.
2879            my $dupKey = "$subsys\n$role";
2880            if (! exists $dupHash{"$subsys\n$role"}) {
2881                $dupHash{$dupKey} = 1;
2882                push @{$retVal{$subsys}}, $role;
2883            }
2884          }          }
2885          # Return the hash.          # Return the hash.
2886          return %retVal;          return %retVal;
2887  }  }
2888    
2889    =head3 SubsystemList
2890    
2891    C<< my @subsystems = $sprout->SubsystemList($featureID); >>
2892    
2893    Return a list containing the names of the subsystems in which the specified
2894    feature participates. Unlike L</SubsystemsOf>, this method only returns the
2895    subsystem names, not the roles.
2896    
2897    =over 4
2898    
2899    =item featureID
2900    
2901    ID of the feature whose subsystem names are desired.
2902    
2903    =item RETURN
2904    
2905    Returns a list of the names of the subsystems in which the feature participates.
2906    
2907    =back
2908    
2909    =cut
2910    #: Return Type @;
2911    sub SubsystemList {
2912        # Get the parameters.
2913        my ($self, $featureID) = @_;
2914        # Get the list of names.
2915        my @retVal = $self->GetFlat(['HasRoleInSubsystem'], "HasRoleInSubsystem(from-link) = ?",
2916                                    [$featureID], 'HasRoleInSubsystem(to-link)');
2917        # Return the result, sorted.
2918        return sort @retVal;
2919    }
2920    
2921    =head3 GenomeSubsystemData
2922    
2923    C<< my %featureData = $sprout->GenomeSubsystemData($genomeID); >>
2924    
2925    Return a hash mapping genome features to their subsystem roles.
2926    
2927    =over 4
2928    
2929    =item genomeID
2930    
2931    ID of the genome whose subsystem feature map is desired.
2932    
2933    =item RETURN
2934    
2935    Returns a hash mapping each feature of the genome to a list of 2-tuples. Eacb
2936    2-tuple contains a subsystem name followed by a role ID.
2937    
2938    =back
2939    
2940    =cut
2941    
2942    sub GenomeSubsystemData {
2943        # Get the parameters.
2944        my ($self, $genomeID) = @_;
2945        # Declare the return variable.
2946        my %retVal = ();
2947        # Get a list of the genome features that participate in subsystems. For each
2948        # feature we get its spreadsheet cells and the corresponding roles.
2949        my @roleData = $self->GetAll(['HasFeature', 'ContainsFeature', 'IsRoleOf'],
2950                                 "HasFeature(from-link) = ?", [$genomeID],
2951                                 ['HasFeature(to-link)', 'IsRoleOf(to-link)', 'IsRoleOf(from-link)']);
2952        # Now we get a list of the spreadsheet cells and their associated subsystems. Subsystems
2953        # with an unknown variant code (-1) are skipped. Note the genome ID is at both ends of the
2954        # list. We use it at the beginning to get all the spreadsheet cells for the genome and
2955        # again at the end to filter out participation in subsystems with a negative variant code.
2956        my @cellData = $self->GetAll(['IsGenomeOf', 'HasSSCell', 'ParticipatesIn'],
2957                                     "IsGenomeOf(from-link) = ? AND ParticipatesIn(variant-code) >= 0 AND ParticipatesIn(from-link) = ?",
2958                                     [$genomeID, $genomeID], ['HasSSCell(to-link)', 'HasSSCell(from-link)']);
2959        # Now "@roleData" lists the spreadsheet cell and role for each of the genome's features.
2960        # "@cellData" lists the subsystem name for each of the genome's spreadsheet cells. We
2961        # link these two lists together to create the result. First, we want a hash mapping
2962        # spreadsheet cells to subsystem names.
2963        my %subHash = map { $_->[0] => $_->[1] } @cellData;
2964        # We loop through @cellData to build the hash.
2965        for my $roleEntry (@roleData) {
2966            # Get the data for this feature and cell.
2967            my ($fid, $cellID, $role) = @{$roleEntry};
2968            # Check for a subsystem name.
2969            my $subsys = $subHash{$cellID};
2970            if ($subsys) {
2971                # Insure this feature has an entry in the return hash.
2972                if (! exists $retVal{$fid}) { $retVal{$fid} = []; }
2973                # Merge in this new data.
2974                push @{$retVal{$fid}}, [$subsys, $role];
2975            }
2976        }
2977        # Return the result.
2978        return %retVal;
2979    }
2980    
2981  =head3 RelatedFeatures  =head3 RelatedFeatures
2982    
2983  C<< my @relatedList = $sprout->RelatedFeatures($featureID, $function, $userID); >>  C<< my @relatedList = $sprout->RelatedFeatures($featureID, $function, $userID); >>
# Line 2190  Line 3011 
3011  #: Return Type @;  #: Return Type @;
3012  sub RelatedFeatures {  sub RelatedFeatures {
3013          # Get the parameters.          # Get the parameters.
3014          my $self = shift @_;      my ($self, $featureID, $function, $userID) = @_;
         my ($featureID, $function, $userID) = @_;  
3015          # Get a list of the features that are BBHs of the incoming feature.          # Get a list of the features that are BBHs of the incoming feature.
3016          my @bbhFeatures = $self->GetFlat(['IsBidirectionalBestHitOf'],      my @bbhFeatures = map { $_->[0] } FIGRules::BBHData($featureID);
                                                                          "IsBidirectionalBestHitOf(from-link) = ?", [$featureID],  
                                                                          'IsBidirectionalBestHitOf(to-link)');  
3017          # Now we loop through the features, pulling out the ones that have the correct          # Now we loop through the features, pulling out the ones that have the correct
3018          # functional assignment.          # functional assignment.
3019          my @retVal = ();          my @retVal = ();
# Line 2239  Line 3057 
3057  #: Return Type @;  #: Return Type @;
3058  sub TaxonomySort {  sub TaxonomySort {
3059          # Get the parameters.          # Get the parameters.
3060          my $self = shift @_;      my ($self, $featureIDs) = @_;
         my ($featureIDs) = @_;  
3061          # Create the working hash table.          # Create the working hash table.
3062          my %hashBuffer = ();          my %hashBuffer = ();
3063          # Loop through the features.          # Loop through the features.
# Line 2249  Line 3066 
3066                  my ($taxonomy) = $self->GetFlat(['IsLocatedIn', 'HasContig', 'Genome'], "IsLocatedIn(from-link) = ?",                  my ($taxonomy) = $self->GetFlat(['IsLocatedIn', 'HasContig', 'Genome'], "IsLocatedIn(from-link) = ?",
3067                                                                                  [$fid], 'Genome(taxonomy)');                                                                                  [$fid], 'Genome(taxonomy)');
3068                  # Add this feature to the hash buffer.                  # Add this feature to the hash buffer.
3069                  if (exists $hashBuffer{$taxonomy}) {          Tracer::AddToListMap(\%hashBuffer, $taxonomy, $fid);
                         push @{$hashBuffer{$taxonomy}}, $fid;  
                 } else {  
                         $hashBuffer{$taxonomy} = [$fid];  
                 }  
3070          }          }
3071          # Sort the keys and get the elements.          # Sort the keys and get the elements.
3072          my @retVal = ();          my @retVal = ();
# Line 2264  Line 3077 
3077          return @retVal;          return @retVal;
3078  }  }
3079    
3080  =head3 GetAll  =head3 Protein
   
 C<< my @list = $sprout->GetAll(\@objectNames, $filterClause, \@parameters, \@fields, $count); >>  
   
 Return a list of values taken from the objects returned by a query. The first three  
 parameters correspond to the parameters of the L</Get> method. The final parameter is  
 a list of the fields desired from each record found by the query. The field name  
 syntax is the standard syntax used for fields in the B<ERDB> system--  
 B<I<objectName>(I<fieldName>)>-- where I<objectName> is the name of the relevant entity  
 or relationship and I<fieldName> is the name of the field.  
3081    
3082  The list returned will be a list of lists. Each element of the list will contain  C<< my $protein = Sprout::Protein($sequence, $table); >>
 the values returned for the fields specified in the fourth parameter. If one of the  
 fields specified returns multiple values, they are flattened in with the rest. For  
 example, the following call will return a list of the features in a particular  
 spreadsheet cell, and each feature will be represented by a list containing the  
 feature ID followed by all of its aliases.  
3083    
3084  C<< $query = $sprout->Get(['ContainsFeature', 'Feature'], "ContainsFeature(from-link) = ?", [$ssCellID], ['Feature(id)', 'Feature(alias)']); >>  Translate a DNA sequence into a protein sequence.
3085    
3086  =over 4  =over 4
3087    
3088  =item objectNames  =item sequence
   
 List containing the names of the entity and relationship objects to be retrieved.  
   
 =item filterClause  
   
 WHERE/ORDER BY clause (without the WHERE) to be used to filter and sort the query. The WHERE clause can  
 be parameterized with parameter markers (C<?>). Each field used must be specified in the standard form  
 B<I<objectName>(I<fieldName>)>. Any parameters specified in the filter clause should be added to the  
 parameter list as additional parameters. The fields in a filter clause can come from primary  
 entity relations, relationship relations, or secondary entity relations; however, all of the  
 entities and relationships involved must be included in the list of object names.  
   
 =item parameterList  
   
 List of the parameters to be substituted in for the parameters marks in the filter clause.  
   
 =item fields  
3089    
3090  List of the fields to be returned in each element of the list returned.  DNA sequence to translate.
3091    
3092  =item count  =item table (optional)
3093    
3094  Maximum number of records to return. If omitted or 0, all available records will be returned.  Reference to a Hash that translates DNA triples to proteins. A triple that does not
3095    appear in the hash will be translated automatically to C<X>.
3096    
3097  =item RETURN  =item RETURN
3098    
3099  Returns a list of list references. Each element of the return list contains the values for the  Returns the protein sequence that would be created by the DNA sequence.
 fields specified in the B<fields> parameter.  
   
 =back  
   
 =cut  
 #: Return Type @@;  
 sub GetAll {  
         # Get the parameters.  
         my $self = shift @_;  
         my ($objectNames, $filterClause, $parameterList, $fields, $count) = @_;  
         # Create the query.  
         my $query = $self->Get($objectNames, $filterClause, $parameterList);  
         # Set up a counter of the number of records read.  
         my $fetched = 0;  
         # Insure the counter has a value.  
         if (!defined $count) {  
                 $count = 0;  
         }  
         # Loop through the records returned, extracting the fields. Note that if the  
         # counter is non-zero, we stop when the number of records read hits the count.  
         my @retVal = ();  
         while (($count == 0 || $fetched < $count) && (my $row = $query->Fetch())) {  
                 my @rowData = $row->Values($fields);  
                 push @retVal, \@rowData;  
                 $fetched++;  
         }  
         # Return the resulting list.  
         return @retVal;  
 }  
   
 =head3 GetFlat  
   
 C<< my @list = $sprout->GetFlat(\@objectNames, $filterClause, $parameterList, $field); >>  
   
 This is a variation of L</GetAll> that asks for only a single field per record and  
 returns a single flattened list.  
   
 =over 4  
   
 =item objectNames  
   
 List containing the names of the entity and relationship objects to be retrieved.  
   
 =item filterClause  
   
 WHERE/ORDER BY clause (without the WHERE) to be used to filter and sort the query. The WHERE clause can  
 be parameterized with parameter markers (C<?>). Each field used must be specified in the standard form  
 B<I<objectName>(I<fieldName>)>. Any parameters specified in the filter clause should be added to the  
 parameter list as additional parameters. The fields in a filter clause can come from primary  
 entity relations, relationship relations, or secondary entity relations; however, all of the  
 entities and relationships involved must be included in the list of object names.  
   
 =item parameterList  
   
 List of the parameters to be substituted in for the parameters marks in the filter clause.  
   
 =item field  
   
 Name of the field to be used to get the elements of the list returned.  
   
 =item RETURN  
   
 Returns a list of values.  
   
 =back  
   
 =cut  
 #: Return Type @;  
 sub GetFlat {  
         # Get the parameters.  
         my $self = shift @_;  
         my ($objectNames, $filterClause, $parameterList, $field) = @_;  
         # Construct the query.  
         my $query = $self->Get($objectNames, $filterClause, $parameterList);  
         # Create the result list.  
         my @retVal = ();  
         # Loop through the records, adding the field values found to the result list.  
         while (my $row = $query->Fetch()) {  
                 push @retVal, $row->Value($field);  
         }  
         # Return the list created.  
         return @retVal;  
 }  
   
 =head3 Protein  
   
 C<< my $protein = Sprout::Protein($sequence, $table); >>  
   
 Translate a DNA sequence into a protein sequence.  
   
 =over 4  
   
 =item sequence  
   
 DNA sequence to translate.  
   
 =item table (optional)  
   
 Reference to a Hash that translates DNA triples to proteins. A triple that does not  
 appear in the hash will be translated automatically to C<X>.  
   
 =item RETURN  
   
 Returns the protein sequence that would be created by the DNA sequence.  
3100    
3101  =back  =back
3102    
# Line 2470  Line 3149 
3149          # Loop through the input triples.          # Loop through the input triples.
3150          my $n = length $sequence;          my $n = length $sequence;
3151          for (my $i = 0; $i < $n; $i += 3) {          for (my $i = 0; $i < $n; $i += 3) {
3152                  # Get the current triple from the sequence.          # Get the current triple from the sequence. Note we convert to
3153                  my $triple = substr($sequence, $i, 3);          # upper case to insure a match.
3154            my $triple = uc substr($sequence, $i, 3);
3155                  # Translate it using the table.                  # Translate it using the table.
3156                  my $protein = "X";                  my $protein = "X";
3157                  if (exists $table->{$triple}) { $protein = $table->{$triple}; }                  if (exists $table->{$triple}) { $protein = $table->{$triple}; }
# Line 2495  Line 3175 
3175  #: Return Type @;  #: Return Type @;
3176  sub LoadInfo {  sub LoadInfo {
3177          # Get the parameters.          # Get the parameters.
3178          my $self = shift @_;      my ($self) = @_;
3179          # Create the return list, priming it with the name of the data directory.          # Create the return list, priming it with the name of the data directory.
3180          my @retVal = ($self->{_options}->{dataDir});          my @retVal = ($self->{_options}->{dataDir});
3181          # Concatenate the table names.          # Concatenate the table names.
3182          push @retVal, $self->{_erdb}->GetTableNames();      push @retVal, $self->GetTableNames();
3183          # Return the result.          # Return the result.
3184          return @retVal;          return @retVal;
3185  }  }
3186    
3187  =head3 LowBBHs  =head3 LowBBHs
3188    
3189  C<< my %bbhMap = $sprout->GoodBBHs($featureID, $cutoff); >>  C<< my %bbhMap = $sprout->LowBBHs($featureID, $cutoff); >>
3190    
3191  Return the bidirectional best hits of a feature whose score is no greater than a  Return the bidirectional best hits of a feature whose score is no greater than a
3192  specified cutoff value. A higher cutoff value will allow inclusion of hits with  specified cutoff value. A higher cutoff value will allow inclusion of hits with
# Line 2532  Line 3212 
3212  #: Return Type %;  #: Return Type %;
3213  sub LowBBHs {  sub LowBBHs {
3214          # Get the parsameters.          # Get the parsameters.
3215          my $self = shift @_;      my ($self, $featureID, $cutoff) = @_;
         my ($featureID, $cutoff) = @_;  
3216          # Create the return hash.          # Create the return hash.
3217          my %retVal = ();          my %retVal = ();
3218          # Create a query to get the desired BBHs.      # Query for the desired BBHs.
3219          my @bbhList = $self->GetAll(['IsBidirectionalBestHitOf'],      my @bbhList = FIGRules::BBHData($featureID, $cutoff);
                                                                 'IsBidirectionalBestHitOf(sc) <= ? AND IsBidirectionalBestHitOf(from-link) = ?',  
                                                                 [$cutoff, $featureID],  
                                                                 ['IsBidirectionalBestHitOf(to-link)', 'IsBidirectionalBestHitOf(sc)']);  
3220          # Form the results into the return hash.          # Form the results into the return hash.
3221          for my $pair (@bbhList) {          for my $pair (@bbhList) {
3222                  $retVal{$pair->[0]} = $pair->[1];                  $retVal{$pair->[0]} = $pair->[1];
# Line 2549  Line 3225 
3225          return %retVal;          return %retVal;
3226  }  }
3227    
3228    =head3 Sims
3229    
3230    C<< my $simList = $sprout->Sims($fid, $maxN, $maxP, $select, $max_expand, $filters); >>
3231    
3232    Get a list of similarities for a specified feature. Similarity information is not kept in the
3233    Sprout database; rather, they are retrieved from a network server. The similarities are
3234    returned as B<Sim> objects. A Sim object is actually a list reference that has been blessed
3235    so that its elements can be accessed by name.
3236    
3237    Similarities can be either raw or expanded. The raw similarities are basic
3238    hits between features with similar DNA. Expanding a raw similarity drags in any
3239    features considered substantially identical. So, for example, if features B<A1>,
3240    B<A2>, and B<A3> are all substatially identical to B<A>, then a raw similarity
3241    B<[C,A]> would be expanded to B<[C,A] [C,A1] [C,A2] [C,A3]>.
3242    
3243    =over 4
3244    
3245    =item fid
3246    
3247    ID of the feature whose similarities are desired.
3248    
3249    =item maxN
3250    
3251    Maximum number of similarities to return.
3252    
3253    =item maxP
3254    
3255    Minumum allowable similarity score.
3256    
3257    =item select
3258    
3259    Selection criterion: C<raw> means only raw similarities are returned; C<fig>
3260    means only similarities to FIG features are returned; C<all> means all expanded
3261    similarities are returned; and C<figx> means similarities are expanded until the
3262    number of FIG features equals the maximum.
3263    
3264    =item max_expand
3265    
3266    The maximum number of features to expand.
3267    
3268    =item filters
3269    
3270    Reference to a hash containing filter information, or a subroutine that can be
3271    used to filter the sims.
3272    
3273    =item RETURN
3274    
3275    Returns a reference to a list of similarity objects, or C<undef> if an error
3276    occurred.
3277    
3278    =back
3279    
3280    =cut
3281    
3282    sub Sims {
3283        # Get the parameters.
3284        my ($self, $fid, $maxN, $maxP, $select, $max_expand, $filters) = @_;
3285        # Create the shim object to test for deleted FIDs.
3286        my $shim = FidCheck->new($self);
3287        # Ask the network for sims.
3288        my $retVal = FIGRules::GetNetworkSims($shim, $fid, {}, $maxN, $maxP, $select, $max_expand, $filters);
3289        # Return the result.
3290        return $retVal;
3291    }
3292    
3293    =head3 IsAllGenomes
3294    
3295    C<< my $flag = $sprout->IsAllGenomes(\@list, \@checkList); >>
3296    
3297    Return TRUE if all genomes in the second list are represented in the first list at
3298    least one. Otherwise, return FALSE. If the second list is omitted, the first list is
3299    compared to a list of all the genomes.
3300    
3301    =over 4
3302    
3303    =item list
3304    
3305    Reference to the list to be compared to the second list.
3306    
3307    =item checkList (optional)
3308    
3309    Reference to the comparison target list. Every genome ID in this list must occur at
3310    least once in the first list. If this parameter is omitted, a list of all the genomes
3311    is used.
3312    
3313    =item RETURN
3314    
3315    Returns TRUE if every item in the second list appears at least once in the
3316    first list, else FALSE.
3317    
3318    =back
3319    
3320    =cut
3321    
3322    sub IsAllGenomes {
3323        # Get the parameters.
3324        my ($self, $list, $checkList) = @_;
3325        # Supply the checklist if it was omitted.
3326        $checkList = [$self->Genomes()] if ! defined($checkList);
3327        # Create a hash of the original list.
3328        my %testList = map { $_ => 1 } @{$list};
3329        # Declare the return variable. We assume that the representation
3330        # is complete and stop at the first failure.
3331        my $retVal = 1;
3332        my $n = scalar @{$checkList};
3333        for (my $i = 0; $retVal && $i < $n; $i++) {
3334            if (! $testList{$checkList->[$i]}) {
3335                $retVal = 0;
3336            }
3337        }
3338        # Return the result.
3339        return $retVal;
3340    }
3341    
3342    =head3 GetGroups
3343    
3344    C<< my %groups = $sprout->GetGroups(\@groupList); >>
3345    
3346    Return a hash mapping each group to the IDs of the genomes in the group.
3347    A list of groups may be specified, in which case only those groups will be
3348    shown. Alternatively, if no parameter is supplied, all groups will be
3349    included. Genomes that are not in any group are omitted.
3350    
3351    =cut
3352    #: Return Type %@;
3353    sub GetGroups {
3354        # Get the parameters.
3355        my ($self, $groupList) = @_;
3356        # Declare the return value.
3357        my %retVal = ();
3358        # Determine whether we are getting all the groups or just some.
3359        if (defined $groupList) {
3360            # Here we have a group list. Loop through them individually,
3361            # getting a list of the relevant genomes.
3362            for my $group (@{$groupList}) {
3363                my @genomeIDs = $self->GetFlat(['Genome'], "Genome(primary-group) = ?",
3364                    [$group], "Genome(id)");
3365                $retVal{$group} = \@genomeIDs;
3366            }
3367        } else {
3368            # Here we need all of the groups. In this case, we run through all
3369            # of the genome records, putting each one found into the appropriate
3370            # group. Note that we use a filter clause to insure that only genomes
3371            # in real NMPDR groups are included in the return set.
3372            my @genomes = $self->GetAll(['Genome'], "Genome(primary-group) <> ?",
3373                                        [$FIG_Config::otherGroup], ['Genome(id)', 'Genome(primary-group)']);
3374            # Loop through the genomes found.
3375            for my $genome (@genomes) {
3376                # Pop this genome's ID off the current list.
3377                my @groups = @{$genome};
3378                my $genomeID = shift @groups;
3379                # Loop through the groups, adding the genome ID to each group's
3380                # list.
3381                for my $group (@groups) {
3382                    Tracer::AddToListMap(\%retVal, $group, $genomeID);
3383                }
3384            }
3385        }
3386        # Return the hash we just built.
3387        return %retVal;
3388    }
3389    
3390    =head3 MyGenomes
3391    
3392    C<< my @genomes = Sprout::MyGenomes($dataDir); >>
3393    
3394    Return a list of the genomes to be included in the Sprout.
3395    
3396    This method is provided for use during the Sprout load. It presumes the Genome load file has
3397    already been created. (It will be in the Sprout data directory and called either C<Genome>
3398    or C<Genome.dtx>.) Essentially, it reads in the Genome load file and strips out the genome
3399    IDs.
3400    
3401    =over 4
3402    
3403    =item dataDir
3404    
3405    Directory containing the Sprout load files.
3406    
3407    =back
3408    
3409    =cut
3410    #: Return Type @;
3411    sub MyGenomes {
3412        # Get the parameters.
3413        my ($dataDir) = @_;
3414        # Compute the genome file name.
3415        my $genomeFileName = LoadFileName($dataDir, "Genome");
3416        # Extract the genome IDs from the files.
3417        my @retVal = map { $_ =~ /^(\S+)/; $1 } Tracer::GetFile($genomeFileName);
3418        # Return the result.
3419        return @retVal;
3420    }
3421    
3422    =head3 LoadFileName
3423    
3424    C<< my $fileName = Sprout::LoadFileName($dataDir, $tableName); >>
3425    
3426    Return the name of the load file for the specified table in the specified data
3427    directory.
3428    
3429    =over 4
3430    
3431    =item dataDir
3432    
3433    Directory containing the Sprout load files.
3434    
3435    =item tableName
3436    
3437    Name of the table whose load file is desired.
3438    
3439    =item RETURN
3440    
3441    Returns the name of the file containing the load data for the specified table, or
3442    C<undef> if no load file is present.
3443    
3444    =back
3445    
3446    =cut
3447    #: Return Type $;
3448    sub LoadFileName {
3449        # Get the parameters.
3450        my ($dataDir, $tableName) = @_;
3451        # Declare the return variable.
3452        my $retVal;
3453        # Check for the various file names.
3454        if (-e "$dataDir/$tableName") {
3455            $retVal = "$dataDir/$tableName";
3456        } elsif (-e "$dataDir/$tableName.dtx") {
3457            $retVal = "$dataDir/$tableName.dtx";
3458        }
3459        # Return the result.
3460        return $retVal;
3461    }
3462    
3463    =head3 DeleteGenome
3464    
3465    C<< my $stats = $sprout->DeleteGenome($genomeID, $testFlag); >>
3466    
3467    Delete a genome from the database.
3468    
3469    =over 4
3470    
3471    =item genomeID
3472    
3473    ID of the genome to delete
3474    
3475    =item testFlag
3476    
3477    If TRUE, then the DELETE statements will be traced, but no deletions will occur.
3478    
3479    =item RETURN
3480    
3481    Returns a statistics object describing the rows deleted.
3482    
3483    =back
3484    
3485    =cut
3486    #: Return Type $%;
3487    sub DeleteGenome {
3488        # Get the parameters.
3489        my ($self, $genomeID, $testFlag) = @_;
3490        # Perform the delete for the genome's features.
3491        my $retVal = $self->Delete('Feature', "fig|$genomeID.%", $testFlag);
3492        # Perform the delete for the primary genome data.
3493        my $stats = $self->Delete('Genome', $genomeID, $testFlag);
3494        $retVal->Accumulate($stats);
3495        # Return the result.
3496        return $retVal;
3497    }
3498    
3499    =head3 Fix
3500    
3501    C<< my %fixedHash = Sprout::Fix(%groupHash); >>
3502    
3503    Prepare a genome group hash (like that returned by L</GetGroups> for processing.
3504    Groups with the same primary name will be combined. The primary name is the
3505    first capitalized word in the group name.
3506    
3507    =over 4
3508    
3509    =item groupHash
3510    
3511    Hash to be fixed up.
3512    
3513    =item RETURN
3514    
3515    Returns a fixed-up version of the hash.
3516    
3517    =back
3518    
3519    =cut
3520    
3521    sub Fix {
3522        # Get the parameters.
3523        my (%groupHash) = @_;
3524        # Create the result hash.
3525        my %retVal = ();
3526        # Copy over the genomes.
3527        for my $groupID (keys %groupHash) {
3528            # Make a safety copy of the group ID.
3529            my $realGroupID = $groupID;
3530            # Yank the primary name.
3531            if ($groupID =~ /([A-Z]\w+)/) {
3532                $realGroupID = $1;
3533            }
3534            # Append this group's genomes into the result hash.
3535            Tracer::AddToListMap(\%retVal, $realGroupID, @{$groupHash{$groupID}});
3536        }
3537        # Return the result hash.
3538        return %retVal;
3539    }
3540    
3541    =head3 GroupPageName
3542    
3543    C<< my $name = $sprout->GroupPageName($group); >>
3544    
3545    Return the name of the page for the specified NMPDR group.
3546    
3547    =over 4
3548    
3549    =item group
3550    
3551    Name of the relevant group.
3552    
3553    =item RETURN
3554    
3555    Returns the relative page name (e.g. C<../content/campy.php>). If the group file is not in
3556    memory it will be read in.
3557    
3558    =back
3559    
3560    =cut
3561    
3562    sub GroupPageName {
3563        # Get the parameters.
3564        my ($self, $group) = @_;
3565        # Declare the return variable.
3566        my $retVal;
3567        # Check for the group file data.
3568        if (! defined $self->{groupHash}) {
3569            # Read the group file.
3570            my %groupData = Sprout::ReadGroupFile($self->{_options}->{dataDir} . "/groups.tbl");
3571            # Store it in our object.
3572            $self->{groupHash} = \%groupData;
3573        }
3574        # Compute the real group name.
3575        my $realGroup = $group;
3576        if ($group =~ /([A-Z]\w+)/) {
3577            $realGroup = $1;
3578        }
3579        # Return the page name.
3580        $retVal = "../content/" . $self->{groupHash}->{$realGroup}->[1];
3581        # Return the result.
3582        return $retVal;
3583    }
3584    
3585    =head3 ReadGroupFile
3586    
3587    C<< my %groupData = Sprout::ReadGroupFile($groupFileName); >>
3588    
3589    Read in the data from the specified group file. The group file contains information
3590    about each of the NMPDR groups.
3591    
3592    =over 4
3593    
3594    =item name
3595    
3596    Name of the group.
3597    
3598    =item page
3599    
3600    Name of the group's page on the web site (e.g. C<campy.php> for
3601    Campylobacter)
3602    
3603    =item genus
3604    
3605    Genus of the group
3606    
3607    =item species
3608    
3609    Species of the group, or an empty string if the group is for an entire
3610    genus. If the group contains more than one species, the species names
3611    should be separated by commas.
3612    
3613    =back
3614    
3615    The parameters to this method are as follows
3616    
3617    =over 4
3618    
3619    =item groupFile
3620    
3621    Name of the file containing the group data.
3622    
3623    =item RETURN
3624    
3625    Returns a hash keyed on group name. The value of each hash
3626    
3627    =back
3628    
3629    =cut
3630    
3631    sub ReadGroupFile {
3632        # Get the parameters.
3633        my ($groupFileName) = @_;
3634        # Declare the return variable.
3635        my %retVal;
3636        # Read the group file.
3637        my @groupLines = Tracer::GetFile($groupFileName);
3638        for my $groupLine (@groupLines) {
3639            my ($name, $page, $genus, $species) = split(/\t/, $groupLine);
3640            $retVal{$name} = [$page, $genus, $species];
3641        }
3642        # Return the result.
3643        return %retVal;
3644    }
3645    
3646    =head3 AddProperty
3647    
3648    C<< my  = $sprout->AddProperty($featureID, $key, $value, $url); >>
3649    
3650    Add a new attribute value (Property) to a feature. In the SEED system, attributes can
3651    be added to almost any object. In Sprout, they can only be added to features. In
3652    Sprout, attributes are implemented using I<properties>. A property represents a key/value
3653    pair. If the particular key/value pair coming in is not already in the database, a new
3654    B<Property> record is created to hold it.
3655    
3656    =over 4
3657    
3658    =item peg
3659    
3660    ID of the feature to which the attribute is to be replied.
3661    
3662    =item key
3663    
3664    Name of the attribute (key).
3665    
3666    =item value
3667    
3668    Value of the attribute.
3669    
3670    =item url
3671    
3672    URL or text citation from which the property was obtained.
3673    
3674    =back
3675    
3676    =cut
3677    #: Return Type ;
3678    sub AddProperty {
3679        # Get the parameters.
3680        my ($self, $featureID, $key, $value, $url) = @_;
3681        # Declare the variable to hold the desired property ID.
3682        my $propID;
3683        # Attempt to find a property record for this key/value pair.
3684        my @properties = $self->GetFlat(['Property'],
3685                                       "Property(property-name) = ? AND Property(property-value) = ?",
3686                                       [$key, $value], 'Property(id)');
3687        if (@properties) {
3688            # Here the property is already in the database. We save its ID.
3689            $propID = $properties[0];
3690            # Here the property value does not exist. We need to generate an ID. It will be set
3691            # to a number one greater than the maximum value in the database. This call to
3692            # GetAll will stop after one record.
3693            my @maxProperty = $self->GetAll(['Property'], "ORDER BY Property(id) DESC", [], ['Property(id)'],
3694                                            1);
3695            $propID = $maxProperty[0]->[0] + 1;
3696            # Insert the new property value.
3697            $self->Insert('Property', { 'property-name' => $key, 'property-value' => $value, id => $propID });
3698        }
3699        # Now we connect the incoming feature to the property.
3700        $self->Insert('HasProperty', { 'from-link' => $featureID, 'to-link' => $propID, evidence => $url });
3701    }
3702    
3703    =head2 Virtual Methods
3704    
3705    =head3 CleanKeywords
3706    
3707    C<< my $cleanedString = $sprout->CleanKeywords($searchExpression); >>
3708    
3709    Clean up a search expression or keyword list. This involves converting the periods
3710    in EC numbers to underscores, converting non-leading minus signs to underscores,
3711    a vertical bar or colon to an apostrophe, and forcing lower case for all alphabetic
3712    characters. In addition, any extra spaces are removed.
3713    
3714    =over 4
3715    
3716    =item searchExpression
3717    
3718    Search expression or keyword list to clean. Note that a search expression may
3719    contain boolean operators which need to be preserved. This includes leading
3720    minus signs.
3721    
3722    =item RETURN
3723    
3724    Cleaned expression or keyword list.
3725    
3726    =back
3727    
3728    =cut
3729    
3730    sub CleanKeywords {
3731        # Get the parameters.
3732        my ($self, $searchExpression) = @_;
3733        # Perform the standard cleanup.
3734        my $retVal = $self->ERDB::CleanKeywords($searchExpression);
3735        # Fix the periods in EC and TC numbers.
3736        $retVal =~ s/(\d+|\-)\.(\d+|-)\.(\d+|-)\.(\d+|-)/$1_$2_$3_$4/g;
3737        # Fix non-trailing periods.
3738        $retVal =~ s/\.(\w)/_$1/g;
3739        # Fix non-leading minus signs.
3740        $retVal =~ s/(\w)[\-]/$1_/g;
3741        # Fix the vertical bars and colons
3742        $retVal =~ s/(\w)[|:](\w)/$1'$2/g;
3743        # Return the result.
3744        return $retVal;
3745    }
3746    
3747  =head2 Internal Utility Methods  =head2 Internal Utility Methods
3748    
3749  =head3 ParseAssignment  =head3 ParseAssignment
3750    
3751  Parse annotation text to determine whether or not it is a functional assignment. If it is,  Parse annotation text to determine whether or not it is a functional assignment. If it is,
3752  the user and function text will be returned as a 2-element list. If it isn't, an empty list  the user, function text, and assigning user will be returned as a 3-element list. If it
3753  will be returned.  isn't, an empty list will be returned.
3754    
3755    A functional assignment is always of the form
3756    
3757        C<set >I<YYYY>C< function to\n>I<ZZZZZ>
3758    
3759    where I<YYYY> is the B<user>, and I<ZZZZ> is the actual functional role. In most cases,
3760    the user and the assigning user (from MadeAnnotation) will be the same, but that is
3761    not always the case.
3762    
3763    In addition, the functional role may contain extra data that is stripped, such as
3764    terminating spaces or a comment separated from the rest of the text by a tab.
3765    
3766  This is a static method.  This is a static method.
3767    
3768  =over 4  =over 4
3769    
3770    =item user
3771    
3772    Name of the assigning user.
3773    
3774  =item text  =item text
3775    
3776  Text of the annotation.  Text of the annotation.
# Line 2574  Line 3784 
3784    
3785  =cut  =cut
3786    
3787  sub ParseAssignment {  sub _ParseAssignment {
3788          # Get the parameters.          # Get the parameters.
3789          my ($text) = @_;      my ($user, $text) = @_;
3790          # Declare the return value.          # Declare the return value.
3791          my @retVal = ();          my @retVal = ();
3792          # Check to see if this is a functional assignment.          # Check to see if this is a functional assignment.
3793          my ($user, $type, $function) = split(/\n/, $text);      my ($type, $function) = split(/\n/, $text);
3794          if ($type =~ m/^set $user function to$/i) {      if ($type =~ m/^set function to$/i) {
3795                  # Here it is, so we return the user name and function text.          # Here we have an assignment without a user, so we use the incoming user ID.
3796                  @retVal = ($user, $function);                  @retVal = ($user, $function);
3797        } elsif ($type =~ m/^set (\S+) function to$/i) {
3798            # Here we have an assignment with a user that is passed back to the caller.
3799            @retVal = ($1, $function);
3800        }
3801        # If we have an assignment, we need to clean the function text. There may be
3802        # extra junk at the end added as a note from the user.
3803        if (defined( $retVal[1] )) {
3804            $retVal[1] =~ s/(\t\S)?\s*$//;
3805          }          }
3806          # Return the result list.          # Return the result list.
3807          return @retVal;          return @retVal;
# Line 2611  Line 3829 
3829    
3830  sub FriendlyTimestamp {  sub FriendlyTimestamp {
3831      my ($timeValue) = @_;      my ($timeValue) = @_;
3832      my $retVal = strftime("%a %b %e %H:%M:%S %Y", localtime($timeValue));      my $retVal = localtime($timeValue);
3833      return $retVal;      return $retVal;
3834  }  }
3835    
3836    
3837  1;  1;

Legend:
Removed from v.1.6  
changed lines
  Added in v.1.92

MCS Webmaster
ViewVC Help
Powered by ViewVC 1.0.3