diff --git a/src/config/defaults.go b/src/config/defaults.go index a53ce1fe..74d607fd 100644 --- a/src/config/defaults.go +++ b/src/config/defaults.go @@ -199,39 +199,39 @@ func New() Config { HardTimeout: 3 * time.Second, }, }, - category.QUICK: { - Engines: NewQuick(), + category.SCIENCE: { + Engines: NewScience(), Ranking: NewRanking(), Timings: CategoryTimings{ - PreferredTimeoutMin: 500 * time.Millisecond, - PreferredTimeoutMax: 1500 * time.Millisecond, + PreferredTimeoutMin: 1 * time.Second, + PreferredTimeoutMax: 2 * time.Second, PreferredResultsNumber: 10, - StepTime: 25 * time.Millisecond, + StepTime: 100 * time.Millisecond, MinimumResultsNumber: 5, HardTimeout: 3 * time.Second, }, }, - category.SCIENCE: { - Engines: NewScience(), + category.QUICK: { + Engines: NewQuick(), Ranking: NewRanking(), Timings: CategoryTimings{ - PreferredTimeoutMin: 1 * time.Second, - PreferredTimeoutMax: 2 * time.Second, + PreferredTimeoutMin: 500 * time.Millisecond, + PreferredTimeoutMax: 1500 * time.Millisecond, PreferredResultsNumber: 10, - StepTime: 100 * time.Millisecond, + StepTime: 25 * time.Millisecond, MinimumResultsNumber: 5, HardTimeout: 3 * time.Second, }, }, - category.BROAD: { + category.THOROUGH: { Engines: NewGeneral(), Ranking: NewRanking(), Timings: CategoryTimings{ PreferredTimeoutMin: 1 * time.Second, - PreferredTimeoutMax: 3 * time.Second, - PreferredResultsNumber: 50, + PreferredTimeoutMax: 4 * time.Second, + PreferredResultsNumber: 70, StepTime: 100 * time.Millisecond, - MinimumResultsNumber: 30, + MinimumResultsNumber: 50, HardTimeout: 5 * time.Second, }, }, diff --git a/src/search/category/category.go b/src/search/category/category.go index 82b77a4c..e94bd41b 100644 --- a/src/search/category/category.go +++ b/src/search/category/category.go @@ -5,14 +5,14 @@ import ( ) var FromString = map[string]Name{ - "general": GENERAL, - "images": IMAGES, - "quick": QUICK, - "fast": QUICK, - "science": SCIENCE, - "sci": SCIENCE, - "broad": BROAD, - "surf": BROAD, + "general": GENERAL, + "images": IMAGES, + "science": SCIENCE, + "sci": SCIENCE, + "quick": QUICK, + "fast": QUICK, + "thorough": THOROUGH, + "slow": THOROUGH, } // returns category diff --git a/src/search/category/name.go b/src/search/category/name.go index 52933bf1..9dcacb96 100644 --- a/src/search/category/name.go +++ b/src/search/category/name.go @@ -7,7 +7,7 @@ const ( UNDEFINED Name = "undefined" GENERAL Name = "general" IMAGES Name = "images" - QUICK Name = "quick" SCIENCE Name = "science" - BROAD Name = "broad" + QUICK Name = "quick" + THOROUGH Name = "thorough" )