← Back to branch summary

~smaioli/azureus/ubuntu-experimental

« back to all changes in this revision

Viewing changes to com/aelitis/azureus/core/metasearch/impl/MetaSearchImpl.java

Merged Vuze 4.0.0.4.

Show diffs side-by-side

added added

removed removed

Lines of Context:
com/aelitis/azureus/core/metasearch/impl/MetaSearchImpl.java
675
675
                String                                  headers,
676
676
                int                                             max_results_per_engine )
677
677
        {
678
 
                return( search( null, original_listener, searchParameters, headers, max_results_per_engine ));
 
678
                return( search( original_listener, searchParameters, headers, new HashMap(), max_results_per_engine ));
679
679
        }
680
680
        
681
681
        public Engine[] 
 
682
        search(
 
683
                final ResultListener    original_listener,
 
684
                SearchParameter[]               searchParameters,
 
685
                String                                  headers,
 
686
                Map                                             context,
 
687
                int                                             max_results_per_engine )
 
688
        {
 
689
                return( search( null, original_listener, searchParameters, headers, context, max_results_per_engine ));
 
690
        }
 
691
        
 
692
        public Engine[] 
682
693
        search(
683
 
                Engine                                  engine,
684
 
                final ResultListener    original_listener,
685
 
                SearchParameter[]               searchParameters,
 
694
                Engine[]                                engines,
 
695
                final ResultListener    listener,
 
696
                SearchParameter[]               search_parameters,
686
697
                String                                  headers,
687
698
                final int                               max_results_per_engine )
688
699
        {
 
700
                return( search( engines, listener, search_parameters, headers, new HashMap(), max_results_per_engine ));
 
701
        }
 
702
        
 
703
        public Engine[] 
 
704
        search(
 
705
                Engine[]                                engines,
 
706
                final ResultListener    original_listener,
 
707
                SearchParameter[]               searchParameters,
 
708
                String                                  headers,
 
709
                Map                                             context,
 
710
                final int                               max_results_per_engine )
 
711
        {
689
712
                String  param_str = "";
690
713
                
691
714
                for (int i=0;i<searchParameters.length;i++){
800
823
                                }
801
824
                        };
802
825
                        
803
 
                SearchExecuter se = new SearchExecuter(listener);
804
 
                
805
 
                if ( engine == null ){
806
 
                        
807
 
                        Engine[] engines = getEngines( true, true );
808
 
        
809
 
                        String  engines_str = "";
810
 
                        
811
 
                        for (int i=0;i<engines.length;i++){
812
 
                                
813
 
                                engines_str += (i==0?"":",") + engines[i].getId();
814
 
                        }
815
 
                        
816
 
                        log( "Search: params=" + param_str + "; engines=" + engines_str );
817
 
                        
818
 
        
819
 
                        for (int i=0;i<engines.length;i++){
820
 
                                
821
 
                                se.search( engines[i], searchParameters, headers, max_results_per_engine );
822
 
                        }
823
 
                        
824
 
                        return( engines );
825
 
                        
826
 
                }else{
827
 
                        
828
 
                        log( "Search: params=" + param_str + "; engine=" + engine.getId());
829
 
 
830
 
                        se.search( engine, searchParameters, headers, max_results_per_engine );
831
 
                        
832
 
                        return( new Engine[]{ engine });
833
 
                }
 
826
                SearchExecuter se = new SearchExecuter( context, listener );
 
827
                
 
828
                if ( engines == null ){
 
829
                        
 
830
                        engines = getEngines( true, true );
 
831
                }
 
832
                
 
833
                String  engines_str = "";
 
834
                
 
835
                for (int i=0;i<engines.length;i++){
 
836
                        
 
837
                        engines_str += (i==0?"":",") + engines[i].getId();
 
838
                }
 
839
                
 
840
                log( "Search: params=" + param_str + "; engines=" + engines_str );
 
841
                
 
842
                for (int i=0;i<engines.length;i++){
 
843
                        
 
844
                        se.search( engines[i], searchParameters, headers, max_results_per_engine );
 
845
                }
 
846
                
 
847
                return( engines );
834
848
        }
835
849
        
836
850
        protected Result[]