[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.84, Thu Sep 14 14:11:09 2006 UTC revision 1.95, Wed Nov 29 20:31:32 2006 UTC
# Line 131  Line 131 
131      # Add the option table and XML file name.      # Add the option table and XML file name.
132      $retVal->{_options} = $optionTable;      $retVal->{_options} = $optionTable;
133      $retVal->{_xmlName} = $xmlFileName;      $retVal->{_xmlName} = $xmlFileName;
134        # Set up space for the group file data.
135        $retVal->{groupHash} = undef;
136      # Return it.      # Return it.
137      return $retVal;      return $retVal;
138  }  }
# Line 340  Line 342 
342    
343  =head3 GeneMenu  =head3 GeneMenu
344    
345  C<< my $selectHtml = $sprout->GeneMenu(\%attributes, $filterString, \@params); >>  C<< my $selectHtml = $sprout->GeneMenu(\%attributes, $filterString, \@params, $selected); >>
346    
347  Return an HTML select menu of genomes. Each genome will be an option in the menu,  Return an HTML select menu of genomes. Each genome will be an option in the menu,
348  and will be displayed by name with the ID and a contig count attached. The selection  and will be displayed by name with the ID and a contig count attached. The selection
# Line 362  Line 364 
364  Reference to a list of values to be substituted in for the parameter marks in  Reference to a list of values to be substituted in for the parameter marks in
365  the filter string.  the filter string.
366    
367    =item selected (optional)
368    
369    ID of the genome to be initially selected.
370    
371    =item fast (optional)
372    
373    If specified and TRUE, the contig counts will be omitted to improve performance.
374    
375  =item RETURN  =item RETURN
376    
377  Returns an HTML select menu with the specified genomes as selectable options.  Returns an HTML select menu with the specified genomes as selectable options.
# Line 372  Line 382 
382    
383  sub GeneMenu {  sub GeneMenu {
384      # Get the parameters.      # Get the parameters.
385      my ($self, $attributes, $filterString, $params) = @_;      my ($self, $attributes, $filterString, $params, $selected, $fast) = @_;
386        my $slowMode = ! $fast;
387        # Default to nothing selected. This prevents an execution warning if "$selected"
388        # is undefined.
389        $selected = "" unless defined $selected;
390        Trace("Gene Menu called with slow mode \"$slowMode\" and selection \"$selected\".") if T(3);
391      # Start the menu.      # Start the menu.
392      my $retVal = "<select " .      my $retVal = "<select " .
393          join(" ", map { "$_=\"$attributes->{$_}\"" } keys %{$attributes}) .          join(" ", map { "$_=\"$attributes->{$_}\"" } keys %{$attributes}) .
# Line 389  Line 404 
404          # Get the data for this genome.          # Get the data for this genome.
405          my ($genomeID, $genus, $species, $strain) = @{$genomeData};          my ($genomeID, $genus, $species, $strain) = @{$genomeData};
406          # Get the contig count.          # Get the contig count.
407            my $contigInfo = "";
408            if ($slowMode) {
409          my $count = $self->ContigCount($genomeID);          my $count = $self->ContigCount($genomeID);
410          my $counting = ($count == 1 ? "contig" : "contigs");          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.          # Build the option tag.
416          $retVal .= "<option value=\"$genomeID\">$genus $species $strain ($genomeID) [$count $counting]</option>\n";          $retVal .= "<option value=\"$genomeID\"$selectOption>$genus $species $strain ($genomeID)$contigInfo</option>\n";
         Trace("Option tag built for $genomeID: $genus $species $strain.") if T(3);  
417      }      }
418      # Close the SELECT tag.      # Close the SELECT tag.
419      $retVal .= "</select>\n";      $retVal .= "</select>\n";
420      # Return the result.      # Return the result.
421      return $retVal;      return $retVal;
422  }  }
423    
424  =head3 Build  =head3 Build
425    
426  C<< $sprout->Build(); >>  C<< $sprout->Build(); >>
# Line 634  Line 655 
655      return ($contigID, $start, $dir, $len);      return ($contigID, $start, $dir, $len);
656  }  }
657    
658    
659    
660  =head3 PointLocation  =head3 PointLocation
661    
662  C<< my $found = Sprout::PointLocation($location, $point); >>  C<< my $found = Sprout::PointLocation($location, $point); >>
# Line 898  Line 921 
921      my ($self, $genomeID) = @_;      my ($self, $genomeID) = @_;
922      # Declare the return variable.      # Declare the return variable.
923      my $retVal = {};      my $retVal = {};
924      # Query the genome's features and annotations. We'll put the oldest annotations      # Query the genome's features.
925      # first so that the last assignment to go into the hash will be the correct one.      my $query = $self->Get(['HasFeature', 'Feature'], "HasFeature(from-link) = ?",
     my $query = $self->Get(['HasFeature', 'IsTargetOfAnnotation', 'Annotation'],  
                            "HasFeature(from-link) = ? ORDER BY Annotation(time)",  
926                             [$genomeID]);                             [$genomeID]);
927      # Loop through the annotations.      # Loop through the features.
928      while (my $data = $query->Fetch) {      while (my $data = $query->Fetch) {
929          # Get the feature ID and annotation text.          # Get the feature ID and assignment.
930          my ($fid, $annotation) = $data->Values(['HasFeature(to-link)',          my ($fid, $assignment) = $data->Values(['Feature(id)', 'Feature(assignment)']);
931                                                  'Annotation(annotation)']);          if ($assignment) {
         # Check to see if this is an assignment. Note that the user really  
         # doesn't matter to us, other than we use it to determine whether or  
         # not this is an assignment.  
         my ($user, $assignment) = _ParseAssignment('fig', $annotation);  
         if ($user) {  
             # Here it's an assignment. We put it in the return hash, overwriting  
             # any older assignment that might be present.  
932              $retVal->{$fid} = $assignment;              $retVal->{$fid} = $assignment;
933          }          }
934      }      }
# Line 1276  Line 1290 
1290  Return the most recently-determined functional assignment of a particular feature.  Return the most recently-determined functional assignment of a particular feature.
1291    
1292  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
1293  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 the functional
1294  assignment is a type of annotation. The format of an assignment is described in  assignment is taken from the B<Feature> or C<Annotation> table, depending.
 L</ParseAssignment>. Its worth noting that we cannot filter on the content of the  
 annotation itself because it's a text field; however, this is not a big problem because  
 most features only have a small number of annotations.  
