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

Diff of /Sprout/CustomAttributes.pm

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

revision 1.7, Wed Nov 15 12:04:05 2006 UTC revision 1.11, Wed Nov 29 20:28:52 2006 UTC
# Line 15  Line 15 
15    
16  The Custom SEED Attributes Manager allows the user to upload and retrieve  The Custom SEED Attributes Manager allows the user to upload and retrieve
17  custom data for SEED objects. It uses the B<ERDB> database system to  custom data for SEED objects. It uses the B<ERDB> database system to
18  store the attributes, which are implemented as multi-valued fields  store the attributes.
19  of ERDB entities.  
20    Attributes are organized by I<attribute key>. Attribute values are
21    assigned to I<objects>. In the real world, objects have types and IDs;
22    however, to the attribute database only the ID matters. This will create
23    a problem if we have a single ID that applies to two objects of different
24    types, but it is more consistent with the original attribute implementation
25    in the SEED (which this implementation replaces).
26    
27    The actual attribute values are stored as a relationship between the attribute
28    keys and the objects. There can be multiple values for a single key/object pair.
29    
30  The full suite of ERDB retrieval capabilities is provided. In addition,  The full suite of ERDB retrieval capabilities is provided. In addition,
31  custom methods are provided specific to this application. To get all  custom methods are provided specific to this application. To get all
32  the values of the attribute C<essential> in a specified B<Feature>, you  the values of the attribute C<essential> in a specified B<Feature>, you
33  would code  would code
34    
35      my @values = $attrDB->GetAttributes([Feature => $fid], 'essential');      my @values = $attrDB->GetAttributes($fid, 'essential');
36    
37  where I<$fid> contains the ID of the desired feature. Each attribute has  where I<$fid> contains the ID of the desired feature.
 an alternate index to allow searching for attributes by value.  
38    
39  New attributes are introduced by updating the database definition at  New attribute keys must be defined before they can be used. A web interface
40  run-time. Attribute values are stored by uploading data from files.  is provided for this purpose.
 A web interface is provided for both these activities.  
41    
42  =head2 FIG_Config Parameters  =head2 FIG_Config Parameters
43    
# Line 76  Line 83 
83    
84  =back  =back
85    
 The DBD file is critical, and must have reasonable contents before we can  
 begin using the system. In the old system, attributes were only provided  
 for Genomes and Features, so the initial XML file was the following.  
   
     <Database>  
       <Title>SEED Custom Attribute Database</Title>  
       <Entities>  
         <Entity name="Feature" keyType="id-string">  
           <Notes>A [i]feature[/i] is a part of the genome  
           that is of special interest. Features may be spread  
           across multiple contigs of a genome, but never across  
           more than one genome. Features can be assigned to roles  
           via spreadsheet cells, and are the targets of  
           annotation.</Notes>  
         </Entity>  
         <Entity name="Genome" keyType="name-string">  
           <Notes>A [i]genome[/i] describes a particular individual  
           organism's DNA.</Notes>  
         </Entity>  
       </Entities>  
     </Database>  
   
 It is not necessary to put any tables into the database; however, you should  
 run  
   
     AttrDBRefresh  
   
 periodically to insure it has the correct Genomes and Features in it. When  
 converting from the old system, use  
   
     AttrDBRefresh -migrate  
   
 to initialize the database and migrate the legacy data. You should only need  
 to do that once.  
   
 =head2 Implementation Note  
   
 The L</Refresh> method reloads the entities in the database. If new  
 entity types are added, that method will need to be adjusted accordingly.  
   
86  =head2 Public Methods  =head2 Public Methods
87    
88  =head3 new  =head3 new
89    
90  C<< my $attrDB = CustomAttributes->new($splitter); >>  C<< my $attrDB = CustomAttributes->new($splitter); >>
91    
92  Construct a new CustomAttributes object. This object cannot be used to add or  Construct a new CustomAttributes object.
 delete keys because that requires modifying the database design. To do that,  
 you need to use the static L</StoreAttributeKey> or L</DeleteAttributeKey>  
 methods.  
93    
94  =over 4  =over 4
95    
# Line 159  Line 123 
123    
124  =head3 StoreAttributeKey  =head3 StoreAttributeKey
125    
126  C<< my $attrDB = CustomAttributes::StoreAttributeKey($entityName, $attributeName, $type, $notes); >>  C<< $attrDB->StoreAttributeKey($attributeName, $type, $notes, \@groups); >>
127    
128  Create or update an attribute for the database. This method will update the database definition  Create or update an attribute for the database.
 XML, but it will not create the table. It will connect to the database so that the caller  
 can upload the attribute values.  
129    
130  =over 4  =over 4
131    
 =item entityName  
   
 Name of the entity containing the attribute. The entity must exist.  
   
132  =item attributeName  =item attributeName
133    
134  Name of the attribute. It must be a valid ERDB field name, consisting entirely of  Name of the attribute. It must be a valid ERDB field name, consisting entirely of
# Line 185  Line 143 
143    
144  Descriptive notes about the attribute. It is presumed to be raw text, not HTML.  Descriptive notes about the attribute. It is presumed to be raw text, not HTML.
145    
146  =item RETURN  =item groups
147    
148  Returns a Custom Attribute Database object if successful. If unsuccessful, an  Reference to a list of the groups to which the attribute should be associated.
149  error will be thrown.  This will replace any groups to which the attribute is currently attached.
150    
151  =back  =back
152    
# Line 196  Line 154 
154    
155  sub StoreAttributeKey {  sub StoreAttributeKey {
156      # Get the parameters.      # Get the parameters.
157      my ($entityName, $attributeName, $type, $notes) = @_;      my ($self, $attributeName, $type, $notes, $groups) = @_;
158        # Declare the return variable.
159        my $retVal;
160      # Get the data type hash.      # Get the data type hash.
161      my %types = ERDB::GetDataTypes();      my %types = ERDB::GetDataTypes();
162      # Validate the initial input values.      # Validate the initial input values.
# Line 206  Line 166 
166          Confess("Missing or incomplete description for $attributeName.");          Confess("Missing or incomplete description for $attributeName.");
167      } elsif (! exists $types{$type}) {      } elsif (! exists $types{$type}) {
168          Confess("Invalid data type \"$type\" for $attributeName.");          Confess("Invalid data type \"$type\" for $attributeName.");
     }  
     # Our next step is to read in the XML for the database defintion. We  
     # need to verify that the named entity exists.  
     my $metadata = ERDB::ReadMetaXML($FIG_Config::attrDBD);  
     my $entityHash = $metadata->{Entities};  
     if (! exists $entityHash->{$entityName}) {  
         Confess("Entity $entityName not found.");  
169      } else {      } else {
170          # Okay, we're ready to begin. Get the entity hash and the field hash.          # Okay, we're ready to begin. See if this key exists.
171          my $entityData = $entityHash->{$entityName};          my $attribute = $self->GetEntity('AttributeKey', $attributeName);
172          my $fieldHash = ERDB::GetEntityFieldHash($metadata, $entityName);          if (defined($attribute)) {
173          # Compute the attribute's relation name.              # It does, so we do an update.
174          my $relName = join("", $entityName, map { ucfirst $_ } split(/-|_/, $attributeName));              $self->UpdateEntity('AttributeKey', $attributeName,
175          # Store the attribute's field data. Note the use of the "content" hash for                                  { description => $notes, 'data-type' => $type });
176          # the notes. This is how the XML writer knows Notes is a text tag instead of              # Detach the key from its current groups.
177          # an attribute.              $self->Disconnect('IsInGroup', 'AttributeKey', $attributeName);
178          $fieldHash->{$attributeName} = { type => $type, relation => $relName,          } else {
179                                           Notes => { content => $notes } };              # It doesn't, so we do an insert.
180          # Insure we have an index for this attribute.              $self->InsertObject('AttributeKey', { id => $attributeName,
181          my $index = ERDB::FindIndexForEntity($metadata, $entityName, $attributeName);                                  description => $notes, 'data-type' => $type });
182          if (! defined($index)) {          }
183              push @{$entityData->{Indexes}}, { IndexFields => [ { name => $attributeName, order => 'ascending' } ],          # Attach the key to the specified groups. (We presume the groups already
184                                                Notes       => "Alternate index provided for access by $attributeName." };          # exist.)
185            for my $group (@{$groups}) {
186                $self->InsertObject('IsInGroup', { 'from-link' => $attributeName,
187                                                   'to-link'   => $group });
188          }          }
         # Write the XML back out.  
         ERDB::WriteMetaXML($metadata, $FIG_Config::attrDBD);  
189      }      }
     # Open a database with the new XML.  
     my $retVal = CustomAttributes->new();  
     return $retVal;  
 }  
   
 =head3 Refresh  
   
 C<< $attrDB->Refresh($fig); >>  
   
 Refresh the primary entity tables from the FIG data store. This method basically  
 drops and reloads the main tables of the custom attributes database.  
   
 =over 4  
   
 =item fig  
   
 FIG-like object that can be used to find genomes and features.  
   
 =back  
   
 =cut  
   
 sub Refresh {  
     # Get the parameters.  
     my ($self, $fig) = @_;  
     # Create load objects for the genomes and the features.  
     my $loadGenome = ERDBLoad->new($self, 'Genome', $FIG_Config::temp);  
     my $loadFeature = ERDBLoad->new($self, 'Feature', $FIG_Config::temp);  
     # Get the genome list.  
     my @genomes = $fig->genomes();  
     # Loop through the genomes.  
     for my $genomeID (@genomes) {  
         # Put this genome in the genome table.  
         $loadGenome->Put($genomeID);  
         Trace("Processing Genome $genomeID") if T(3);  
         # Put its features into the feature table. Note we have to use a hash to  
         # remove duplicates.  
         my %featureList = map { $_ => 1 } $fig->all_features($genomeID);  
         for my $fid (keys %featureList) {  
             $loadFeature->Put($fid);  
         }  
     }  
     # Get a variable for holding statistics objects.  
     my $stats;  
     # Finish the genome load.  
     Trace("Loading Genome relation.") if T(2);  
     $stats = $loadGenome->FinishAndLoad();  
     Trace("Genome table load statistics:\n" . $stats->Show()) if T(3);  
     # Finish the feature load.  
     Trace("Loading Feature relation.") if T(2);  
     $stats = $loadFeature->FinishAndLoad();  
     Trace("Feature table load statistics:\n" . $stats->Show()) if T(3);  
190  }  }
191    
192  =head3 LoadAttributeKey  =head3 LoadAttributeKey
193    
194  C<< my $stats = $attrDB->LoadAttributeKey($entityName, $fieldName, $fh, $keyCol, $dataCol); >>  C<< my $stats = $attrDB->LoadAttributeKey($keyName, $fh, $keyCol, $dataCol, %options); >>
195    
196  Load the specified attribute from the specified file. The file should be a  Load the specified attribute from the specified file. The file should be a
197  tab-delimited file with internal tab and new-line characters escaped. This is  tab-delimited file with internal tab and new-line characters escaped. This is
198  the typical TBL-style file used by most FIG applications. One of the columns  the typical TBL-style file used by most FIG applications. One of the columns
199  in the input file must contain the appropriate key value and the other the  in the input file must contain the appropriate object id value and the other the
200  corresponding attribute value.  corresponding attribute value.
201    
202  =over 4  =over 4
203    
204  =item entityName  =item keyName
   
 Name of the entity containing the attribute.  
