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

Diff of /Sprout/ERDB.pm

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

revision 1.71, Sat Oct 14 18:08:12 2006 UTC revision 1.72, Mon Oct 16 07:44:41 2006 UTC
# Line 1158  Line 1158 
1158      my ($self, $searchExpression, $idx, $objectNames, $filterClause, $params) = @_;      my ($self, $searchExpression, $idx, $objectNames, $filterClause, $params) = @_;
1159      # Declare the return variable.      # Declare the return variable.
1160      my $retVal;      my $retVal;
1161      # Create a safety copy of the parameter list.      # Create a safety copy of the parameter list. Note we have to be careful to insure
1162      my @myParams = @{$params};      # a parameter list exists before we copy it.
1163        my @myParams = ();
1164        if (defined $params) {
1165            @myParams = @{$params};
1166        }
1167      # Get the first object's structure so we have access to the searchable fields.      # Get the first object's structure so we have access to the searchable fields.
1168      my $object1Name = $objectNames->[$idx];      my $object1Name = $objectNames->[$idx];
1169      my $object1Structure = $self->_GetStructure($object1Name);      my $object1Structure = $self->_GetStructure($object1Name);
# Line 1171  Line 1175 
1175          my @fields = @{$object1Structure->{searchFields}};          my @fields = @{$object1Structure->{searchFields}};
1176          # Clean the search expression.          # Clean the search expression.
1177          my $actualKeywords = $self->CleanKeywords($searchExpression);          my $actualKeywords = $self->CleanKeywords($searchExpression);
1178            Trace("Actual keywords for search are\n$actualKeywords") if T(3);
1179          # We need two match expressions, one for the filter clause and one in the          # We need two match expressions, one for the filter clause and one in the
1180          # query itself. Both will use a parameter mark, so we need to push the          # query itself. Both will use a parameter mark, so we need to push the
1181          # search expression onto the front of the parameter list twice.          # search expression onto the front of the parameter list twice.

Legend:
Removed from v.1.71  
changed lines
  Added in v.1.72

MCS Webmaster
ViewVC Help
Powered by ViewVC 1.0.3