From 5f06612c9d671a61ae5f6cc6dd8b26d4d14d3485 Mon Sep 17 00:00:00 2001
From: YanshuoH <hys235606751@gmail.com>
Date: Tue, 24 Jun 2014 18:09:59 +0200
Subject: [PATCH] regenerate keywords

---
 config/routes.js      |  2 ++
 controllers/admin.js  | 16 ++++++++++++++++
 controllers/matchs.js |  8 ++++++--
 lib/utils.js          |  3 +++
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/config/routes.js b/config/routes.js
index ac7326d..11386aa 100644
--- a/config/routes.js
+++ b/config/routes.js
@@ -36,6 +36,8 @@ module.exports = function (app, passport, config) {
     app.put('/admin/actortype', admin.editActorType);
     app.delete('/admin/classification/delete/:classId', admin.deleteClassification);
     app.delete('/admin/actortype/delete/:actorId', admin.deleteActorType);
+    // update all tickets
+    app.get('/admin/tickets/update', admin.ticketUpdate);
 
     /*
      * User routes
diff --git a/controllers/admin.js b/controllers/admin.js
index 7a17767..6a573b5 100644
--- a/controllers/admin.js
+++ b/controllers/admin.js
@@ -3,6 +3,8 @@
 var utils = require('../lib/utils');
 
 var mongoose = require('mongoose');
+var NeedModel = mongoose.model('NeedModel');
+var OfferModel = mongoose.model('OfferModel');
 var ClassificationModel = mongoose.model('ClassificationModel');
 var ActorTypeModel = mongoose.model('ActorTypeModel');
 
@@ -101,3 +103,17 @@ exports.deleteActorType = function(req, res) {
         });
     });
 }
+
+exports.ticketUpdate = function(req, res) {
+    NeedModel.list({}, function(err, need_list) {
+        for (var index=0; index<need_list.length; index++) {
+            need_list[index].save();
+        }
+    });
+    OfferModel.list({}, function(err, offer_list) {
+        for (var index=0; index<offer_list.length; index++) {
+            offer_list[index].save();
+        }
+    });
+    return res.json({statuts: 'OK'});
+}
\ No newline at end of file
diff --git a/controllers/matchs.js b/controllers/matchs.js
index b6b7994..98ee2d7 100644
--- a/controllers/matchs.js
+++ b/controllers/matchs.js
@@ -112,6 +112,10 @@ exports.confirm = function(req, res) {
                 callback(null, source_ticket, target_ticket);
             });
         },
+        function(source_ticket, target_ticket, callback) {
+            return res.redirect('/' + req.body.source_type + '/' + req.body.source_id.toString());
+            callback(null, source_ticket, target_ticket);
+        },
         // update matching results
         function(source_ticket, target_ticket, callback) {
             MatchingModel.retrieveByTicketId(source_ticket._id.toString(), function(err, source_matching) {
@@ -151,7 +155,7 @@ exports.confirm = function(req, res) {
             });
         }
     ], function(err, source_ticket, target_ticket) {
-        return res.redirect('/' + req.body.source_type + '/' + req.body.source_id.toString());
+        console.log('new matching updated');
     });
 }
 
@@ -183,7 +187,7 @@ exports.matching_update = function(req, res) {
             });
         }
     });
-    res.redirect('/');
+    return res.redirect('/');
 }
 
 exports.searching = function(req, res) {
diff --git a/lib/utils.js b/lib/utils.js
index 87e27b2..77a9c79 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -222,6 +222,9 @@ exports.computekeywords = function computekeywords(text, keywords, score) {
     text = this.sanizateText(text);
     text_arr = text.split(' ');
     for (var index=0; index<text_arr.length; index++) {
+        if (text_arr[index].length === 1 || text_arr[index].length === 0) {
+            continue;
+        }
         if (this.worthlesswords.indexOf(text_arr[index]) < 0) {
             var position = this.checkExisting(text_arr[index], keywords, 'word');
             // console.log(position);