205    
206  =item fieldName  Key of the attribute to load.
   
 Name of the actual attribute.  
207    
208  =item fh  =item fh
209    
210  Open file handle for the input file.  Open file handle for the input file.
211    
212  =item keyCol  =item idCol
213    
214  Index (0-based) of the column containing the key field. The key field should  Index (0-based) of the column containing the ID field. The ID field should
215  contain the ID of an instance of the named entity.  contain the ID of an instance of the named entity.
216    
217  =item dataCol  =item dataCol
218    
219  Index (0-based) of the column containing the data value field.  Index (0-based) of the column containing the data value field.
220    
221    =item options
222    
223    Hash specifying the options for this load.
224    
225  =item RETURN  =item RETURN
226    
227  Returns a statistics object for the load process.  Returns a statistics object for the load process.
228    
229  =back  =back
230    
231    The available options are as follows.
232    
233    =over 4
234    
235    =item erase
236    
237    If TRUE, the key's values will all be erased before loading. (Doing so
238    makes for a faster load.)
239    
240    =back
241    
242  =cut  =cut
243    
244  sub LoadAttributeKey {  sub LoadAttributeKey {
245      # Get the parameters.      # Get the parameters.
246      my ($self, $entityName, $fieldName, $fh, $keyCol, $dataCol) = @_;      my ($self, $keyName, $fh, $idCol, $dataCol, %options) = @_;
247      # Create the return variable.      # Create the return variable.
248      my $retVal;      my $retVal = Stats->new("lineIn", "shortLine", "newObject");
249      # Insure the entity exists.      # Compute the minimum number of fields required in each input line.
250      my $found = grep { $_ eq $entityName } $self->GetEntityTypes();      my $minCols = ($idCol < $dataCol ? $idCol : $idCol) + 1;
251      if (! $found) {      # Insure the attribute key exists.
252          Confess("Entity \"$entityName\" not found in database.");      my $found = $self->GetEntity('AttributeKey', $keyName);
253      } else {      if (! defined $found) {
254          # Get the field structure for the named entity.          Confess("Attribute key \"$keyName\" not found in database.");
         my $fieldHash = $self->GetFieldTable($entityName);  
         # Verify that the attribute exists.  
         if (! exists $fieldHash->{$fieldName}) {  
             Confess("Attribute key \"$fieldName\" does not exist in entity $entityName.");  
255          } else {          } else {
256              # Create a loader for the specified attribute. We need the          # Erase the key's current values.
257              # relation name first.          $self->EraseAttribute($keyName);
258              my $relName = $fieldHash->{$fieldName}->{relation};          # Save a list of the object IDs we need to add.
259              my $loadAttribute = ERDBLoad->new($self, $relName, $FIG_Config::temp);          my %objectIDs = ();
260              # Loop through the input file.              # Loop through the input file.
261              while (! eof $fh) {              while (! eof $fh) {
262                  # Get the next line of the file.                  # Get the next line of the file.
263                  my @fields = Tracer::GetLine($fh);                  my @fields = Tracer::GetLine($fh);
264                  $loadAttribute->Add("lineIn");              $retVal->Add(lineIn => 1);
265                  # Now we need to validate the line.                  # Now we need to validate the line.
266                  if ($#fields < $dataCol) {              if (scalar(@fields) < $minCols) {
267                      $loadAttribute->Add("shortLine");                  $retVal->Add(shortLine => 1);
                 } elsif (! $self->Exists($entityName, $fields[$keyCol])) {  
                     $loadAttribute->Add("badKey");  
268                  } else {                  } else {
269                      # It's valid,so send it to the loader.                  # It's valid, so get the ID and value.
270                      $loadAttribute->Put($fields[$keyCol], $fields[$dataCol]);                  my ($id, $value) = ($fields[$idCol], $fields[$dataCol]);
271                      $loadAttribute->Add("lineUsed");                  # Denote we're using this input line.
272                    $retVal->Add(lineUsed => 1);
273                    # Now the fun begins. Find out if we need to create a target object record for this object ID.
274                    if (! exists $objectIDs{$id}) {
275                        my $found = $self->Exists('TargetObject', $id);
276                        if (! $found) {
277                            $self->InsertObject('TargetObject', { id => $id });
278                        }
279                        $objectIDs{$id} = 1;
280                        $retVal->Add(newObject => 1);
281                  }                  }
282                    # Now we insert the attribute.
283                    $self->InsertObject('HasValueFor', { from => $keyName, to => $id, value => $value });
284                    $retVal->Add(newValue => 1);
285              }              }
             # Finish the load.  
             $retVal = $loadAttribute->FinishAndLoad();  
286          }          }
287      }      }
288      # Return the statistics.      # Return the statistics.
# Line 375  Line 292 
292    
293  =head3 DeleteAttributeKey  =head3 DeleteAttributeKey
294    
295  C<< CustomAttributes::DeleteAttributeKey($entityName, $attributeName); >>  C<< my $stats = $attrDB->DeleteAttributeKey($attributeName); >>
296    
297  Delete an attribute from the custom attributes database.  Delete an attribute from the custom attributes database.
298    
299  =over 4  =over 4
300    
 =item entityName  
   
 Name of the entity possessing the attribute.  
   
301  =item attributeName  =item attributeName
302    
303  Name of the attribute to delete.  Name of the attribute to delete.
304    
305    =item RETURN
306    
307    Returns a statistics object describing the effects of the deletion.
308    
309  =back  =back
310    
311  =cut  =cut
312    
313  sub DeleteAttributeKey {  sub DeleteAttributeKey {
314      # Get the parameters.      # Get the parameters.
315      my ($entityName, $attributeName) = @_;      my ($self, $attributeName) = @_;
316      # Read in the XML for the database defintion. We need to verify that      # Delete the attribute key.
317      # the named entity exists and it has the named attribute.      my $retVal = $self->Delete('AttributeKey', $attributeName);
318      my $metadata = ERDB::ReadMetaXML($FIG_Config::attrDBD);      # Return the result.
319      my $entityHash = $metadata->{Entities};      return $retVal;
320      if (! exists $entityHash->{$entityName}) {  
         Confess("Entity \"$entityName\" not found.");  
     } else {  
         # Get the field hash.  
         my $fieldHash = ERDB::GetEntityFieldHash($metadata, $entityName);  
         if (! exists $fieldHash->{$attributeName}) {  
             Confess("Attribute key \"$attributeName\" not found in entity $entityName.");  
         } else {  
             # Get the attribute's relation name.  
             my $relName = $fieldHash->{$attributeName}->{relation};  
             # Check for an index.  
             my $indexIdx = ERDB::FindIndexForEntity($metadata, $entityName, $attributeName);  
             if (defined($indexIdx)) {  
                 Trace("Index for $attributeName found at position $indexIdx for $entityName.") if T(3);  
                 delete $entityHash->{$entityName}->{Indexes}->[$indexIdx];  
             }  
             # Delete the attribute from the field hash.  
             Trace("Deleting attribute $attributeName from $entityName.") if T(3);  
             delete $fieldHash->{$attributeName};  
             # Write the XML back out.  
             ERDB::WriteMetaXML($metadata, $FIG_Config::attrDBD);  
             # Insure the relation does not exist in the database. This requires connecting  
             # since we may have to do a table drop.  
             my $attrDB = CustomAttributes->new();  
             Trace("Dropping table $relName.") if T(3);  
             $attrDB->DropRelation($relName);  
         }  
321      }      }
322    
323    =head3 NewName
324    
325    C<< my $text = CustomAttributes::NewName(); >>
326    
327    Return the string used to indicate the user wants to add a new attribute.
328    
329    =cut
330    
331    sub NewName {
332        return "(new)";
333  }  }
334    
335  =head3 ControlForm  =head3 ControlForm
336    
337  C<< my $formHtml = $attrDB->ControlForm($cgi, $name); >>  C<< my $formHtml = $attrDB->ControlForm($cgi, $name, \%keys); >>
338    
339  Return a form that can be used to control the creation and modification of  Return a form that can be used to control the creation and modification of
340  attributes.  attributes. Only a subset of the attribute keys will be displayed, as
341    determined by the incoming list.
342    
343  =over 4  =over 4
344    
# Line 447  Line 350 
350    
351  Name to give to the form. This should be unique for the web page.  Name to give to the form. This should be unique for the web page.
352    
353    =item keys
354    
355    Reference to a hash mapping attribute keys to n-tuples. Each tuple will contain the
356    attribute's data type, its description, and a list of the groups in which it participates.
357    
358  =item RETURN  =item RETURN
359    
360  Returns the HTML for a form that submits instructions to the C<Attributes.cgi> script  Returns the HTML for a form that can be used to  submit instructions to the C<Attributes.cgi> script
361  for loading, creating, or deleting an attribute.  for loading, creating, displaying, changing, or deleting an attribute. Note that only the form
362    controls are generated. The form tags are left to the caller.
363    
364  =back  =back
365    
# Line 458  Line 367 
367    
368  sub ControlForm {  sub ControlForm {
369      # Get the parameters.      # Get the parameters.
370      my ($self, $cgi, $name) = @_;      my ($self, $cgi, $name, $keys) = @_;
371      # Declare the return list.      # Declare the return list.
372      my @retVal = ();      my @retVal = ();
     # Start the form. We use multipart to support the upload control.  
     push @retVal, $cgi->start_multipart_form(-name => $name);  
373      # We'll put the controls in a table. Nothing else ever seems to look nice.      # We'll put the controls in a table. Nothing else ever seems to look nice.
374      push @retVal, $cgi->start_table({ border => 2, cellpadding => 2 });      push @retVal, $cgi->start_table({ border => 2, cellpadding => 2 });
375      # The first row is for selecting the field name.      # The first row is for selecting the field name.
376      push @retVal, $cgi->Tr($cgi->th("Select a Field"),      push @retVal, $cgi->Tr($cgi->th("Select a Field"),
377                             $cgi->td($self->FieldMenu($cgi, 10, 'fieldName', 1,                             $cgi->td($self->FieldMenu($cgi, 10, 'fieldName', $keys,
378                                                       "document.$name.notes.value",                                                       new => 1,
379                                                       "document.$name.dataType.value")));                                                       notes => "document.$name.notes.value",
380                                                         type => "document.$name.dataType.value",
381                                                         groups => "document.$name.groups")));
382      # Now we set up a dropdown for the data types. The values will be the      # Now we set up a dropdown for the data types. The values will be the
383      # data type names, and the labels will be the descriptions.      # data type names, and the labels will be the descriptions.
384      my %types = ERDB::GetDataTypes();      my %types = ERDB::GetDataTypes();
385      my %labelMap = map { $_ => $types{$_}->{notes} } keys %types;      my %labelMap = map { $_ => $types{$_}->{notes} } keys %types;
386      my $typeMenu = $cgi->popup_menu(-name   => 'dataType',      my $typeMenu = $cgi->popup_menu(-name   => 'dataType',
387                                      -values => [sort keys %types],                                      -values => [sort keys %types],
388                                      -labels => \%labelMap);                                      -labels => \%labelMap,
389                                        -default => 'string');
390        # Allow the user to specify a new field name. This is required if the
391        # user has selected the "(new)" marker. We put a little scriptlet in here that
392        # selects the (new) marker when the user enters the field.
393        push @retVal, "<script language=\"javaScript\">";
394        my $fieldField = "document.$name.fieldName";
395        my $newName = "\"" . NewName() . "\"";
396        push @retVal, $cgi->Tr($cgi->th("New Field Name"),
397                               $cgi->td($cgi->textfield(-name => 'newName',
398                                                        -size => 30,
399                                                        -value => "",
400                                                        -onFocus => "setIfEmpty($fieldField, $newName);")),
401                                        );
402      push @retVal, $cgi->Tr($cgi->th("Data type"),      push @retVal, $cgi->Tr($cgi->th("Data type"),
403                             $cgi->td($typeMenu));                             $cgi->td($typeMenu));
404      # The next row is for the notes.      # The next row is for the notes.
# Line 485  Line 407 
407                                                     -rows => 6,                                                     -rows => 6,
408                                                     -columns => 80))                                                     -columns => 80))
409                            );                            );
410      # Allow the user to specify a new field name. This is required if the      # Now we have the groups, which are implemented as a checkbox group.
411      # user has selected one of the "(new)" markers.      my @groups = $self->GetGroups();
412      push @retVal, $cgi->Tr($cgi->th("New Field Name"),      push @retVal, $cgi->Tr($cgi->th("Groups"),
413                             $cgi->td($cgi->textfield(-name => 'newName',                             $cgi->td($cgi->checkbox_group(-name=>'groups',
414                                                      -size => 30)),                                      -values=> \@groups))
415                                      );                                      );
416      # If the user wants to upload new values for the field, then we have      # If the user wants to upload new values for the field, then we have
417      # an upload file name and column indicators.      # an upload file name and column indicators.
# Line 506  Line 428 
428                                                      -default => 1)                                                      -default => 1)
429                                     ),                                     ),
430                            );                            );
431      # Now the three buttons: UPDATE, SHOW, and DELETE.      # Now the three buttons: STORE, SHOW, and DELETE.
432      push @retVal, $cgi->Tr($cgi->th("&nbsp;"),      push @retVal, $cgi->Tr($cgi->th("&nbsp;"),
433                             $cgi->td({align => 'center'},                             $cgi->td({align => 'center'},
434                                      $cgi->submit(-name => 'Delete', -value => 'DELETE') . " " .                                      $cgi->submit(-name => 'Delete', -value => 'DELETE') . " " .
# Line 516  Line 438 
438                            );                            );
439      # Close the table and the form.      # Close the table and the form.
440      push @retVal, $cgi->end_table();      push @retVal, $cgi->end_table();
     push @retVal, $cgi->end_form();  
441      # Return the assembled HTML.      # Return the assembled HTML.
442      return join("\n", @retVal, "");      return join("\n", @retVal, "");
443  }  }
444    
445    =head3 LoadAttributesFrom
446    
447    C<< my $stats = $attrDB->LoadAttributesFrom($fileName, %options); >>
448    
449    Load attributes from the specified tab-delimited file. Each line of the file must
450    contain an object ID in the first column, an attribute key name in the second
451    column, and attribute values in the remaining columns. The attribute values will
452    be assembled into a single value using the splitter code.
453    
454    =over 4
455    
456    =item fileName
457    
458    Name of the file from which to load the attributes.
459    
460    =item options
461    
462    Hash of options for modifying the load process.
463    
464    =item RETURN
465    
466    Returns a statistics object describing the load.
467    
468    =back
469    
470    Permissible option values are as follows.
471    
472    =over 4
473    
474    =item append
475    
476    If TRUE, then the attributes will be appended to existing data; otherwise, the
477    first time a key name is encountered, it will be erased.
478    
479    =back
480    
481    =cut
482    
483    sub LoadAttributesFrom {
484        # Get the parameters.
485        my ($self, $fileName, %options) = @_;
486        # Declare the return variable.
487        my $retVal = Stats->new('keys', 'values');
488        # Check for append mode.
489        my $append = ($options{append} ? 1 : 0);
490        # Create a hash of key names found.
491        my %keyHash = ();
492        # Open the file for input.
493        my $fh = Open(undef, "<$fileName");
494        # Loop through the file.
495        while (! eof $fh) {
496            my ($id, $key, @values) = Tracer::GetLine($fh);
497            $retVal->Add(linesIn => 1);
498            # Do some validation.
499            if (! defined($id)) {
500                # We ignore blank lines.
501                $retVal->Add(blankLines => 1);
502            } elsif (! defined($key)) {
503                # An ID without a key is a serious error.
504                my $lines = $retVal->Ask('linesIn');
505                Confess("Line $lines in $fileName has no attribute key.");
506            } else {
507                # Now we need to check for a new key.
508                if (! exists $keyHash{$key}) {
509                    # This is a new key. Verify that it exists.
510                    if (! $self->Exists('AttributeKey', $key)) {
511                        my $line = $retVal->Ask('linesIn');
512                        Confess("Attribute \"$key\" on line $line of $fileName not found in database.");
513                    } else {
514                        # Make sure we know this is no longer a new key.
515                        $keyHash{$key} = 1;
516                        $retVal->Add(keys => 1);
517                        # If this is NOT append mode, erase the key.
518                        if (! $append) {
519                            $self->EraseAttribute($key);
520                        }
521                    }
522                    Trace("Key $key found.") if T(3);
523                }
524                # Now we know the key is valid. Add this value.
525                $self->AddAttribute($id, $key, @values);
526                my $progress = $retVal->Add(values => 1);
527                Trace("$progress values loaded.") if T(3) && ($progress % 1000 == 0);
528    
529            }
530        }
531        # Return the result.
532        return $retVal;
533    }
534    
535    =head3 BackupAllAttributes
536    
537    C<< my $stats = $attrDB->BackupAllAttributes($fileName, %options); >>
538    
539    Backup all of the attributes to a file. The attributes will be stored in a
540    tab-delimited file suitable for reloading via L</LoadAttributesFrom>.
541    
542    =over 4
543    
544    =item fileName
545    
546    Name of the file to which the attribute data should be backed up.
547    
548    =item options
549    
550    Hash of options for the backup.
551    
552    =item RETURN
553    
554    Returns a statistics object describing the backup.
555    
556    =back
557    
558    Currently there are no options defined.
559    
560    =cut
561    
562    sub BackupAllAttributes {
563        # Get the parameters.
564        my ($self, $fileName, %options) = @_;
565        # Declare the return variable.
566        my $retVal = Stats->new();
567        # Get a list of the keys.
568        my @keys = $self->GetFlat(['AttributeKey'], "", [], 'AttributeKey(id)');
569        Trace(scalar(@keys) . " keys found during backup.") if T(2);
570        # Open the file for output.
571        my $fh = Open(undef, $fileName);
572        # Loop through the keys.
573        for my $key (@keys) {
574            Trace("Backing up attribute $key.") if T(3);
575            $retVal->Add(keys => 1);
576            # Loop through this key's values.
577            my $query = $self->Get(['HasValueFor'], "HasValueFor(to-link) = ?", [$key]);
578            my $valuesFound = 0;
579            while (my $line = $query->Fetch()) {
580                $valuesFound++;
581                # Get this row's data.
582                my @row = $line->Values(['HasValueFor(from-link)', 'HasValueFor(to-link)',
583                                         'HasValueFor(value)']);
584                # Write it to the file.
585                Tracer::PutLine($fh, \@row);
586            }
587            Trace("$valuesFound values backed up for key $key.") if T(3);
588            $retVal->Add(values => $valuesFound);
589        }
590        # Return the result.
591        return $retVal;
592    }
593    
594  =head3 FieldMenu  =head3 FieldMenu
595    
596  C<< my $menuHtml = $attrDB->FieldMenu($cgi, $height, $name, $newFlag, $noteControl, $typeControl); >>  C<< my $menuHtml = $attrDB->FieldMenu($cgi, $height, $name, $keys, %options); >>
597    
598  Return the HTML for a menu to select an attribute field. The menu will  Return the HTML for a menu to select an attribute field. The menu will
599  be a standard SELECT/OPTION thing which is called "popup menu" in the  be a standard SELECT/OPTION thing which is called "popup menu" in the
600  CGI package, but actually looks like a list. The list will contain  CGI package, but actually looks like a list. The list will contain
601  one selectable row per field, grouped by entity.  one selectable row per field.
602    
603  =over 4  =over 4
604    
# Line 545  Line 615 
615  Name to give to the menu. This is the name under which the value will  Name to give to the menu. This is the name under which the value will
616  appear when the form is submitted.  appear when the form is submitted.
617    
618  =item newFlag (optional)  =item keys
619    
620    Reference to a hash mapping each attribute key name to a list reference,
621    the list itself consisting of the attribute data type, its description,
622    and a list of its groups.
623    
624    =item options
625    
626    Hash containing options that modify the generation of the menu.
627    
628    =item RETURN
629    
630    Returns the HTML to create a form field that can be used to select an
631    attribute from the custom attributes system.
632    
633    =back
634    
635    The permissible options are as follows.
636    
637    =over 4
638    
639    =item new
640    
641  If TRUE, then extra rows will be provided to allow the user to select  If TRUE, then extra rows will be provided to allow the user to select
642  a new attribute. In other words, the user can select an existing  a new attribute. In other words, the user can select an existing
643  attribute, or can choose a C<(new)> marker to indicate a field to  attribute, or can choose a C<(new)> marker to indicate a field to
644  be created in the parent entity.  be created in the parent entity.
645    
646  =item noteControl (optional)  =item notes
647    
648  If specified, the name of a variable for displaying the notes attached  If specified, the name of a variable for displaying the notes attached
649  to the field. This must be in Javascript form ready for assignment.  to the field. This must be in Javascript form ready for assignment.
# Line 563  Line 654 
654  it is copied in. Specifying this parameter generates Javascript for  it is copied in. Specifying this parameter generates Javascript for
655  displaying the field description when a field is selected.  displaying the field description when a field is selected.
656    
657  =item typeControl (optional)  =item type
658    
659  If specified, the name of a variable for displaying the field's  If specified, the name of a variable for displaying the field's
660  data type. Data types are a much more controlled vocabulary than  data type. Data types are a much more controlled vocabulary than
# Line 571  Line 662 
662  raw value is put into the specified variable. Otherwise, the same  raw value is put into the specified variable. Otherwise, the same
663  rules apply to this value that apply to I<$noteControl>.  rules apply to this value that apply to I<$noteControl>.
664    
665  =item RETURN  =item groups
666    
667  Returns the HTML to create a form field that can be used to select an  If specified, the name of a multiple-selection list control (also called
668  attribute from the custom attributes system.  a popup menu) which shall be used to display the selected groups.
669    
670  =back  =back
671    
# Line 582  Line 673 
673    
674  sub FieldMenu {  sub FieldMenu {
675      # Get the parameters.      # Get the parameters.
676      my ($self, $cgi, $height, $name, $newFlag, $noteControl, $typeControl) = @_;      my ($self, $cgi, $height, $name, $keys, %options) = @_;
677      # These next two hashes make everything happen. "entities"      # Reformat the list of keys.
678      # maps each entity name to the list of values to be put into its      my %keys = %{$keys};
679      # option group. "labels" maps each entity name to a map from values      # Add the (new) key, if needed.
680      # to labels.      if ($options{new}) {
681      my @entityNames = sort ($self->GetEntityTypes());          $keys{NewName()} = ["string", ""];
682      my %entities = map { $_ => [] } @entityNames;      }
683      my %labels = map { $_ => { }} @entityNames;      # Get a sorted list of key.
684      # Loop through the entities, adding the existing attributes.      my @keys = sort keys %keys;
685      for my $entity (@entityNames) {      # We need to create the name for the onChange function. This function
         # Get this entity's field table.  
         my $fieldHash = $self->GetFieldTable($entity);  
         # Get its field list in our local hashes.  
         my $fieldList = $entities{$entity};  
         my $labelList = $labels{$entity};  
         # Add the NEW fields if we want them.  
         if ($newFlag) {  
             push @{$fieldList}, $entity;  
             $labelList->{$entity} = "(new)";  
         }  
         # Loop through the fields in the hash. We only keep the ones with a  
         # secondary relation name. (In other words, the name of the relation  
         # in which the field appears cannot be the same as the entity name.)  
         for my $fieldName (sort keys %{$fieldHash}) {  
             if ($fieldHash->{$fieldName}->{relation} ne $entity) {  
                 my $value = "$entity/$fieldName";  
                 push @{$fieldList}, $value;  
                 $labelList->{$value} = $fieldName;  
             }  
         }  
     }  
     # Now we have a hash and a list for each entity, and they correspond  
     # exactly to what the $cgi->optgroup function expects.  
     # The last step is to create the name for the onChange function. This function  
686      # may not do anything, but we need to know the name to generate the HTML      # may not do anything, but we need to know the name to generate the HTML
687      # for the menu.      # for the menu.
688      my $changeName = "${name}_setNotes";      my $changeName = "${name}_setNotes";
689      my $retVal = $cgi->popup_menu({name => $name,      my $retVal = $cgi->popup_menu({name => $name,
690                                     size => $height,                                     size => $height,
691                                     onChange => "$changeName(this.value)",                                     onChange => "$changeName(this.value)",
692                                     values => [map { $cgi->optgroup(-name => $_,                                     values => \@keys,
693                                                                     -values => $entities{$_},                                    });
                                                                    -labels => $labels{$_})  
                                                   } @entityNames]}  
                                  );  
694      # Create the change function.      # Create the change function.
695      $retVal .= "\n<script language=\"javascript\">\n";      $retVal .= "\n<script language=\"javascript\">\n";
696      $retVal .= "    function $changeName(fieldValue) {\n";      $retVal .= "    function $changeName(fieldValue) {\n";
697      # The function only has a body if we have a notes control to store the description.      # The function only has a body if we have a control to store data about the
698      if ($noteControl || $typeControl) {      # attribute.
699        if ($options{notes} || $options{type} || $options{groups}) {
700          # Check to see if we're storing HTML or text into the note control.          # Check to see if we're storing HTML or text into the note control.
701            my $noteControl = $options{notes};
702          my $htmlMode = ($noteControl && $noteControl =~ /innerHTML$/);          my $htmlMode = ($noteControl && $noteControl =~ /innerHTML$/);
703          # We use a CASE statement based on the newly-selected field value. The          # We use a CASE statement based on the newly-selected field value. The
704          # field description will be stored in the JavaScript variable "myText"          # field description will be stored in the JavaScript variable "myText"
# Line 641  Line 707 
707          $retVal .= "        var myText = \"\";\n";          $retVal .= "        var myText = \"\";\n";
708          $retVal .= "        var myType = \"string\";\n";          $retVal .= "        var myType = \"string\";\n";
709          $retVal .= "        switch (fieldValue) {\n";          $retVal .= "        switch (fieldValue) {\n";
710          # Loop through the entities.          # Loop through the keys.
711          for my $entity (@entityNames) {          for my $key (@keys) {
             # Get the entity's field hash. This has the notes in it.  
             my $fieldHash = $self->GetFieldTable($entity);  
             # Loop through the values we might see for this entity's fields.  
             my $fields = $entities{$entity};  
             for my $value (@{$fields}) {  
                 # Only proceed if we have an existing field.  
                 if ($value =~ m!/(.+)$!) {  
                     # Get the field's hash element.  
                     my $element = $fieldHash->{$1};  
712                      # Generate this case.                      # Generate this case.
713                      $retVal .= "        case \"$value\" :\n";              $retVal .= "        case \"$key\" :\n";
714                      # Here we either want to update the note display, the                      # Here we either want to update the note display, the
715                      # type display, or both.              # type display, the group list, or a combination of them.
716                my ($type, $notes, @groups) = @{$keys{$key}};
717                      if ($noteControl) {                      if ($noteControl) {
                         # Here we want the notes updated.  
                         my $notes = $element->{Notes}->{content};  
718                          # Insure it's in the proper form.                          # Insure it's in the proper form.
719                          if ($htmlMode) {                          if ($htmlMode) {
720                              $notes = ERDB::HTMLNote($notes);                              $notes = ERDB::HTMLNote($notes);
# Line 668  Line 724 
724                          $notes =~ s/"/\\"/g;                          $notes =~ s/"/\\"/g;
725                          $retVal .= "           myText = \"$notes\";\n";                          $retVal .= "           myText = \"$notes\";\n";
726                      }                      }
727                      if ($typeControl) {              if ($options{type}) {
728                          # Here we want the type updated.                          # Here we want the type updated.
                         my $type = $element->{type};  
729                          $retVal .= "           myType = \"$type\";\n";                          $retVal .= "           myType = \"$type\";\n";
730                      }                      }
731                if ($options{groups}) {
732                    # Here we want the groups shown. Get a list of this attribute's groups.
733                    # We'll search through this list for each group to see if it belongs with
734                    # our attribute.
735                    my $groupLiteral = "=" . join("=", @groups) . "=";
736                    # Now we need some variables containing useful code for the javascript. It's
737                    # worth knowing we go through a bit of pain to insure $groupField[i] isn't
738                    # parsed as an array element.
739                    my $groupField = $options{groups};
740                    my $currentField = $groupField . "[i]";
741                    # Do the javascript.
742                    $retVal .= "           var groupList = \"$groupLiteral\";\n";
743                    $retVal .= "           for (var i = 0; i < $groupField.length; i++) {\n";
744                    $retVal .= "              var srchString = \"=\" + $currentField.value + \"=\";\n";
745                    $retVal .= "              var srchLoc = groupList.indexOf(srchString);\n";
746                    $retVal .= "              $currentField.checked = (srchLoc >= 0);\n";
747                    $retVal .= "           }\n";
748                }
749                      # Close this case.                      # Close this case.
750                      $retVal .= "           break;\n";                      $retVal .= "           break;\n";
751                  }                  }
             }  
         }  
752          # Close the CASE statement and make the appropriate assignments.          # Close the CASE statement and make the appropriate assignments.
753          $retVal .= "        }\n";          $retVal .= "        }\n";
754          if ($noteControl) {          if ($noteControl) {
755              $retVal .= "        $noteControl = myText;\n";              $retVal .= "        $noteControl = myText;\n";
756          }          }
757          if ($typeControl) {          if ($options{type}) {
758              $retVal .= "        $typeControl = myType;\n";              $retVal .= "        $options{type} = myType;\n";
759          }          }
760      }      }
761      # Terminate the change function.      # Terminate the change function.
# Line 694  Line 765 
765      return $retVal;      return $retVal;
766  }  }
767    
768  =head3 MatchSqlPattern  =head3 GetGroups
   
 C<< my $matched = CustomAttributes::MatchSqlPattern($value, $pattern); >>  
   
 Determine whether or not a specified value matches an SQL pattern. An SQL  
 pattern has two wild card characters: C<%> that matches multiple characters,  
 and C<_> that matches a single character. These can be escaped using a  
 backslash (C<\>). We pull this off by converting the SQL pattern to a  
 PERL regular expression. As per SQL rules, the match is case-insensitive.  
   
 =over 4  
769    
770  =item value  C<< my @groups = $attrDB->GetGroups(); >>
771    
772  Value to be matched against the pattern. Note that an undefined or empty  Return a list of the available groups.
 value will not match anything.  
   
 =item pattern  
   
 SQL pattern against which to match the value. An undefined or empty pattern will  
 match everything.  
   
 =item RETURN  
   
 Returns TRUE if the value and pattern match, else FALSE.  
   
 =back  
773    
774  =cut  =cut
775    
776  sub MatchSqlPattern {  sub GetGroups {
777      # Get the parameters.      # Get the parameters.
778      my ($value, $pattern) = @_;      my ($self) = @_;
779      # Declare the return variable.      # Get the groups.
780      my $retVal;      my @retVal = $self->GetFlat(['AttributeGroup'], "", [], 'AttributeGroup(id)');
781      # Insure we have a pattern.      # Return them.
782      if (! defined($pattern) || $pattern eq "") {      return @retVal;
         $retVal = 1;  
     } else {  
         # Break the pattern into pieces around the wildcard characters. Because we  
         # use parentheses in the split function's delimiter expression, we'll get  
         # list elements for the delimiters as well as the rest of the string.  
         my @pieces = split /([_%]|\\[_%])/, $pattern;  
         # Check some fast special cases.  
         if ($pattern eq '%') {  
             # A null pattern matches everything.  
             $retVal = 1;  
         } elsif (@pieces == 1) {  
             # No wildcards, so we have a literal comparison. Note we're case-insensitive.  
             $retVal = (lc($value) eq lc($pattern));  
         } elsif (@pieces == 2 && $pieces[1] eq '%') {  
             # A wildcard at the end, so we have a substring match. This is also case-insensitive.  
             $retVal = (lc(substr($value, 0, length($pieces[0]))) eq lc($pieces[0]));  
         } else {  
             # Okay, we have to do it the hard way. Convert each piece to a PERL pattern.  
             my $realPattern = "";  
             for my $piece (@pieces) {  
                 # Determine the type of piece.  
                 if ($piece eq "") {  
                     # Empty pieces are ignored.  
                 } elsif ($piece eq "%") {  
                     # Here we have a multi-character wildcard. Note that it can match  
                     # zero or more characters.  
                     $realPattern .= ".*"  
                 } elsif ($piece eq "_") {  
                     # Here we have a single-character wildcard.  
                     $realPattern .= ".";  
                 } elsif ($piece eq "\\%" || $piece eq "\\_") {  
                     # This is an escape sequence (which is a rare thing, actually).  
                     $realPattern .= substr($piece, 1, 1);  
                 } else {  
                     # Here we have raw text.  
                     $realPattern .= quotemeta($piece);  
                 }  
             }  
             # Do the match.  
             $retVal = ($value =~ /^$realPattern$/i ? 1 : 0);  
         }  
     }  
     # Return the result.  
     return $retVal;  
783  }  }
784    
785  =head3 MigrateAttributes  =head3 GetAttributeData
786    
787  C<< CustomAttributes::MigrateAttributes($fig); >>  C<< my %keys = $attrDB->GetAttributeData($type, @list); >>
788    
789  Migrate all the attributes data from the specified FIG instance. This is a long, slow  Return attribute data for the selected attributes. The attribute
790  method used to convert the old attribute data to the new system. Only attribute  data is a hash mapping each attribute key name to a n-tuple containing the
791  keys that are not already in the database will be loaded, and only for entity instances  data type, the description, and the groups. This is the same format expected in
792  current in the database. To get an accurate capture of the attributes in the given  the L</FieldMenu> and L</ControlForm> methods for the list of attributes to display.
 instance, you may want to clear the database and the DBD before starting and  
 run L</Refresh> to populate the entities.  
793    
794  =over 4  =over 4
795    
796  =item fig  =item type
   
 A FIG object that can be used to retrieve attributes for migration purposes.  
   
 =back  
   
 =cut  
   
 sub MigrateAttributes {  
     # Get the parameters.  
     my ($fig) = @_;  
     # Get a list of the objects to migrate. This requires connecting. Note we  
     # will map each entity type to a file name. The file will contain a list  
     # of the object's IDs so we can get to them when we're not connected to  
     # the database.  
     my $ca = CustomAttributes->new();  
     my %objects = map { $_ => "$FIG_Config::temp/$_.keys.tbl" } $ca->GetEntityTypes();  
     # Set up hash of the existing attribute keys for each entity type.  
     my %oldKeys = ();  
     # Finally, we have a hash that counts the IDs for each entity type.  
     my %idCounts = map { $_ => 0 } keys %objects;  
     # Loop through the list, creating key files to read back in.  
     for my $entityType (keys %objects) {  
         Trace("Retrieving keys for $entityType.") if T(2);  
         # Create the key file.  
         my $idFile = Open(undef, ">$objects{$entityType}");  
         # Loop through the keys.  
         my @ids = $ca->GetFlat([$entityType], "", [], "$entityType(id)");  
         for my $id (@ids) {  
             print $idFile "$id\n";  
         }  
         close $idFile;  
         # In addition to the key file, we must get a list of attributes already  
         # in the database. This avoids a circularity problem that might occur if the $fig  
         # object is retrieving from the custom attributes database already.  
         my %fields = $ca->GetSecondaryFields($entityType);  
         $oldKeys{$entityType} = \%fields;  
         # Finally, we have the ID count.  
         $idCounts{$entityType} = scalar @ids;  
     }  
     # Release the custom attributes database so we can add attributes.  
     undef $ca;  
     # Loop through the objects.  
     for my $entityType (keys %objects) {  
         # Get a hash of all the attributes already in this database. These are  
         # left untouched.  
         my $myOldKeys = $oldKeys{$entityType};  
         # Create a hash to control the load file names for each attribute key we find.  
         my %keyHash = ();  
         # Set up some counters so we can trace our progress.  
         my ($totalIDs, $processedIDs, $keyCount, $valueCount) = ($idCounts{$entityType}, 0, 0, 0);  
         # Open this object's ID file.  
         Trace("Migrating data for $entityType. $totalIDs found.") if T(3);  
         my $keysIn = Open(undef, "<$objects{$entityType}");  
         while (my $id = <$keysIn>) {  
             # Remove the EOL characters.  
             chomp $id;  
             # Get this object's attributes.  
             my @allData = $fig->get_attributes($id);  
             Trace(scalar(@allData) . " attribute values found for $entityType($id).") if T(4);  
             # Loop through the attribute values one at a time.  
             for my $dataTuple (@allData) {  
                 # Get the key, value, and URL. We ignore the first element because that's the  
                 # object ID, and we already know the object ID.  
                 my (undef, $key, $value, $url) = @{$dataTuple};  
                 # Remove the buggy "1" for $url.  
                 if ($url eq "1") {  
                     $url = undef;  
                 }  
                 # Only proceed if this is not an old key.  
                 if (! $myOldKeys->{$key}) {  
                     # See if we've run into this key before.  
                     if (! exists $keyHash{$key}) {  
                         # Here we need to create the attribute key in the database.  
                         StoreAttributeKey($entityType, $key, 'text',  
                                           "Key migrated automatically from the FIG system. " .  
                                           "Please replace these notes as soon as possible " .  
                                           "with useful text."  
                                          );  
                         # Compute the attribute's load file name and open it for output.  
                         my $fileName = "$FIG_Config::temp/$entityType.$key.load.tbl";  
                         my $fh = Open(undef, ">$fileName");  
                         # Store the file name and handle.  
                         $keyHash{$key} = {h => $fh, name => $fileName};  
                         # Count this key.  
                         $keyCount++;  
                     }  
                     # Smash the value and the URL together.  
                     if (defined($url) && length($url) > 0) {  
                         $value .= "::$url";  
                     }  
                     # Write the attribute value to the load file.  
                     Tracer::PutLine($keyHash{$key}->{h}, [$id, $value]);  
                     $valueCount++;  
                 }  
             }  
             # Now we've finished all the attributes for this object. Count and trace it.  
             $processedIDs++;  
             if ($processedIDs % 500 == 0) {  
                 Trace("$processedIDs of $totalIDs ${entityType}s processed.") if T(3);  
                 Trace("$entityType has $keyCount keys and $valueCount values so far.") if T(3);  
             }  
         }  
         # Now we've finished all the attributes for all objects of this type.  
         Trace("$processedIDs ${entityType}s processed, with $keyCount keys and $valueCount values.") if T(2);  
         # Loop through the files, loading the keys into the database.  
         Trace("Connecting to database.") if T(2);  
         my $objectCA = CustomAttributes->new();  
         Trace("Loading key files.") if T(2);  
         for my $key (sort keys %keyHash) {  
             # Close the key's load file.  
             close $keyHash{$key}->{h};  
             # Reopen it for input.  
             my $fileName = $keyHash{$key}->{name};  
             my $fh = Open(undef, "<$fileName");  
             Trace("Loading $key from $fileName.") if T(3);  
             my $stats = $objectCA->LoadAttributeKey($entityType, $key, $fh, 0, 1);  
             Trace("Statistics for $key of $entityType:\n" . $stats->Show()) if T(3);  
         }  
         # All the keys for this entity type are now loaded.  
         Trace("Key files loaded for $entityType.") if T(2);  
     }  
     # All keys for all entity types are now loaded.  
     Trace("Migration complete.") if T(2);  
 }  
   
 =head3 ComputeObjectTypeFromID  
   
 C<< my ($entityName, $id) = CustomAttributes::ComputeObjectTypeFromID($objectID); >>  
   
 This method will compute the entity type corresponding to a specified object ID.  
 If the object ID begins with C<fig|>, it is presumed to be a feature ID. If it  
 is all digits with a single period, it is presumed to by a genome ID. Otherwise,  
 it must be a list reference. In this last case the first list element will be  
 taken as the entity type and the second will be taken as the actual ID.  
797    
798  =over 4  Type of attribute criterion: C<name> for attributes whose names begin with the
799    specified string, or C<group> for attributes in the specified group.
800    
801  =item objectID  =item list
802    
803  Object ID to examine.  List containing the names of the groups or keys for the desired attributes.
804    
805  =item RETURN  =item RETURN
806    
807  Returns a 2-element list consisting of the entity type followed by the specified ID.  Returns a hash mapping each attribute key name to its data type, description, and
808    parent groups.
809    
810  =back  =back
811    
812  =cut  =cut
813    
814  sub ComputeObjectTypeFromID {  sub GetAttributeData {
815      # Get the parameters.      # Get the parameters.
816      my ($objectID) = @_;      my ($self, $type, @list) = @_;
817      # Declare the return variables.      # Set up a hash to store the attribute data.
818      my ($entityName, $id);      my %retVal = ();
819      # Only proceed if the object ID is defined. If it's not, we'll be returning a      # Loop through the list items.
820      # pair of undefs.      for my $item (@list) {
821      if ($objectID) {          # Set up a query for the desired attributes.
822          if (ref $objectID eq 'ARRAY') {          my $query;
823              # Here we have the new-style list reference. Pull out its pieces.          if ($type eq 'name') {
824              ($entityName, $id) = @{$objectID};              # Here we're doing a generic name search. We need to escape it and then tack
825          } else {              # on a %.
826              # Here the ID is the outgoing ID, and we need to look at its structure              my $parm = $item;
827              # to determine the entity type.              $parm =~ s/_/\\_/g;
828              $id = $objectID;              $parm =~ s/%/\\%/g;
829              if ($objectID =~ /^\d+\.\d+/) {              $parm .= "%";
830                  # Digits with a single period is a genome.              # Ask for matching attributes. (Note that if the user passed in a null string
831                  $entityName = 'Genome';              # he'll get everything.)
832              } elsif ($objectID =~ /^fig\|/) {              $query = $self->Get(['AttributeKey'], "AttributeKey(id) LIKE ?", [$parm]);
833                  # The "fig|" prefix indicates a feature.          } elsif ($type eq 'group') {
834                  $entityName = 'Feature';              $query = $self->Get(['IsInGroup', 'AttributeKey'], "IsInGroup(to-link) = ?", [$item]);
835              } else {              } else {
836                  # Anything else is illegal!              Confess("Unknown attribute query type \"$type\".");
837                  Confess("Invalid attribute ID specification \"$objectID\".");          }
838            while (my $row = $query->Fetch()) {
839                # Get this attribute's data.
840                my ($key, $type, $notes) = $row->Values(['AttributeKey(id)', 'AttributeKey(data-type)',
841                                                         'AttributeKey(description)']);
842                # If it's new, get its groups and add it to the return hash.
843                if (! exists $retVal{$key}) {
844                    my @groups = $self->GetFlat(['IsInGroup'], "IsInGroup(from-link) = ?",
845                                                [$key], 'IsInGroup(to-link)');
846                    $retVal{$key} = [$type, $notes, @groups];
847              }              }
848          }          }
849      }      }
850      # Return the result.      # Return the result.
851      return ($entityName, $id);      return %retVal;
852  }  }
853    
854  =head2 FIG Method Replacements  =head2 FIG Method Replacements
855    
856  The following methods are used by B<FIG.pm> to replace the previous attribute functionality.  The following methods are used by B<FIG.pm> to replace the previous attribute functionality.
857  Some of the old functionality is no longer present. Controlled vocabulary is no longer  Some of the old functionality is no longer present: controlled vocabulary is no longer
858  supported and there is no longer any searching by URL. Fortunately, neither of these  supported and there is no longer any searching by URL. Fortunately, neither of these
859  capabilities were used in the old system.  capabilities were used in the old system.
860    
# Line 988  Line 868 
868  value of the splitter parameter on the constructor (L</new>). The default is double  value of the splitter parameter on the constructor (L</new>). The default is double
869  colons C<::>.  colons C<::>.
870    
871  So, for example, an old-style keyword with a /value of C<essential> and a URL of  So, for example, an old-style keyword with a value of C<essential> and a URL of
872  C<http://www.sciencemag.org/cgi/content/abstract/293/5538/2266> using the default  C<http://www.sciencemag.org/cgi/content/abstract/293/5538/2266> using the default
873  splitter value would be stored as  splitter value would be stored as
874    
# Line 999  Line 879 
879    
880  =head3 GetAttributes  =head3 GetAttributes
881    
882  C<< my @attributeList = $attrDB->GetAttributes($objectID, $key, @valuePatterns); >>  C<< my @attributeList = $attrDB->GetAttributes($objectID, $key, @values); >>
883    
884  In the database, attribute values are sectioned into pieces using a splitter  In the database, attribute values are sectioned into pieces using a splitter
885  value specified in the constructor (L</new>). This is not a requirement of  value specified in the constructor (L</new>). This is not a requirement of
886  the attribute system as a whole, merely a convenience for the purpose of  the attribute system as a whole, merely a convenience for the purpose of
887  these methods. If you are using the static method calls instead of the  these methods. If a value has multiple sections, each section
888  object-based calls, the splitter will always be the default value of  is matched against the corresponding criterion in the I<@valuePatterns> list.
 double colons (C<::>). If a value has multiple sections, each section  
 is matched against the correspond criterion in the I<@valuePatterns> list.  
