diff --git a/controllers/search_controller.php b/controllers/search_controller.php index ceddfb63d..0328bf634 100755 --- a/controllers/search_controller.php +++ b/controllers/search_controller.php @@ -138,12 +138,12 @@ class SearchController extends Controller implements CrawlConstants } else { $index_time_stamp = 0; //use the default crawl index } - if(isset($_REQUEST['q']) && strlen($_REQUEST['q']) >0 + if(isset($_REQUEST['q']) && strlen($_REQUEST['q']) > 0 || $activity != "query") { if($activity == "query") { $activity_array = $this->extractActivityQuery(); $query = $activity_array[0]; // dirty - $method = $activity_array[1]; + $activity = $activity_array[1]; $arg = $activity_array[2]; } @@ -168,7 +168,10 @@ class SearchController extends Controller implements CrawlConstants list(,$query_activity,) = $this->extractActivityQuery(); if($query_activity != "query") {$highlight = false;} } - $summary_offset = $this->clean($_REQUEST['so'], "int"); + $summary_offset = NULL; + if(isset($_REQUEST['so'])) { + $summary_offset = $this->clean($_REQUEST['so'], "int"); + } $this->cacheRequest($query, $arg, $summary_offset, $highlight, $index_time_stamp); } @@ -207,7 +210,6 @@ class SearchController extends Controller implements CrawlConstants function processQuery($query, $activity, $arg, $results_per_page, $limit = 0, $index_name = 0) { - if($index_name == 0) { $index_name = $this->crawlModel->getCurrentIndexDatabaseName(); } @@ -220,7 +222,14 @@ class SearchController extends Controller implements CrawlConstants case "related": $data['QUERY'] = "related:$arg"; $url = $arg; - $summary_offset = $this->clean($_REQUEST['so'], "int"); + $summary_offset = NULL; + if(isset($_REQUEST['so'])) { + $summary_offset = $this->clean($_REQUEST['so'], "int"); + } + if($summary_offset === NULL) { + $summary_offset = + $this->phraseModel->lookupSummaryOffset($url); + } $crawl_item = $this->crawlModel->getCrawlItem( crawlHash($url), $summary_offset); @@ -317,7 +326,11 @@ class SearchController extends Controller implements CrawlConstants $crawl_time = $this->crawlModel->getCurrentIndexDatabaseName(); } + $this->phraseModel->index_name = $crawl_time; $this->crawlModel->index_name = $crawl_time; + if($summary_offset === NULL) { + $summary_offset = $this->phraseModel->lookupSummaryOffset($url); + } if(!$crawl_item = $this->crawlModel->getCrawlItem(crawlHash($url), $summary_offset)) { diff --git a/locale/en-US/configure.ini b/locale/en-US/configure.ini index 4b38bc799..79aca6c97 100755 --- a/locale/en-US/configure.ini +++ b/locale/en-US/configure.ini @@ -199,7 +199,7 @@ admin_controller_describe_robot = "Please Describe Your Robot" ; search_controller.php line: 119 search_controller_logout_successful = "Logout Successful!!" ; -; search_controller.php line: 369 +; search_controller.php line: 391 search_controller_cached_version = "This cached version of %s was obtained by the Yioop crawler on %s." ; ; settings_controller.php line: 134 @@ -256,27 +256,27 @@ crawlstatus_view_previous_crawls = "Previous Crawls" crawlstatus_view_description = "Description:" ; ; crawlstatus_view.php line: 113 -crawlstatus_view_time_started = "Time started:" +crawlstatus_view_timestamp = "Timestamp:" ; ; crawlstatus_view.php line: 114 -crawlstatus_view_url_counts = "Visited/Extracted Urls" +crawlstatus_view_url_counts = "Visited/Extracted Urls:" ; ; crawlstatus_view.php line: 115 crawlstatus_view_actions = "Actions:" ; -; crawlstatus_view.php line: 126 +; crawlstatus_view.php line: 128 crawlstatus_view_resume = "Resume" ; -; crawlstatus_view.php line: 132 +; crawlstatus_view.php line: 134 crawlstatus_view_set_index = "Set as Index" ; -; crawlstatus_view.php line: 135 +; crawlstatus_view.php line: 137 crawlstatus_view_search_index = "Search Index" ; -; crawlstatus_view.php line: 142 +; crawlstatus_view.php line: 144 crawlstatus_view_delete = "Delete" ; -; crawlstatus_view.php line: 149 +; crawlstatus_view.php line: 151 crawlstatus_view_no_previous_crawl = "No Previous Crawls" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements @@ -576,25 +576,25 @@ search_view_calculated = "Calculated in %s seconds." ; search_view.php line: 107 search_view_results = "Showing results %s - %s of %s" ; -; search_view.php line: 128 +; search_view.php line: 132 search_view_rank = "Rank: %s " ; -; search_view.php line: 130 +; search_view.php line: 136 search_view_relevancy = "Rel: %s " ; -; search_view.php line: 133 +; search_view.php line: 140 search_view_score = "Score %s" ; -; search_view.php line: 144 +; search_view.php line: 151 search_view_cache = "Cached" ; -; search_view.php line: 147 +; search_view.php line: 154 search_view_as_text = "View as text" ; -; search_view.php line: 153 +; search_view.php line: 160 search_view_similar = "Similar" ; -; search_view.php line: 157 +; search_view.php line: 164 search_view_inlink = "Inlinks" ; ; settings_view.php line: 76 diff --git a/locale/en-US/statistics.txt b/locale/en-US/statistics.txt index b6bef56f0..5a165df53 100755 --- a/locale/en-US/statistics.txt +++ b/locale/en-US/statistics.txt @@ -1 +1 @@ -d:99; \ No newline at end of file +d:100; \ No newline at end of file diff --git a/locale/fr-FR/configure.ini b/locale/fr-FR/configure.ini index 6d7c9acab..1dffc287b 100755 --- a/locale/fr-FR/configure.ini +++ b/locale/fr-FR/configure.ini @@ -199,7 +199,7 @@ admin_controller_describe_robot = "" ; search_controller.php line: 119 search_controller_logout_successful = "" ; -; search_controller.php line: 369 +; search_controller.php line: 391 search_controller_cached_version = "" ; ; settings_controller.php line: 134 @@ -256,7 +256,7 @@ crawlstatus_view_previous_crawls = "" crawlstatus_view_description = "" ; ; crawlstatus_view.php line: 113 -crawlstatus_view_time_started = "" +crawlstatus_view_timestamp = "" ; ; crawlstatus_view.php line: 114 crawlstatus_view_url_counts = "" @@ -264,19 +264,19 @@ crawlstatus_view_url_counts = "" ; crawlstatus_view.php line: 115 crawlstatus_view_actions = "" ; -; crawlstatus_view.php line: 126 +; crawlstatus_view.php line: 128 crawlstatus_view_resume = "" ; -; crawlstatus_view.php line: 132 +; crawlstatus_view.php line: 134 crawlstatus_view_set_index = "" ; -; crawlstatus_view.php line: 135 +; crawlstatus_view.php line: 137 crawlstatus_view_search_index = "" ; -; crawlstatus_view.php line: 142 +; crawlstatus_view.php line: 144 crawlstatus_view_delete = "" ; -; crawlstatus_view.php line: 149 +; crawlstatus_view.php line: 151 crawlstatus_view_no_previous_crawl = "" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements @@ -576,25 +576,25 @@ search_view_calculated = "Trouver en %s secondes." ; search_view.php line: 107 search_view_results = "Affichage de %s - %s sur %s résultats" ; -; search_view.php line: 128 +; search_view.php line: 132 search_view_rank = "Rang: %s" ; -; search_view.php line: 130 +; search_view.php line: 136 search_view_relevancy = "Pertinence: %s" ; -; search_view.php line: 133 +; search_view.php line: 140 search_view_score = "Total: %s" ; -; search_view.php line: 144 +; search_view.php line: 151 search_view_cache = "En Cache" ; -; search_view.php line: 147 +; search_view.php line: 154 search_view_as_text = "Version texte" ; -; search_view.php line: 153 +; search_view.php line: 160 search_view_similar = "Pages similaires" ; -; search_view.php line: 157 +; search_view.php line: 164 search_view_inlink = "" ; ; settings_view.php line: 76 diff --git a/locale/he/configure.ini b/locale/he/configure.ini index 555e6e092..5148d447c 100755 --- a/locale/he/configure.ini +++ b/locale/he/configure.ini @@ -199,7 +199,7 @@ admin_controller_describe_robot = "" ; search_controller.php line: 119 search_controller_logout_successful = "" ; -; search_controller.php line: 369 +; search_controller.php line: 391 search_controller_cached_version = "" ; ; settings_controller.php line: 134 @@ -256,7 +256,7 @@ crawlstatus_view_previous_crawls = "" crawlstatus_view_description = "" ; ; crawlstatus_view.php line: 113 -crawlstatus_view_time_started = "" +crawlstatus_view_timestamp = "" ; ; crawlstatus_view.php line: 114 crawlstatus_view_url_counts = "" @@ -264,19 +264,19 @@ crawlstatus_view_url_counts = "" ; crawlstatus_view.php line: 115 crawlstatus_view_actions = "" ; -; crawlstatus_view.php line: 126 +; crawlstatus_view.php line: 128 crawlstatus_view_resume = "" ; -; crawlstatus_view.php line: 132 +; crawlstatus_view.php line: 134 crawlstatus_view_set_index = "" ; -; crawlstatus_view.php line: 135 +; crawlstatus_view.php line: 137 crawlstatus_view_search_index = "" ; -; crawlstatus_view.php line: 142 +; crawlstatus_view.php line: 144 crawlstatus_view_delete = "" ; -; crawlstatus_view.php line: 149 +; crawlstatus_view.php line: 151 crawlstatus_view_no_previous_crawl = "" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements @@ -576,25 +576,25 @@ search_view_calculated = "" ; search_view.php line: 107 search_view_results = "" ; -; search_view.php line: 128 +; search_view.php line: 132 search_view_rank = "" ; -; search_view.php line: 130 +; search_view.php line: 136 search_view_relevancy = "" ; -; search_view.php line: 133 +; search_view.php line: 140 search_view_score = "" ; -; search_view.php line: 144 +; search_view.php line: 151 search_view_cache = "" ; -; search_view.php line: 147 +; search_view.php line: 154 search_view_as_text = "" ; -; search_view.php line: 153 +; search_view.php line: 160 search_view_similar = "" ; -; search_view.php line: 157 +; search_view.php line: 164 search_view_inlink = "" ; ; settings_view.php line: 76 diff --git a/locale/in-ID/configure.ini b/locale/in-ID/configure.ini index dd9744670..cbf6abf0a 100755 --- a/locale/in-ID/configure.ini +++ b/locale/in-ID/configure.ini @@ -199,7 +199,7 @@ admin_controller_describe_robot = "" ; search_controller.php line: 119 search_controller_logout_successful = "Logout berhasil" ; -; search_controller.php line: 369 +; search_controller.php line: 391 search_controller_cached_version = "" ; ; settings_controller.php line: 134 @@ -256,7 +256,7 @@ crawlstatus_view_previous_crawls = "" crawlstatus_view_description = "" ; ; crawlstatus_view.php line: 113 -crawlstatus_view_time_started = "" +crawlstatus_view_timestamp = "" ; ; crawlstatus_view.php line: 114 crawlstatus_view_url_counts = "" @@ -264,19 +264,19 @@ crawlstatus_view_url_counts = "" ; crawlstatus_view.php line: 115 crawlstatus_view_actions = "" ; -; crawlstatus_view.php line: 126 +; crawlstatus_view.php line: 128 crawlstatus_view_resume = "" ; -; crawlstatus_view.php line: 132 +; crawlstatus_view.php line: 134 crawlstatus_view_set_index = "" ; -; crawlstatus_view.php line: 135 +; crawlstatus_view.php line: 137 crawlstatus_view_search_index = "" ; -; crawlstatus_view.php line: 142 +; crawlstatus_view.php line: 144 crawlstatus_view_delete = "" ; -; crawlstatus_view.php line: 149 +; crawlstatus_view.php line: 151 crawlstatus_view_no_previous_crawl = "" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements @@ -576,25 +576,25 @@ search_view_calculated = "" ; search_view.php line: 107 search_view_results = "Hasil" ; -; search_view.php line: 128 +; search_view.php line: 132 search_view_rank = "Urutan" ; -; search_view.php line: 130 +; search_view.php line: 136 search_view_relevancy = "" ; -; search_view.php line: 133 +; search_view.php line: 140 search_view_score = "" ; -; search_view.php line: 144 +; search_view.php line: 151 search_view_cache = "" ; -; search_view.php line: 147 +; search_view.php line: 154 search_view_as_text = "" ; -; search_view.php line: 153 +; search_view.php line: 160 search_view_similar = "" ; -; search_view.php line: 157 +; search_view.php line: 164 search_view_inlink = "" ; ; settings_view.php line: 76 diff --git a/locale/ja/configure.ini b/locale/ja/configure.ini index 4da074c08..13d45787e 100755 --- a/locale/ja/configure.ini +++ b/locale/ja/configure.ini @@ -199,7 +199,7 @@ admin_controller_describe_robot = "ロボットの説明してください。" ; search_controller.php line: 119 search_controller_logout_successful = "ログアウト成功" ; -; search_controller.php line: 369 +; search_controller.php line: 391 search_controller_cached_version = "％sのこのキャッシュされたバージョンは％sのウィオップから入手しました。" ; ; settings_controller.php line: 134 @@ -256,7 +256,7 @@ crawlstatus_view_previous_crawls = "さっきの検索" crawlstatus_view_description = "説明" ; ; crawlstatus_view.php line: 113 -crawlstatus_view_time_started = "始まった時の時間" +crawlstatus_view_timestamp = "" ; ; crawlstatus_view.php line: 114 crawlstatus_view_url_counts = "" @@ -264,19 +264,19 @@ crawlstatus_view_url_counts = "" ; crawlstatus_view.php line: 115 crawlstatus_view_actions = "アクション" ; -; crawlstatus_view.php line: 126 +; crawlstatus_view.php line: 128 crawlstatus_view_resume = "再会" ; -; crawlstatus_view.php line: 132 +; crawlstatus_view.php line: 134 crawlstatus_view_set_index = "指数の設定する。" ; -; crawlstatus_view.php line: 135 +; crawlstatus_view.php line: 137 crawlstatus_view_search_index = "検索指数" ; -; crawlstatus_view.php line: 142 +; crawlstatus_view.php line: 144 crawlstatus_view_delete = "削除" ; -; crawlstatus_view.php line: 149 +; crawlstatus_view.php line: 151 crawlstatus_view_no_previous_crawl = "さっきの検索はありません" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements @@ -576,25 +576,25 @@ search_view_calculated = "％s分で計算しました。" ; search_view.php line: 107 search_view_results = "結果表示％s ー ％s の ％s" ; -; search_view.php line: 128 +; search_view.php line: 132 search_view_rank = "ランク：％s" ; -; search_view.php line: 130 +; search_view.php line: 136 search_view_relevancy = "関連：％s" ; -; search_view.php line: 133 +; search_view.php line: 140 search_view_score = "スコア ％s" ; -; search_view.php line: 144 +; search_view.php line: 151 search_view_cache = "キャッシューしました。" ; -; search_view.php line: 147 +; search_view.php line: 154 search_view_as_text = "テクストビュー" ; -; search_view.php line: 153 +; search_view.php line: 160 search_view_similar = "同じビュー" ; -; search_view.php line: 157 +; search_view.php line: 164 search_view_inlink = "" ; ; settings_view.php line: 76 diff --git a/locale/ja/statistics.txt b/locale/ja/statistics.txt index eedae9b06..a88e2a194 100755 --- a/locale/ja/statistics.txt +++ b/locale/ja/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/locale/ko/configure.ini b/locale/ko/configure.ini index 81951938c..dcc998267 100755 --- a/locale/ko/configure.ini +++ b/locale/ko/configure.ini @@ -199,7 +199,7 @@ admin_controller_describe_robot = "" ; search_controller.php line: 119 search_controller_logout_successful = "로그 아웃 성공!!" ; -; search_controller.php line: 369 +; search_controller.php line: 391 search_controller_cached_version = "현재 캐시 버젼 %s 은 Yioop 크롤 %s 에 의하여 얻어 졌습니다. " ; ; settings_controller.php line: 134 @@ -256,7 +256,7 @@ crawlstatus_view_previous_crawls = "" crawlstatus_view_description = "설명:" ; ; crawlstatus_view.php line: 113 -crawlstatus_view_time_started = "시작한 시간:" +crawlstatus_view_timestamp = "" ; ; crawlstatus_view.php line: 114 crawlstatus_view_url_counts = "" @@ -264,19 +264,19 @@ crawlstatus_view_url_counts = "" ; crawlstatus_view.php line: 115 crawlstatus_view_actions = "" ; -; crawlstatus_view.php line: 126 +; crawlstatus_view.php line: 128 crawlstatus_view_resume = "" ; -; crawlstatus_view.php line: 132 +; crawlstatus_view.php line: 134 crawlstatus_view_set_index = "" ; -; crawlstatus_view.php line: 135 +; crawlstatus_view.php line: 137 crawlstatus_view_search_index = "" ; -; crawlstatus_view.php line: 142 +; crawlstatus_view.php line: 144 crawlstatus_view_delete = "" ; -; crawlstatus_view.php line: 149 +; crawlstatus_view.php line: 151 crawlstatus_view_no_previous_crawl = "" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements @@ -576,25 +576,25 @@ search_view_calculated = "" ; search_view.php line: 107 search_view_results = "" ; -; search_view.php line: 128 +; search_view.php line: 132 search_view_rank = "" ; -; search_view.php line: 130 +; search_view.php line: 136 search_view_relevancy = "관련성: %s " ; -; search_view.php line: 133 +; search_view.php line: 140 search_view_score = "점수 %s" ; -; search_view.php line: 144 +; search_view.php line: 151 search_view_cache = "캐시 됀것" ; -; search_view.php line: 147 +; search_view.php line: 154 search_view_as_text = "일반 텍스트로써 보기" ; -; search_view.php line: 153 +; search_view.php line: 160 search_view_similar = "유사성" ; -; search_view.php line: 157 +; search_view.php line: 164 search_view_inlink = "" ; ; settings_view.php line: 76 diff --git a/locale/rn-US/configure.ini b/locale/rn-US/configure.ini index 63b95bb17..1f56213f6 100755 --- a/locale/rn-US/configure.ini +++ b/locale/rn-US/configure.ini @@ -199,7 +199,7 @@ admin_controller_describe_robot = "" ; search_controller.php line: 119 search_controller_logout_successful = "Logout Successful!" ; -; search_controller.php line: 369 +; search_controller.php line: 391 search_controller_cached_version = "" ; ; settings_controller.php line: 134 @@ -256,7 +256,7 @@ crawlstatus_view_previous_crawls = "" crawlstatus_view_description = "" ; ; crawlstatus_view.php line: 113 -crawlstatus_view_time_started = "" +crawlstatus_view_timestamp = "" ; ; crawlstatus_view.php line: 114 crawlstatus_view_url_counts = "" @@ -264,19 +264,19 @@ crawlstatus_view_url_counts = "" ; crawlstatus_view.php line: 115 crawlstatus_view_actions = "" ; -; crawlstatus_view.php line: 126 +; crawlstatus_view.php line: 128 crawlstatus_view_resume = "" ; -; crawlstatus_view.php line: 132 +; crawlstatus_view.php line: 134 crawlstatus_view_set_index = "" ; -; crawlstatus_view.php line: 135 +; crawlstatus_view.php line: 137 crawlstatus_view_search_index = "" ; -; crawlstatus_view.php line: 142 +; crawlstatus_view.php line: 144 crawlstatus_view_delete = "" ; -; crawlstatus_view.php line: 149 +; crawlstatus_view.php line: 151 crawlstatus_view_no_previous_crawl = "" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements @@ -576,25 +576,25 @@ search_view_calculated = "" ; search_view.php line: 107 search_view_results = "" ; -; search_view.php line: 128 +; search_view.php line: 132 search_view_rank = "" ; -; search_view.php line: 130 +; search_view.php line: 136 search_view_relevancy = "" ; -; search_view.php line: 133 +; search_view.php line: 140 search_view_score = "" ; -; search_view.php line: 144 +; search_view.php line: 151 search_view_cache = "" ; -; search_view.php line: 147 +; search_view.php line: 154 search_view_as_text = "" ; -; search_view.php line: 153 +; search_view.php line: 160 search_view_similar = "" ; -; search_view.php line: 157 +; search_view.php line: 164 search_view_inlink = "" ; ; settings_view.php line: 76 diff --git a/locale/th/configure.ini b/locale/th/configure.ini index 123f3d571..9fe1ff3e8 100755 --- a/locale/th/configure.ini +++ b/locale/th/configure.ini @@ -199,7 +199,7 @@ admin_controller_describe_robot = "" ; search_controller.php line: 119 search_controller_logout_successful = "" ; -; search_controller.php line: 369 +; search_controller.php line: 391 search_controller_cached_version = "" ; ; settings_controller.php line: 134 @@ -256,7 +256,7 @@ crawlstatus_view_previous_crawls = "" crawlstatus_view_description = "" ; ; crawlstatus_view.php line: 113 -crawlstatus_view_time_started = "" +crawlstatus_view_timestamp = "" ; ; crawlstatus_view.php line: 114 crawlstatus_view_url_counts = "" @@ -264,19 +264,19 @@ crawlstatus_view_url_counts = "" ; crawlstatus_view.php line: 115 crawlstatus_view_actions = "" ; -; crawlstatus_view.php line: 126 +; crawlstatus_view.php line: 128 crawlstatus_view_resume = "" ; -; crawlstatus_view.php line: 132 +; crawlstatus_view.php line: 134 crawlstatus_view_set_index = "" ; -; crawlstatus_view.php line: 135 +; crawlstatus_view.php line: 137 crawlstatus_view_search_index = "" ; -; crawlstatus_view.php line: 142 +; crawlstatus_view.php line: 144 crawlstatus_view_delete = "" ; -; crawlstatus_view.php line: 149 +; crawlstatus_view.php line: 151 crawlstatus_view_no_previous_crawl = "" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements @@ -576,25 +576,25 @@ search_view_calculated = "" ; search_view.php line: 107 search_view_results = "" ; -; search_view.php line: 128 +; search_view.php line: 132 search_view_rank = "" ; -; search_view.php line: 130 +; search_view.php line: 136 search_view_relevancy = "" ; -; search_view.php line: 133 +; search_view.php line: 140 search_view_score = "" ; -; search_view.php line: 144 +; search_view.php line: 151 search_view_cache = "" ; -; search_view.php line: 147 +; search_view.php line: 154 search_view_as_text = "" ; -; search_view.php line: 153 +; search_view.php line: 160 search_view_similar = "" ; -; search_view.php line: 157 +; search_view.php line: 164 search_view_inlink = "" ; ; settings_view.php line: 76 diff --git a/locale/vi-VN/configure.ini b/locale/vi-VN/configure.ini index 39dbad5a2..3d286600a 100755 --- a/locale/vi-VN/configure.ini +++ b/locale/vi-VN/configure.ini @@ -199,7 +199,7 @@ admin_controller_describe_robot = "Diễn tả rô bô của bạn" ; search_controller.php line: 119 search_controller_logout_successful = "Thoát thành công" ; -; search_controller.php line: 369 +; search_controller.php line: 391 search_controller_cached_version = "Trang gốc này: %s đã tìm được bởi công cụ tìm kiẽm Yioop vào ngày %s." ; ; settings_controller.php line: 134 @@ -256,7 +256,7 @@ crawlstatus_view_previous_crawls = "" crawlstatus_view_description = "Mô tả:" ; ; crawlstatus_view.php line: 113 -crawlstatus_view_time_started = "Thời gian bắt đầu:" +crawlstatus_view_timestamp = "" ; ; crawlstatus_view.php line: 114 crawlstatus_view_url_counts = "" @@ -264,19 +264,19 @@ crawlstatus_view_url_counts = "" ; crawlstatus_view.php line: 115 crawlstatus_view_actions = "Những hành động:" ; -; crawlstatus_view.php line: 126 +; crawlstatus_view.php line: 128 crawlstatus_view_resume = "Bắt đầu trở lại" ; -; crawlstatus_view.php line: 132 +; crawlstatus_view.php line: 134 crawlstatus_view_set_index = "Cài làm mục lục" ; -; crawlstatus_view.php line: 135 +; crawlstatus_view.php line: 137 crawlstatus_view_search_index = "Tìm mục lục" ; -; crawlstatus_view.php line: 142 +; crawlstatus_view.php line: 144 crawlstatus_view_delete = "Xoá" ; -; crawlstatus_view.php line: 149 +; crawlstatus_view.php line: 151 crawlstatus_view_no_previous_crawl = "" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements @@ -576,25 +576,25 @@ search_view_calculated = "Đã tính toán trong %s giây ; search_view.php line: 107 search_view_results = "Cho kết quả tứ %s - %s của %s" ; -; search_view.php line: 128 +; search_view.php line: 132 search_view_rank = "Thứ Tự:" ; -; search_view.php line: 130 +; search_view.php line: 136 search_view_relevancy = "Thích hợp:" ; -; search_view.php line: 133 +; search_view.php line: 140 search_view_score = "Điểm: %s" ; -; search_view.php line: 144 +; search_view.php line: 151 search_view_cache = "Trang gốc" ; -; search_view.php line: 147 +; search_view.php line: 154 search_view_as_text = "Trang Web Bắng Chữ" ; -; search_view.php line: 153 +; search_view.php line: 160 search_view_similar = "Tương Tự" ; -; search_view.php line: 157 +; search_view.php line: 164 search_view_inlink = "" ; ; settings_view.php line: 76 diff --git a/locale/vi-VN/statistics.txt b/locale/vi-VN/statistics.txt index 2c43a0adb..d1d9ed5ab 100755 --- a/locale/vi-VN/statistics.txt +++ b/locale/vi-VN/statistics.txt @@ -1 +1 @@ -d:73; \ No newline at end of file +d:72; \ No newline at end of file diff --git a/locale/vn-US/configure.ini b/locale/vn-US/configure.ini index ad67134e6..924ff573e 100755 --- a/locale/vn-US/configure.ini +++ b/locale/vn-US/configure.ini @@ -199,7 +199,7 @@ admin_controller_describe_robot = "" ; search_controller.php line: 119 search_controller_logout_successful = "" ; -; search_controller.php line: 369 +; search_controller.php line: 391 search_controller_cached_version = "" ; ; settings_controller.php line: 134 @@ -256,7 +256,7 @@ crawlstatus_view_previous_crawls = "" crawlstatus_view_description = "" ; ; crawlstatus_view.php line: 113 -crawlstatus_view_time_started = "" +crawlstatus_view_timestamp = "" ; ; crawlstatus_view.php line: 114 crawlstatus_view_url_counts = "" @@ -264,19 +264,19 @@ crawlstatus_view_url_counts = "" ; crawlstatus_view.php line: 115 crawlstatus_view_actions = "" ; -; crawlstatus_view.php line: 126 +; crawlstatus_view.php line: 128 crawlstatus_view_resume = "" ; -; crawlstatus_view.php line: 132 +; crawlstatus_view.php line: 134 crawlstatus_view_set_index = "" ; -; crawlstatus_view.php line: 135 +; crawlstatus_view.php line: 137 crawlstatus_view_search_index = "" ; -; crawlstatus_view.php line: 142 +; crawlstatus_view.php line: 144 crawlstatus_view_delete = "" ; -; crawlstatus_view.php line: 149 +; crawlstatus_view.php line: 151 crawlstatus_view_no_previous_crawl = "" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements @@ -576,25 +576,25 @@ search_view_calculated = "" ; search_view.php line: 107 search_view_results = "" ; -; search_view.php line: 128 +; search_view.php line: 132 search_view_rank = "" ; -; search_view.php line: 130 +; search_view.php line: 136 search_view_relevancy = "" ; -; search_view.php line: 133 +; search_view.php line: 140 search_view_score = "" ; -; search_view.php line: 144 +; search_view.php line: 151 search_view_cache = "" ; -; search_view.php line: 147 +; search_view.php line: 154 search_view_as_text = "" ; -; search_view.php line: 153 +; search_view.php line: 160 search_view_similar = "" ; -; search_view.php line: 157 +; search_view.php line: 164 search_view_inlink = "" ; ; settings_view.php line: 76 diff --git a/locale/zh-CN/configure.ini b/locale/zh-CN/configure.ini index 7b9eb7f87..a99e0cdae 100755 --- a/locale/zh-CN/configure.ini +++ b/locale/zh-CN/configure.ini @@ -199,7 +199,7 @@ admin_controller_describe_robot = "" ; search_controller.php line: 119 search_controller_logout_successful = "" ; -; search_controller.php line: 369 +; search_controller.php line: 391 search_controller_cached_version = "" ; ; settings_controller.php line: 134 @@ -256,7 +256,7 @@ crawlstatus_view_previous_crawls = "" crawlstatus_view_description = "" ; ; crawlstatus_view.php line: 113 -crawlstatus_view_time_started = "" +crawlstatus_view_timestamp = "" ; ; crawlstatus_view.php line: 114 crawlstatus_view_url_counts = "" @@ -264,19 +264,19 @@ crawlstatus_view_url_counts = "" ; crawlstatus_view.php line: 115 crawlstatus_view_actions = "" ; -; crawlstatus_view.php line: 126 +; crawlstatus_view.php line: 128 crawlstatus_view_resume = "" ; -; crawlstatus_view.php line: 132 +; crawlstatus_view.php line: 134 crawlstatus_view_set_index = "" ; -; crawlstatus_view.php line: 135 +; crawlstatus_view.php line: 137 crawlstatus_view_search_index = "" ; -; crawlstatus_view.php line: 142 +; crawlstatus_view.php line: 144 crawlstatus_view_delete = "" ; -; crawlstatus_view.php line: 149 +; crawlstatus_view.php line: 151 crawlstatus_view_no_previous_crawl = "" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements @@ -576,25 +576,25 @@ search_view_calculated = "計算 %s S" ; search_view.php line: 107 search_view_results = "結果" ; -; search_view.php line: 128 +; search_view.php line: 132 search_view_rank = "排名: %s" ; -; search_view.php line: 130 +; search_view.php line: 136 search_view_relevancy = "" ; -; search_view.php line: 133 +; search_view.php line: 140 search_view_score = "分數" ; -; search_view.php line: 144 +; search_view.php line: 151 search_view_cache = "" ; -; search_view.php line: 147 +; search_view.php line: 154 search_view_as_text = "" ; -; search_view.php line: 153 +; search_view.php line: 160 search_view_similar = "" ; -; search_view.php line: 157 +; search_view.php line: 164 search_view_inlink = "" ; ; settings_view.php line: 76 diff --git a/models/phrase_model.php b/models/phrase_model.php index 5cf646d6d..84b732abb 100755 --- a/models/phrase_model.php +++ b/models/phrase_model.php @@ -137,6 +137,28 @@ class PhraseModel extends Model } + function lookupSummaryOffset($url) + { + $index_archive_name = self::index_data_base_name . $this->index_name; + $index_archive = new IndexArchiveBundle( + CRAWL_DIR.'/cache/'.$index_archive_name); + $word_iterator = + new WordIterator(crawlHash("info:$url"), $index_archive, 0); + $num_retrieved = 0; + $pages = array(); + $summary_offset = NULL; + while(is_array($next_docs = $word_iterator->nextDocsWithWord()) && + $num_retrieved < 1) { + foreach($next_docs as $doc_key => $doc_info) { + $summary_offset = & $doc_info[CrawlConstants::SUMMARY_OFFSET]; + $num_retrieved++; + if($num_retrieved >= 1) { + break 2; + } + } + } + return $summary_offset; + } function parseWordStructConjunctiveQuery($phrase) { diff --git a/views/crawlstatus_view.php b/views/crawlstatus_view.php index 452c5e8f7..8222fa283 100755 --- a/views/crawlstatus_view.php +++ b/views/crawlstatus_view.php @@ -111,14 +111,16 @@ class CrawlstatusView extends View <table class="crawlstable"> <tr><th><?php e(tl('crawlstatus_view_description'));?></th><th><?php - e(tl('crawlstatus_view_time_started')); ?></th> + e(tl('crawlstatus_view_timestamp')); ?></th> <th><?php e(tl('crawlstatus_view_url_counts'));?></th> <th colspan="3"><?php e(tl('crawlstatus_view_actions'));?></th></tr> <?php foreach($data['RECENT_CRAWLS'] as $crawl) { ?> - <tr><td><b><?php e($crawl['DESCRIPTION']); ?></b></td><td> <?php - e(date("r", $crawl['CRAWL_TIME'])); ?></td> + <tr><td><b><?php e($crawl['DESCRIPTION']); ?></b></td><td><?php + e("<b>{$crawl['CRAWL_TIME']}</b><br />"); + e("<small>".date("r", $crawl['CRAWL_TIME']). + "</small>"); ?></td> <td> <?php e( (isset($crawl["VISITED_URLS_COUNT"]) ? $crawl['VISITED_URLS_COUNT'] : 0) ."/". $crawl['COUNT']); ?></td>