1295    
1296  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
1297  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 1299  Line 1310 
1310    
1311  =item userID (optional)  =item userID (optional)
1312    
1313  ID of the user whose function determination is desired. If omitted, only the latest  ID of the user whose function determination is desired. If omitted, the primary
1314  C<FIG> assignment will be returned.  functional assignment in the B<Feature> table will be returned.
1315    
1316  =item RETURN  =item RETURN
1317    
# Line 1317  Line 1328 
1328      my $retVal;      my $retVal;
1329      # Determine the ID type.      # Determine the ID type.
1330      if ($featureID =~ m/^fig\|/) {      if ($featureID =~ m/^fig\|/) {
1331          # Here we have a FIG feature ID. We must build the list of trusted          # Here we have a FIG feature ID.
1332          # users.          if (!$userID) {
1333                # Use the primary assignment.
1334                ($retVal) = $self->GetEntityValues('Feature', $featureID, ['Feature(assignment)']);
1335            } else {
1336                # We must build the list of trusted users.
1337          my %trusteeTable = ();          my %trusteeTable = ();
1338          # Check the user ID.          # Check the user ID.
1339          if (!$userID) {          if (!$userID) {
# Line 1361  Line 1376 
1376                  }                  }
1377              }              }
1378          }          }
1379            }
1380      } else {      } else {
1381          # Here we have a non-FIG feature ID. In this case the user ID does not          # Here we have a non-FIG feature ID. In this case the user ID does not
1382          # matter. We simply get the information from the External Alias Function          # matter. We simply get the information from the External Alias Function
# Line 1481  Line 1497 
1497          # Peel off the BBHs found.          # Peel off the BBHs found.
1498          my @found = ();          my @found = ();
1499          for my $bbh (@bbhData) {          for my $bbh (@bbhData) {
1500              push @found, $bbh->[0];              my $fid = $bbh->[0];
1501                my $bbGenome = $self->GenomeOf($fid);
1502                if ($bbGenome eq $genomeID) {
1503                    push @found, $fid;
1504                }
1505          }          }
1506          $retVal{$featureID} = \@found;          $retVal{$featureID} = \@found;
1507      }      }
# Line 2656  Line 2676 
2676      return $retVal;      return $retVal;
2677  }  }
2678    
2679    =head3 PropertyID
2680    
2681    C<< my $id = $sprout->PropertyID($propName, $propValue); >>
2682    
2683    Return the ID of the specified property name and value pair, if the
2684    pair exists.
2685    
2686    =over 4
2687    
2688    =item propName
2689    
2690    Name of the desired property.
2691    
2692    =item propValue
2693    
2694    Value expected for the desired property.
2695    
2696    =item RETURN
2697    
2698    Returns the ID of the name/value pair, or C<undef> if the pair does not exist.
2699    
2700    =back
2701    
2702    =cut
2703    
2704    sub PropertyID {
2705        # Get the parameters.
2706        my ($self, $propName, $propValue) = @_;
2707        # Try to find the ID.
2708        my ($retVal) = $self->GetFlat(['Property'],
2709                                      "Property(property-name) = ? AND Property(property-value) = ?",
2710                                      [$propName, $propValue], 'Property(id)');
2711        # Return the result.
2712        return $retVal;
2713    }
2714    
2715  =head3 MergedAnnotations  =head3 MergedAnnotations
2716    
2717  C<< my @annotationList = $sprout->MergedAnnotations(\@list); >>  C<< my @annotationList = $sprout->MergedAnnotations(\@list); >>
# Line 2853  Line 2909 
2909      # Get the parameters.      # Get the parameters.
2910      my ($self, $featureID) = @_;      my ($self, $featureID) = @_;
2911      # Get the list of names.      # Get the list of names.
2912      my @retVal = $self->GetFlat(['ContainsFeature', 'HasSSCell'], "ContainsFeature(to-link) = ?",      my @retVal = $self->GetFlat(['HasRoleInSubsystem'], "HasRoleInSubsystem(from-link) = ?",
2913                                  [$featureID], 'HasSSCell(from-link)');                                  [$featureID], 'HasRoleInSubsystem(to-link)');
2914      # Return the result.      # Return the result, sorted.
2915      return @retVal;      return sort @retVal;
2916  }  }
2917    
2918  =head3 GenomeSubsystemData  =head3 GenomeSubsystemData
# Line 3090  Line 3146 
3146      # Loop through the input triples.      # Loop through the input triples.
3147      my $n = length $sequence;      my $n = length $sequence;
3148      for (my $i = 0; $i < $n; $i += 3) {      for (my $i = 0; $i < $n; $i += 3) {
3149          # Get the current triple from the sequence.          # Get the current triple from the sequence. Note we convert to
3150          my $triple = substr($sequence, $i, 3);          # upper case to insure a match.
3151            my $triple = uc substr($sequence, $i, 3);
3152          # Translate it using the table.          # Translate it using the table.
3153          my $protein = "X";          my $protein = "X";
3154          if (exists $table->{$triple}) { $protein = $table->{$triple}; }          if (exists $table->{$triple}) { $protein = $table->{$triple}; }
# Line 3159  Line 3216 
3216      my @bbhList = FIGRules::BBHData($featureID, $cutoff);      my @bbhList = FIGRules::BBHData($featureID, $cutoff);
3217      # Form the results into the return hash.      # Form the results into the return hash.
3218      for my $pair (@bbhList) {      for my $pair (@bbhList) {
3219          $retVal{$pair->[0]} = $pair->[1];          my $fid = $pair->[0];
3220            if ($self->Exists('Feature', $fid)) {
3221                $retVal{$fid} = $pair->[1];
3222            }
3223      }      }
3224      # Return the result.      # Return the result.
3225      return %retVal;      return %retVal;
# Line 3230  Line 3290 
3290      return $retVal;      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  =head3 GetGroups
3343    
3344  C<< my %groups = $sprout->GetGroups(\@groupList); >>  C<< my %groups = $sprout->GetGroups(\@groupList); >>
# Line 3251  Line 3360 
3360          # Here we have a group list. Loop through them individually,          # Here we have a group list. Loop through them individually,
3361          # getting a list of the relevant genomes.          # getting a list of the relevant genomes.
3362          for my $group (@{$groupList}) {          for my $group (@{$groupList}) {
3363              my @genomeIDs = $self->GetFlat(['Genome'], "Genome(group-name) = ?",              my @genomeIDs = $self->GetFlat(['Genome'], "Genome(primary-group) = ?",
3364                  [$group], "Genome(id)");                  [$group], "Genome(id)");
3365              $retVal{$group} = \@genomeIDs;              $retVal{$group} = \@genomeIDs;
3366          }          }
# Line 3259  Line 3368 
3368          # Here we need all of the groups. In this case, we run through all          # 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          # 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          # group. Note that we use a filter clause to insure that only genomes
3371          # in groups are included in the return set.          # in real NMPDR groups are included in the return set.
3372          my @genomes = $self->GetAll(['Genome'], "Genome(group-name) > ' '", [],          my @genomes = $self->GetAll(['Genome'], "Genome(primary-group) <> ?",
3373                                      ['Genome(id)', 'Genome(group-name)']);                                      [$FIG_Config::otherGroup], ['Genome(id)', 'Genome(primary-group)']);
3374          # Loop through the genomes found.          # Loop through the genomes found.
3375          for my $genome (@genomes) {          for my $genome (@genomes) {
3376              # Pop this genome's ID off the current list.              # Pop this genome's ID off the current list.
# Line 3379  Line 3488 
3488      # Get the parameters.      # Get the parameters.
3489      my ($self, $genomeID, $testFlag) = @_;      my ($self, $genomeID, $testFlag) = @_;
3490      # Perform the delete for the genome's features.      # Perform the delete for the genome's features.
3491      my $retVal = $self->Delete('Feature', "fig|$genomeID.%", $testFlag);      my $retVal = $self->Delete('Feature', "fig|$genomeID.%", testMode => $testFlag);
3492      # Perform the delete for the primary genome data.      # Perform the delete for the primary genome data.
3493      my $stats = $self->Delete('Genome', $genomeID, $testFlag);      my $stats = $self->Delete('Genome', $genomeID, testMode => $testFlag);
3494      $retVal->Accumulate($stats);      $retVal->Accumulate($stats);
3495      # Return the result.      # Return the result.
3496      return $retVal;      return $retVal;
# Line 3429  Line 3538 
3538      return %retVal;      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  =head3 ReadGroupFile
3586    
3587  C<< my %groupData = Sprout::ReadGroupFile($groupFileName); >>  C<< my %groupData = Sprout::ReadGroupFile($groupFileName); >>
# Line 3490  Line 3643 
3643      return %retVal;      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
# Line 3579  Line 3833 
3833      return $retVal;      return $retVal;
3834  }  }
3835    
 =head3 AddProperty  
   
 C<< my  = $sprout->AddProperty($featureID, $key, $value, $url); >>  
   
 Add a new attribute value (Property) to a feature. In the SEED system, attributes can  
 be added to almost any object. In Sprout, they can only be added to features. In  
 Sprout, attributes are implemented using I<properties>. A property represents a key/value  
 pair. If the particular key/value pair coming in is not already in the database, a new  
 B<Property> record is created to hold it.  
   
 =over 4  
   
 =item peg  
   
 ID of the feature to which the attribute is to be replied.  
   
 =item key  
   
 Name of the attribute (key).  
   
 =item value  
   
 Value of the attribute.  
   
 =item url  
   
 URL or text citation from which the property was obtained.  
   
 =back  
   
 =cut  
 #: Return Type ;  
 sub AddProperty {  
     # Get the parameters.  
     my ($self, $featureID, $key, $value, $url) = @_;  
     # Declare the variable to hold the desired property ID.  
     my $propID;  
     # Attempt to find a property record for this key/value pair.  
     my @properties = $self->GetFlat(['Property'],  
                                    "Property(property-name) = ? AND Property(property-value) = ?",  
                                    [$key, $value], 'Property(id)');  
     if (@properties) {  
         # Here the property is already in the database. We save its ID.  
         $propID = $properties[0];  
         # Here the property value does not exist. We need to generate an ID. It will be set  
         # to a number one greater than the maximum value in the database. This call to  
         # GetAll will stop after one record.  
         my @maxProperty = $self->GetAll(['Property'], "ORDER BY Property(id) DESC", [], ['Property(id)'],  
                                         1);  
         $propID = $maxProperty[0]->[0] + 1;  
         # Insert the new property value.  
         $self->Insert('Property', { 'property-name' => $key, 'property-value' => $value, id => $propID });  
     }  
     # Now we connect the incoming feature to the property.  
     $self->Insert('HasProperty', { 'from-link' => $featureID, 'to-link' => $propID, evidence => $url });  
 }  
   
3836    
3837  1;  1;

Legend:
Removed from v.1.84  
changed lines
  Added in v.1.95

MCS Webmaster
ViewVC Help
Powered by ViewVC 1.0.3