889    
890  This method returns a series of tuples that match the specified criteria. Each tuple  This method returns a series of tuples that match the specified criteria. Each tuple
891  will contain an object ID, a key, and one or more values. The parameters to this  will contain an object ID, a key, and one or more values. The parameters to this
892  method therefore correspond structurally to the values expected in each tuple.  method therefore correspond structurally to the values expected in each tuple. In
893    addition, you can ask for a generic search by suffixing a percent sign (C<%>) to any
894    of the parameters. So, for example,
895    
896      my @attributeList = GetAttributes('fig|100226.1.peg.1004', 'structure%', 1, 2);      my @attributeList = $attrDB->GetAttributes('fig|100226.1.peg.1004', 'structure%', 1, 2);
897    
898  would return something like  would return something like
899    
# Line 1022  Line 902 
902      ['fig}100226.1.peg.1004', 'structure2', 1, 2]      ['fig}100226.1.peg.1004', 'structure2', 1, 2]
903      ['fig}100226.1.peg.1004', 'structureA', 1, 2]      ['fig}100226.1.peg.1004', 'structureA', 1, 2]
904    
905  Use of C<undef> in any position acts as a wild card (all values). In addition,  Use of C<undef> in any position acts as a wild card (all values). You can also specify
906  the I<$key> and I<@valuePatterns> parameters can contain SQL pattern characters: C<%>, which  a list reference in the ID column. Thus,
907  matches any sequence of characters, and C<_>, which matches any single character.  
908  (You can use an escape sequence C<\%> or C<\_> to match an actual percent sign or      my @attributeList = $attrDB->GetAttributes(['100226.1', 'fig|100226.1.%'], 'PUBMED');
909  underscore.)  
910    would get the PUBMED attribute data for Streptomyces coelicolor A3(2) and all its
911    features.
912    
913  In addition to values in multiple sections, a single attribute key can have multiple  In addition to values in multiple sections, a single attribute key can have multiple
914  values, so even  values, so even
915    
916      my @attributeList = GetAttributes($peg, 'virulent');      my @attributeList = $attrDB->GetAttributes($peg, 'virulent');
917    
918  which has no wildcard in the key or the object ID, may return multiple tuples.  which has no wildcard in the key or the object ID, may return multiple tuples.
919    
920  For reasons of backward compatability, we examine the structure of the object ID to  Value matching in this system works very poorly, because of the way multiple values are
921  determine the entity type. In that case the only two types allowed are C<Genome> and  stored. For the object ID and key name, we create queries that filter for the desired
922  C<Feature>. An alternative method is to use a list reference, with the list consisting  results. For the values, we do a comparison after the attributes are retrieved from the
923  of an entity type name and the actual ID. Thus, the above example could equivalently  database. As a result, queries in which filter only on value end up reading the entire
924  be written as  attribute table to find the desired results.
   
     my @attributeList = GetAttributes([Feature => $peg], 'virulent');  
   
 The list-reference approach allows us to add attributes to other entity types in  
 the future. Doing so, however, will require modifying the L</Refresh> method and  
 updated the database design XML.  
   
 The list-reference approach also allows for a more fault-tolerant approach to  
 getting all objects with a particular attribute.  
   
     my @attributeList = GetAttributes([Feature => undef], 'virulent');  
   
 will only return feature attributes, while  
   
     my @attributeList = GetAttributes(undef, 'virulent');  
   
 could at some point in the future get you attributes for genomes or even subsystems  
 as well as features.  
