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

Diff of /Sprout/SHWordSearch.pm

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

revision 1.5, Thu Nov 16 22:59:01 2006 UTC revision 1.7, Wed Dec 6 03:37:05 2006 UTC
# Line 95  Line 95 
95                                                 -value => 'Advanced',                                                 -value => 'Advanced',
96                                                 -class => 'button')),                                                 -class => 'button')),
97                          );                          );
98      # The other row is for the submit button.      # The second row is for special options.
99        push @rows, FeatureQuery::SpecialOptions($self);
100        # The last row is for the submit button.
101      push @rows, $self->SubmitRow();      push @rows, $self->SubmitRow();
102      # Finally, if groups are specified, we include them as hidden fields and display      # Finally, if groups are specified, we include them as hidden fields and display
103      # an explanation.      # an explanation.
# Line 154  Line 156 
156          if (@groups) {          if (@groups) {
157              # Here we do the search a group at a time.              # Here we do the search a group at a time.
158              for my $group (@groups) {              for my $group (@groups) {
159                    Trace("Starting the search.") if T(3);
160                  my $query = $sprout->Search($keywords, 0, ['Feature', 'HasFeature', 'Genome'],                  my $query = $sprout->Search($keywords, 0, ['Feature', 'HasFeature', 'Genome'],
161                                              "Genome(primary-group) = ?", [$group]);                                              "Genome(primary-group) = ?", [$group]);
162                    Trace("Processing results.") if T(3);
163                  $retVal += $self->ProcessQuery($query);                  $retVal += $self->ProcessQuery($query);
164                    Trace("Results processed.") if T(3);
165              }              }
166          } else {          } else {
167              # Here we do one search just for features.              # Here we do one search just for features.
168                    Trace("Starting the search.") if T(3);
169              my $query = $sprout->Search($keywords, 0, ['Feature']);              my $query = $sprout->Search($keywords, 0, ['Feature']);
170                    Trace("Processing results.") if T(3);
171              $retVal += $self->ProcessQuery($query);              $retVal += $self->ProcessQuery($query);
172                    Trace("Results processed.") if T(3);
173          }          }
174          # Close the session file.          # Close the session file.
175          $self->CloseSession();          $self->CloseSession();
176            Trace("Session closed.") if T(3);
177      }      }
178      # Return the result count.      # Return the result count.
179      return $retVal;      return $retVal;

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

MCS Webmaster
ViewVC Help
Powered by ViewVC 1.0.3