加上如果搜尋機制失敗時，再回頭用資料包機制

ronnywang · Apr 23, 2013 · 872432c · 872432c
1 parent b9ec378
commit 872432c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/common.js b/common.js
@@ -136,15 +136,15 @@ var search_package_by_name = function(name, cb, checker){
     });
 };
 
-var search_package_by_name_api = function(name, url, cb){
+var search_package_by_name_api = function(name, url, cb, failed_cb){
     get_choosed_packages(function(choosed_packages){
         var packages = [];
         for (var id in choosed_packages) {
             packages.push(id);
         }
         $.get('http://jobhelper.g0v.ronny.tw/api/search?name=' + encodeURIComponent(name) + '&url=' + encodeURIComponent(url) + '&packages=' + encodeURIComponent(packages.join(',')), function(ret){
             if (ret.error) {
-                console.log('Error: ' + ret.message);
+                failed_cb(ret.message);
                 return;
             }
             var d;

diff --git a/contentscript.js b/contentscript.js
@@ -150,12 +150,17 @@ var main = function(){
     var params = get_company_info();
 
     if ('object' == typeof(params) && 'undefined' !== typeof(params.name)) {
-        //search_package_by_name(params.name, function(package_id, rows){
         search_package_by_name_api(params.name, params.link, function(package_id, rows){
             get_package_info(function(package_info){
                 chrome.extension.sendRequest({method: 'add_match', rows: rows, package_info: get_package_info_by_id(package_info, package_id)}, function(response) {});
             });
-        }, check_name);
+        }, function(error_message){
+            search_package_by_name(params.name, function(package_id, rows){
+                get_package_info(function(package_info){
+                    chrome.extension.sendRequest({method: 'add_match', rows: rows, package_info: get_package_info_by_id(package_info, package_id)}, function(response) {});
+                });
+            }, check_name);
+        });
     }
 };