925    
926  =over 4  =over 4
927    
928  =item objectID  =item objectID
929    
930  ID of the genome or feature whose attributes are desired. In general, an ID that  ID of object whose attributes are desired. If the attributes are desired for multiple
931  starts with C<fig|> is treated as a feature ID, and an ID that is all digits with a  objects, this parameter can be specified as a list reference. If the attributes are
932  single period is treated as a genome ID. For other entity types, use a list reference; in  desired for all objects, specify C<undef> or an empty string. Finally, you can specify
933  this case the first list element is the entity type and the second is the ID. A value of  attributes for a range of object IDs by putting a percent sign (C<%>) at the end.
 C<undef> or an empty string here will match all objects.  
934    
935  =item key  =item key
936    
937  Attribute key name. Since attributes are stored as fields in the database with a  Attribute key name. A value of C<undef> or an empty string will match all
938  field name equal to the key name, it is very fast to find a list of all the  attribute keys. If the values are desired for multiple keys, this parameter can be
939  matching keys. Each key's values require a separate query, however, which may  specified as a list reference. Finally, you can specify attributes for a range of
940  be a performance problem if the pattern matches a lot of keys. Wild cards are  keys by putting a percent sign (C<%>) at the end.
 acceptable here, and a value of C<undef> or an empty string will match all  
 attribute keys.  
941    
942  =item valuePatterns  =item values
943    
944  List of the desired attribute values, section by section. If C<undef>  List of the desired attribute values, section by section. If C<undef>
945  or an empty string is specified, all values in that section will match.  or an empty string is specified, all values in that section will match. A
946    generic match can be requested by placing a percent sign (C<%>) at the end.
947    In that case, all values that match up to and not including the percent sign
948    will match.
949    
950  =item RETURN  =item RETURN
951    
# Line 1096  Line 960 
960    
961  sub GetAttributes {  sub GetAttributes {
962      # Get the parameters.      # Get the parameters.
963      my ($self, $objectID, $key, @valuePatterns) = @_;      my ($self, $objectID, $key, @values) = @_;
964        # We will create one big honking query. The following hash will build the filter
965        # clause and a parameter list.
966        my %data = ('HasValueFor(from-link)' => $key, 'HasValueFor(to-link)' => $objectID);
967        my @filter = ();
968        my @parms = ();
969        # This next loop goes through the different fields that can be specified in the
970        # parameter list and generates filters for each.
971        for my $field (keys %data) {
972            # Accumulate filter information for this field. We will OR together all the
973            # elements accumulated to create the final result.
974            my @fieldFilter = ();
975            # Get the specified data from the caller.
976            my $fieldPattern = $data{$field};
977            # Only proceed if the pattern is one that won't match everything.
978            if (defined($fieldPattern) && $fieldPattern ne "" && $fieldPattern ne "%") {
979                # Convert the pattern to an array.
980                my @patterns = ();
981                if (ref $fieldPattern eq 'ARRAY') {
982                    push @patterns, @{$fieldPattern};
983                } else {
984                    push @patterns, $fieldPattern;
985                }
986                # Only proceed if the array is nonempty. The loop will work fine if the
987                # array is empty, but when we build the filter string at the end we'll
988                # get "()" in the filter list, which will result in an SQL syntax error.
989                if (@patterns) {
990                    # Loop through the individual patterns.
991                    for my $pattern (@patterns) {
992                        # Check for a generic request.
993                        if (substr($pattern, -1, 1) ne '%') {
994                            # Here we have a normal request.
995                            push @fieldFilter, "$field = ?";
996                            push @parms, $pattern;
997                        } else {
998                            # Here we have a generate request, so we will use the LIKE operator to
999                            # filter the field to this value pattern.
1000                            push @fieldFilter, "$field LIKE ?";
1001                            # We must convert the pattern value to an SQL match pattern. First
1002                            # we get a copy of it.
1003                            my $actualPattern = $pattern;
1004                            # Now we escape the underscores. Underscores are an SQL wild card
1005                            # character, but they are used frequently in key names and object IDs.
1006                            $actualPattern =~ s/_/\\_/g;
1007                            # Add the escaped pattern to the bound parameter list.
1008                            push @parms, $actualPattern;
1009                        }
1010                    }
1011                    # Form the filter for this field.
1012                    my $fieldFilterString = join(" OR ", @fieldFilter);
1013                    push @filter, "($fieldFilterString)";
1014                }
1015            }
1016        }
1017        # Now @filter contains one or more filter strings and @parms contains the parameter
1018        # values to bind to them.
1019        my $actualFilter = join(" AND ", @filter);
1020      # Declare the return variable.      # Declare the return variable.
1021      my @retVal = ();      my @retVal = ();
1022      # Determine the entity types for our search.      # Get the number of value sections we have to match.
1023      my @objects = ();      my $sectionCount = scalar(@values);
1024      my ($actualObjectID, $computedType);      # Now we're ready to make our query.
1025      if (! $objectID) {      my $query = $self->Get(['HasValueFor'], $actualFilter, \@parms);
1026          push @objects, $self->GetEntityTypes();      # Loop through the assignments found.
1027        while (my $row = $query->Fetch()) {
1028            # Get the current row's data.
1029            my ($id, $key, $valueString) = $row->Values(['HasValueFor(to-link)', 'HasValueFor(from-link)',
1030                                                          'HasValueFor(value)']);
1031            # Break the value into sections.
1032            my @sections = split($self->{splitter}, $valueString);
1033            # Match each section against the incoming values. We'll assume we're
1034            # okay unless we learn otherwise.
1035            my $matching = 1;
1036            for (my $i = 0; $i < $sectionCount && $matching; $i++) {
1037                # We need to check to see if this section is generic.
1038                if (substr($values[$i], -1, 1) eq '%') {
1039                    my $matchLen = length($values[$i] - 1);
1040                    $matching = substr($sections[$i], 0, $matchLen) eq
1041                                substr($values[$i], 0, $matchLen);
1042      } else {      } else {
1043          ($computedType, $actualObjectID) = ComputeObjectTypeFromID($objectID);                  $matching = ($sections[$i] eq $values[$i]);
         push @objects, $computedType;  
1044      }      }
     # Loop through the entity types.  
     for my $entityType (@objects) {  
         # Now we need to find all the matching keys. The keys are actually stored in  
         # our database object, so this process is fast. Note that our  
         # MatchSqlPattern method  
         my %secondaries = $self->GetSecondaryFields($entityType);  
         my @fieldList = grep { MatchSqlPattern($_, $key) } keys %secondaries;  
         # Now we figure out whether or not we need to filter by object. We will always  
         # filter by key to a limited extent, so if we're filtering by object we need an  
         # AND to join the object ID filter with the key filter.  
         my $filter = "";  
         my @params = ();  
         if (defined($actualObjectID)) {  
             # Here the caller wants to filter on object ID.  
             $filter = "$entityType(id) = ? AND ";  
             push @params, $actualObjectID;  
         }  
         # It's time to begin making queries. We process one attribute key at a time, because  
         # each attribute is actually a different field in the database. We know here that  
         # all the keys we've collected are for the correct entity because we got them from  
         # the DBD. That's a good thing, because an invalid key name will cause an SQL error.  
         for my $key (@fieldList) {  
             # Get all of the attribute values for this key.  
             my @dataRows = $self->GetAll([$entityType], "$filter$entityType($key) IS NOT NULL",  
                                          \@params, ["$entityType(id)", "$entityType($key)"]);  
             # Process each value separately. We need to verify the values and reformat the  
             # tuples. Note that GetAll will give us one row per matching object ID,  
             # with the ID first followed by a list of the data values. This is very  
             # different from the structure we'll be returning, which has one row  
             # per value.  
             for my $dataRow (@dataRows) {  
                 # Get the object ID and the list of values.  
                 my ($rowObjectID, @dataValues) = @{$dataRow};  
                 # Loop through the values. There will be one result row per attribute value.  
                 for my $dataValue (@dataValues) {  
                     # Separate this value into sections.  
                     my @sections = split("::", $dataValue);  
                     # Loop through the value patterns, looking for a mismatch. Note that  
                     # since we're working through parallel arrays, we are using an index  
                     # loop. As soon as a match fails we stop checking. This means that  
                     # if the value pattern list is longer than the number of sections,  
                     # we will fail as soon as we run out of sections.  
                     my $match = 1;  
                     for (my $i = 0; $i <= $#valuePatterns && $match; $i++) {  
                         $match = MatchSqlPattern($sections[$i], $valuePatterns[$i]);  
                     }  
                     # If we match, we save this value in the output list.  
                     if ($match) {  
                         push @retVal, [$rowObjectID, $key, @sections];  
                     }  
                 }  
                 # Here we've processed all the attribute values for the current object ID.  
1045              }              }
1046              # Here we've processed all the rows returned by GetAll. In general, there will          # If we match, output this row to the return list.
1047              # be one row per object ID.          if ($matching) {
1048                push @retVal, [$id, $key, @sections];
1049          }          }
         # Here we've processed all the matching attribute keys.  
1050      }      }
1051      # Here we've processed all the entity types. That means @retVal has all the matching      # Return the rows found.
     # results.  
1052      return @retVal;      return @retVal;
1053  }  }
1054    
# Line 1182  Line 1063 
1063    
1064  =item objectID  =item objectID
1065    
1066  ID of the genome or feature to which the attribute is to be added. In general, an ID that  ID of the object to which the attribute is to be added.
 starts with C<fig|> is treated as a feature ID, and an ID that is all digits and periods  
 is treated as a genome ID. For IDs of other types, this parameter should be a reference  
 to a 2-tuple consisting of the entity type name followed by the object ID.  
1067    
1068  =item key  =item key
1069    
1070  Attribute key name. This corresponds to the name of a field in the database.  Attribute key name.
1071    
1072  =item values  =item values
1073    
# Line 1212  Line 1090 
1090      } elsif (! @values) {      } elsif (! @values) {
1091          Confess("No values specified in AddAttribute call for key $key.");          Confess("No values specified in AddAttribute call for key $key.");
1092      } else {      } else {
1093          # Okay, now we have some reason to believe we can do this. Start by          # Okay, now we have some reason to believe we can do this. Form the values
1094          # computing the object type and ID.          # into a scalar.
         my ($entityName, $id) = ComputeObjectTypeFromID($objectID);  
         # Form the values into a scalar.  
1095          my $valueString = join($self->{splitter}, @values);          my $valueString = join($self->{splitter}, @values);
1096          # Insert the value.          # Connect the object to the key.
1097          $self->InsertValue($id, "$entityName($key)", $valueString);          $self->InsertObject('HasValueFor', { 'from-link' => $key,
1098                                                 'to-link'   => $objectID,
1099                                                 'value'     => $valueString,
1100                                           });
1101      }      }
1102      # Return a one. We do this for backward compatability.      # Return a one, indicating success. We do this for backward compatability.
1103      return 1;      return 1;
1104  }  }
1105    
# Line 1230  Line 1109 
1109    
1110  Delete the specified attribute key/value combination from the database.  Delete the specified attribute key/value combination from the database.
1111    
 The first form will connect to the database and release it. The second form  
 uses the database connection contained in the object.  
   
1112  =over 4  =over 4
1113    
1114  =item objectID  =item objectID
1115    
1116  ID of the genome or feature to which the attribute is to be added. In general, an ID that  ID of the object whose attribute is to be deleted.
 starts with C<fig|> is treated as a feature ID, and an ID that is all digits and periods  
 is treated as a genome ID. For IDs of other types, this parameter should be a reference  
 to a 2-tuple consisting of the entity type name followed by the object ID.  
1117    
1118  =item key  =item key
1119    
1120  Attribute key name. This corresponds to the name of a field in the database.  Attribute key name.
1121    
1122  =item values  =item values
1123    
1124  One or more values to be associated with the key.  One or more values associated with the key. If no values are specified, then all values
1125    will be deleted. Otherwise, only a matching value will be deleted.
1126    
1127  =back  =back
1128    
# Line 1262  Line 1136 
1136          Confess("No object ID specified for DeleteAttribute call.");          Confess("No object ID specified for DeleteAttribute call.");
1137      } elsif (! defined($key)) {      } elsif (! defined($key)) {
1138          Confess("No attribute key specified for DeleteAttribute call.");          Confess("No attribute key specified for DeleteAttribute call.");
1139      } elsif (! @values) {      } elsif (scalar(@values) == 0) {
1140          Confess("No values specified in DeleteAttribute call for key $key.");          # Here we erase the entire key.
1141            $self->EraseAttribute($key);
1142      } else {      } else {
1143          # Now compute the object type and ID.          # Here we erase the matching values.
         my ($entityName, $id) = ComputeObjectTypeFromID($objectID);  
         # Form the values into a scalar.  
1144          my $valueString = join($self->{splitter}, @values);          my $valueString = join($self->{splitter}, @values);
1145          # Delete the value.          $self->DeleteRow('HasValueFor', $key, $objectID, { value => $valueString });
         $self->DeleteValue($entityName, $id, $key, $valueString);  
1146      }      }
1147      # Return a one. This is for backward compatability.      # Return a one. This is for backward compatability.
1148      return 1;      return 1;
# Line 1320  Line 1192 
1192      } elsif (! defined($newValues) || ref $newValues ne 'ARRAY') {      } elsif (! defined($newValues) || ref $newValues ne 'ARRAY') {
1193          Confess("No new values specified in ChangeAttribute call for key $key.");          Confess("No new values specified in ChangeAttribute call for key $key.");
1194      } else {      } else {
1195          # Okay, now we do the change as a delete/add.          # We do the change as a delete/add.
1196          $self->DeleteAttribute($objectID, $key, @{$oldValues});          $self->DeleteAttribute($objectID, $key, @{$oldValues});
1197          $self->AddAttribute($objectID, $key, @{$newValues});          $self->AddAttribute($objectID, $key, @{$newValues});
1198      }      }
# Line 1330  Line 1202 
1202    
1203  =head3 EraseAttribute  =head3 EraseAttribute
1204    
1205  C<< $attrDB->EraseAttribute($entityName, $key); >>  C<< $attrDB->EraseAttribute($key); >>
1206    
1207  Erase all values for the specified attribute key. This does not remove the  Erase all values for the specified attribute key. This does not remove the
1208  key from the database; it merely removes all the values.  key from the database; it merely removes all the values.
1209    
1210  =over 4  =over 4
1211    
 =item entityName  
   
 Name of the entity to which the key belongs. If undefined, all entities will be  
 examined for the desired key.  
   
1212  =item key  =item key
1213    
1214  Key to erase.  Key to erase.
# Line 1352  Line 1219 
1219    
1220  sub EraseAttribute {  sub EraseAttribute {
1221      # Get the parameters.      # Get the parameters.
1222      my ($self, $entityName, $key) = @_;      my ($self, $key) = @_;
1223      # Determine the relevant entity types.      # Delete everything connected to the key. The "keepRoot" option keeps the key in the
1224      my @objects = ();      # datanase while deleting everything attached to it.
1225      if (! $entityName) {      $self->Delete('AttributeKey', $key, keepRoot => 1);
         push @objects, $self->GetEntityTypes();  
     } else {  
         push @objects, $entityName;  
     }  
     # Loop through the entity types.  
     for my $entityType (@objects) {  
         # Now check for this key in this entity.  
         my %secondaries = $self->GetSecondaryFields($entityType);  
         if (exists $secondaries{$key}) {  
             # We found it, so delete all the values of the key.  
             $self->DeleteValue($entityName, undef, $key);  
         }  
     }  
1226      # Return a 1, for backward compatability.      # Return a 1, for backward compatability.
1227      return 1;      return 1;
1228  }  }
1229    
1230    =head3 GetAttributeKeys
1231    
1232    C<< my @keyList = $attrDB->GetAttributeKeys($groupName); >>
1233    
1234    Return a list of the attribute keys for a particular group.
1235    
1236    =over 4
1237    
1238    =item groupName
1239    
1240    Name of the group whose keys are desired.
1241    
1242    =item RETURN
1243    
1244    Returns a list of the attribute keys for the specified group.
1245    
1246    =back
1247    
1248    =cut
1249    
1250    sub GetAttributeKeys {
1251        # Get the parameters.
1252        my ($self, $groupName) = @_;
1253        # Get the attributes for the specified group.
1254        my @groups = $self->GetFlat(['IsInGroup'], "IsInGroup(to-link) = ?", [$groupName],
1255                                    'IsInGroup(from-link)');
1256        # Return the keys.
1257        return sort @groups;
1258    }
1259    
1260  1;  1;

Legend:
Removed from v.1.7  
changed lines
  Added in v.1.11

MCS Webmaster
ViewVC Help
Powered by ViewVC 1.0.3