Updated tipue_search in pelican-bootstrap3 to v5

1 files changed, 197 insertions, 117 deletions

diff --git a/pelican-bootstrap3/static/tipuesearch/tipuesearch.js b/pelican-bootstrap3/static/tipuesearch/tipuesearch.js
index 39dfbf6..60e5281 100644
--- a/pelican-bootstrap3/static/tipuesearch/tipuesearch.js
+++ b/pelican-bootstrap3/static/tipuesearch/tipuesearch.js
@@ -1,7 +1,7 @@
 
 /*
-Tipue Search 4.0
-Copyright (c) 2014 Tipue
+Tipue Search 5.0
+Copyright (c) 2015 Tipue
 Tipue Search is released under the MIT License
 http://www.tipue.com/search
 */
@@ -12,10 +12,11 @@ http://www.tipue.com/search
      $.fn.tipuesearch = function(options) {
 
           var set = $.extend( {
-
+          
                'show'                   : 7,
                'newWindow'              : false,
                'showURL'                : true,
+               'showTitleCount'         : true,
                'minimumLength'          : 3,
                'descriptiveWords'       : 25,
                'highlightTerms'         : true,
@@ -23,10 +24,11 @@ http://www.tipue.com/search
                'mode'                   : 'static',
                'liveDescription'        : '*',
                'liveContent'            : '*',
-               'contentLocation'        : 'tipuesearch/tipuesearch_content.json'
-
+               'contentLocation'        : 'tipuesearch/tipuesearch_content.json',
+               'debug'                  : false
+          
           }, options);
-
+          
           return this.each(function() {
 
                var tipuesearch_in = {
@@ -35,19 +37,20 @@ http://www.tipue.com/search
                $.ajaxSetup({
                     async: false
                });
+               var tipuesearch_t_c = 0;
 
                if (set.mode == 'live')
                {
                     for (var i = 0; i < tipuesearch_pages.length; i++)
                     {
-                         $.get(tipuesearch_pages[i], '',
-                              function (html)
+                         $.get(tipuesearch_pages[i])
+                              .done(function(html)
                               {
                                    var cont = $(set.liveContent, html).text();
                                    cont = cont.replace(/\s+/g, ' ');
                                    var desc = $(set.liveDescription, html).text();
                                    desc = desc.replace(/\s+/g, ' ');
-
+                                                                      
                                    var t_1 = html.toLowerCase().indexOf('<title>');
                                    var t_2 = html.toLowerCase().indexOf('</title>', t_1 + 7);
                                    if (t_1 != -1 && t_2 != -1)
@@ -56,39 +59,38 @@ http://www.tipue.com/search
                                    }
                                    else
                                    {
-                                        var tit = 'No title';
+                                        var tit = tipuesearch_string_1;
                                    }
 
-                                   tipuesearch_in.pages.push({
+                                   tipuesearch_in.pages.push(
+                                   {
                                         "title": tit,
                                         "text": desc,
                                         "tags": cont,
-                                        "loc": tipuesearch_pages[i]
-                                   });
-                              }
-                         );
+                                        "url": tipuesearch_pages[i] 
+                                   });    
+                              });
                     }
                }
-
+               
                if (set.mode == 'json')
                {
-                    $.getJSON(set.contentLocation,
-                         function(json)
+                    $.getJSON(set.contentLocation)
+                         .done(function(json)
                          {
                               tipuesearch_in = $.extend({}, json);
-                         }
-                    );
+                         });
                }
 
                if (set.mode == 'static')
                {
                     tipuesearch_in = $.extend({}, tipuesearch);
-               }
-
+               }                              
+               
                var tipue_search_w = '';
                if (set.newWindow)
                {
-                    tipue_search_w = ' target="_blank"';
+                    tipue_search_w = ' target="_blank"';      
                }
 
                function getURLP(name)
@@ -99,8 +101,8 @@ http://www.tipue.com/search
                {
                     $('#tipue_search_input').val(getURLP('q'));
                     getTipueSearch(0, true);
-               }
-
+               }               
+               
                $(this).keyup(function(event)
                {
                     if(event.keyCode == '13')
@@ -108,26 +110,30 @@ http://www.tipue.com/search
                          getTipueSearch(0, true);
                     }
                });
+               
 
                function getTipueSearch(start, replace)
                {
                     $('#tipue_search_content').hide();
+                    $('#tipue_search_content').html('<div class="tipue_search_spinner"><div class="tipue_search_rect1"></div><div class="tipue_search_rect2"></div><div class="rect3"></div></div>');
+                    $('#tipue_search_content').show();
+                    
                     var out = '';
                     var results = '';
                     var show_replace = false;
                     var show_stop = false;
                     var standard = true;
                     var c = 0;
-                    found = new Array();
-
+                    found = [];
+                    
                     var d = $('#tipue_search_input').val().toLowerCase();
                     d = $.trim(d);
-
+                    
                     if ((d.match("^\"") && d.match("\"$")) || (d.match("^'") && d.match("'$")))
                     {
                          standard = false;
                     }
-
+                    
                     if (standard)
                     {
                          var d_w = d.split(' ');
@@ -140,7 +146,7 @@ http://www.tipue.com/search
                                    if (d_w[i] == tipuesearch_stop_words[f])
                                    {
                                         a_w = false;
-                                        show_stop = true;
+                                        show_stop = true;          
                                    }
                               }
                               if (a_w)
@@ -155,7 +161,7 @@ http://www.tipue.com/search
                     {
                          d = d.substring(1, d.length - 1);
                     }
-
+               
                     if (d.length >= set.minimumLength)
                     {
                          if (standard)
@@ -175,8 +181,8 @@ http://www.tipue.com/search
                                         }
                                    }
                                    d_w = d.split(' ');
-                              }
-
+                              }                   
+                    
                               var d_t = d;
                               for (var i = 0; i < d_w.length; i++)
                               {
@@ -192,23 +198,25 @@ http://www.tipue.com/search
 
                               for (var i = 0; i < tipuesearch_in.pages.length; i++)
                               {
-                                   var score = 1000000000;
+                                   var score = 0;
                                    var s_t = tipuesearch_in.pages[i].text;
                                    for (var f = 0; f < d_w.length; f++)
                                    {
-                                        var pat = new RegExp(d_w[f], 'i');
+                                        var pat = new RegExp(d_w[f], 'gi');
                                         if (tipuesearch_in.pages[i].title.search(pat) != -1)
                                         {
-                                             score -= (200000 - i);
+                                             var m_c = tipuesearch_in.pages[i].title.match(pat).length;
+                                             score += (20 * m_c);
                                         }
                                         if (tipuesearch_in.pages[i].text.search(pat) != -1)
                                         {
-                                             score -= (150000 - i);
+                                             var m_c = tipuesearch_in.pages[i].text.match(pat).length;
+                                             score += (20 * m_c);
                                         }
-
+                                        
                                         if (set.highlightTerms)
                                         {
-                                             if (set.highlightEveryTerm)
+                                             if (set.highlightEveryTerm) 
                                              {
                                                   var patr = new RegExp('(' + d_w[f] + ')', 'gi');
                                              }
@@ -218,24 +226,49 @@ http://www.tipue.com/search
                                              }
                                              s_t = s_t.replace(patr, "<span class=\"h01\">$1</span>");
                                         }
+                                        
                                         if (tipuesearch_in.pages[i].tags.search(pat) != -1)
                                         {
-                                             score -= (100000 - i);
+                                             var m_c = tipuesearch_in.pages[i].tags.match(pat).length;
+                                             score += (10 * m_c);
                                         }
 
-                                        if (d_w[f].match("^-"))
+                                        if (tipuesearch_in.pages[i].url.search(pat) != -1)
+                                        {
+                                             score += 20;
+                                        }
+                                        
+                                        if (score != 0)
+                                        {
+                                             for (var e = 0; e < tipuesearch_weight.weight.length; e++)
+                                             {
+                                                  if (tipuesearch_in.pages[i].url == tipuesearch_weight.weight[e].url)
+                                                  {
+                                                       score += tipuesearch_weight.weight[e].score;
+                                                  }
+                                             }
+                                        }
+                                        
+                                        if (d_w[f].match('^-'))
                                         {
                                              pat = new RegExp(d_w[f].substring(1), 'i');
                                              if (tipuesearch_in.pages[i].title.search(pat) != -1 || tipuesearch_in.pages[i].text.search(pat) != -1 || tipuesearch_in.pages[i].tags.search(pat) != -1)
                                              {
-                                                  score = 1000000000;
-                                             }
+                                                  score = 0;     
+                                             }    
                                         }
                                    }
-
-                                   if (score < 1000000000)
+                                   
+                                   if (score != 0)
                                    {
-                                        found[c++] = score + '^' + tipuesearch_in.pages[i].title + '^' + s_t + '^' + tipuesearch_in.pages[i].loc;
+                                        found.push(
+                                        {
+                                             "score": score,
+                                             "title": tipuesearch_in.pages[i].title,
+                                             "desc": s_t,
+                                             "url": tipuesearch_in.pages[i].url 
+                                        });
+                                        c++;                                                                   
                                    }
                               }
                          }
@@ -243,21 +276,23 @@ http://www.tipue.com/search
                          {
                               for (var i = 0; i < tipuesearch_in.pages.length; i++)
                               {
-                                   var score = 1000000000;
+                                   var score = 0;
                                    var s_t = tipuesearch_in.pages[i].text;
-                                   var pat = new RegExp(d, 'i');
+                                   var pat = new RegExp(d, 'gi');
                                    if (tipuesearch_in.pages[i].title.search(pat) != -1)
                                    {
-                                        score -= (200000 - i);
+                                        var m_c = tipuesearch_in.pages[i].title.match(pat).length;
+                                        score += (20 * m_c);
                                    }
                                    if (tipuesearch_in.pages[i].text.search(pat) != -1)
                                    {
-                                        score -= (150000 - i);
+                                        var m_c = tipuesearch_in.pages[i].text.match(pat).length;
+                                        score += (20 * m_c);
                                    }
-
+                                   
                                    if (set.highlightTerms)
                                    {
-                                        if (set.highlightEveryTerm)
+                                        if (set.highlightEveryTerm) 
                                         {
                                              var patr = new RegExp('(' + d + ')', 'gi');
                                         }
@@ -267,91 +302,135 @@ http://www.tipue.com/search
                                         }
                                         s_t = s_t.replace(patr, "<span class=\"h01\">$1</span>");
                                    }
+                                   
                                    if (tipuesearch_in.pages[i].tags.search(pat) != -1)
                                    {
-                                        score -= (100000 - i);
+                                        var m_c = tipuesearch_in.pages[i].tags.match(pat).length;
+                                        score += (10 * m_c);
                                    }
-
-                                   if (score < 1000000000)
+                              
+                                   if (tipuesearch_in.pages[i].url.search(pat) != -1)
                                    {
-                                        found[c++] = score + '^' + tipuesearch_in.pages[i].title + '^' + s_t + '^' + tipuesearch_in.pages[i].loc;
+                                        score += 20;
                                    }
+                                   
+                                   if (score != 0)
+                                   {
+                                        for (var e = 0; e < tipuesearch_weight.weight.length; e++)
+                                        {
+                                             if (tipuesearch_in.pages[i].url == tipuesearch_weight.weight[e].url)
+                                             {
+                                                  score += tipuesearch_weight.weight[e].score;
+                                             }
+                                        }
+                                   }
+                              
+                                   if (score != 0)
+                                   {
+                                        found.push(
+                                        {
+                                             "score": score,
+                                             "title": tipuesearch_in.pages[i].title,
+                                             "desc": s_t,
+                                             "url": tipuesearch_in.pages[i].url
+                                        });
+                                        c++;                                                                  
+                                   }                              
                               }
-                         }
-
+                         }                         
+                         
                          if (c != 0)
                          {
+                              if (set.showTitleCount && tipuesearch_t_c == 0)
+                              {
+                                   var title = document.title;
+                                   document.title = '(' + c + ') ' + title;
+                                   tipuesearch_t_c++;
+                              }                         
+                         
                               if (show_replace == 1)
                               {
-                                   out += '<div id="tipue_search_warning_head">Showing results for ' + d + '</div>';
-                                   out += '<div id="tipue_search_warning">Search instead for <a href="javascript:void(0)" id="tipue_search_replaced">' + d_r + '</a></div>';
+                                   out += '<div id="tipue_search_warning">' + tipuesearch_string_2 + ' ' + d + '. ' + tipuesearch_string_3 + ' <a id="tipue_search_replaced">' + d_r + '</a></div>';
                               }
                               if (c == 1)
                               {
-                                   out += '<div id="tipue_search_results_count">1 result</div>';
+                                   out += '<div id="tipue_search_results_count">' + tipuesearch_string_4 + '</div>';
                               }
                               else
                               {
                                    c_c = c.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
-                                   out += '<div id="tipue_search_results_count">' + c_c + ' results</div>';
+                                   out += '<div id="tipue_search_results_count">' + c_c + ' ' + tipuesearch_string_5 + '</div>';
                               }
-
-                              found.sort();
+                              
+                              found.sort(function(a, b) { return b.score - a.score } );
+                              
                               var l_o = 0;
                               for (var i = 0; i < found.length; i++)
                               {
-                                   var fo = found[i].split('^');
                                    if (l_o >= start && l_o < set.show + start)
-                                   {
-                                        out += '<div class="tipue_search_content_title"><a href="' + fo[3] + '"' + tipue_search_w + '>' +  fo[1] + '</a></div>';
-
-                                        if (set.showURL)
-                                        {
-                                             out += '<div class="tipue_search_content_url"><a href="' + fo[3] + '"' + tipue_search_w + '>' + fo[3] + '</a></div>';
+                                   {                                   
+                                        out += '<div class="tipue_search_content_title"><a href="' + found[i].url + '"' + tipue_search_w + '>' +  found[i].title + '</a></div>';
+ 
+                                        if (set.debug)
+                                        {                                             
+                                             out += '<div class="tipue_search_content_debug">Score: ' + found[i].score + '</div>';
                                         }
-
-                                        var t = fo[2];
-                                        var t_d = '';
-                                        var t_w = t.split(' ');
-                                        if (t_w.length < set.descriptiveWords)
+                                        
+                                        if (set.showURL)
                                         {
-                                             t_d = t;
+                                             var s_u = found[i].url.toLowerCase();
+                                             if(s_u.indexOf('http://') == 0)
+                                             {
+                                                  s_u = s_u.slice(7);
+                                             }                                             
+                                             out += '<div class="tipue_search_content_url"><a href="' + found[i].url + '"' + tipue_search_w + '>' + s_u + '</a></div>';
                                         }
-                                        else
-                                        {
-                                             for (var f = 0; f < set.descriptiveWords; f++)
+                                        
+                                        if (found[i].desc)
+                                        {                                        
+                                             var t = found[i].desc;
+                                             var t_d = '';
+                                             var t_w = t.split(' ');
+                                             if (t_w.length < set.descriptiveWords)
                                              {
-                                                  t_d += t_w[f] + ' ';
+                                                  t_d = t;
                                              }
+                                             else
+                                             {
+                                                  for (var f = 0; f < set.descriptiveWords; f++)
+                                                  {
+                                                       t_d += t_w[f] + ' '; 	
+                                                  }
+                                             }
+                                             t_d = $.trim(t_d);
+                                             if (t_d.charAt(t_d.length - 1) != '.')
+                                             {
+                                                  t_d += ' ...';
+                                             }
+                                             out += '<div class="tipue_search_content_text">' + t_d + '</div>';
                                         }
-                                        t_d = $.trim(t_d);
-                                        if (t_d.charAt(t_d.length - 1) != '.')
-                                        {
-                                             t_d += ' ...';
-                                        }
-                                        out += '<div class="tipue_search_content_text">' + t_d + '</div>';
                                    }
-                                   l_o++;
+                                   l_o++;     
                               }
-
+                              
                               if (c > set.show)
                               {
                                    var pages = Math.ceil(c / set.show);
                                    var page = (start / set.show);
                                    out += '<div id="tipue_search_foot"><ul id="tipue_search_foot_boxes">';
-
+                                   
                                    if (start > 0)
                                    {
-                                       out += '<li><a href="javascript:void(0)" class="tipue_search_foot_box" id="' + (start - set.show) + '_' + replace + '">Prev</a></li>';
+                                       out += '<li><a class="tipue_search_foot_box" id="' + (start - set.show) + '_' + replace + '">' + tipuesearch_string_6 + '</a></li>'; 
                                    }
-
+                                                       
                                    if (page <= 2)
                                    {
                                         var p_b = pages;
                                         if (pages > 3)
                                         {
                                              p_b = 3;
-                                        }
+                                        }                    
                                         for (var f = 0; f < p_b; f++)
                                         {
                                              if (f == page)
@@ -360,7 +439,7 @@ http://www.tipue.com/search
                                              }
                                              else
                                              {
-                                                  out += '<li><a href="javascript:void(0)" class="tipue_search_foot_box" id="' + (f * set.show) + '_' + replace + '">' + (f + 1) + '</a></li>';
+                                                  out += '<li><a class="tipue_search_foot_box" id="' + (f * set.show) + '_' + replace + '">' + (f + 1) + '</a></li>';
                                              }
                                         }
                                    }
@@ -369,7 +448,7 @@ http://www.tipue.com/search
                                         var p_b = page + 2;
                                         if (p_b > pages)
                                         {
-                                             p_b = pages;
+                                             p_b = pages; 
                                         }
                                         for (var f = page - 1; f < p_b; f++)
                                         {
@@ -379,62 +458,63 @@ http://www.tipue.com/search
                                              }
                                              else
                                              {
-                                                  out += '<li><a href="javascript:void(0)" class="tipue_search_foot_box" id="' + (f * set.show) + '_' + replace + '">' + (f + 1) + '</a></li>';
+                                                  out += '<li><a class="tipue_search_foot_box" id="' + (f * set.show) + '_' + replace + '">' + (f + 1) + '</a></li>';
                                              }
                                         }
-                                   }
-
+                                   }                         
+                                                      
                                    if (page + 1 != pages)
                                    {
-                                       out += '<li><a href="javascript:void(0)" class="tipue_search_foot_box" id="' + (start + set.show) + '_' + replace + '">Next</a></li>';
-                                   }
-
+                                       out += '<li><a class="tipue_search_foot_box" id="' + (start + set.show) + '_' + replace + '">' + tipuesearch_string_7 + '</a></li>'; 
+                                   }                    
+                                   
                                    out += '</ul></div>';
-                              }
+                              }                        
                          }
                          else
                          {
-                              out += '<div id="tipue_search_warning_head">Nothing found</div>';
+                              out += '<div id="tipue_search_warning">' + tipuesearch_string_8 + '</div>'; 
                          }
                     }
                     else
                     {
                          if (show_stop)
                          {
-                              out += '<div id="tipue_search_warning_head">Nothing found</div><div id="tipue_search_warning">Common words are largely ignored</div>';
+                              out += '<div id="tipue_search_warning">' + tipuesearch_string_8 + '. ' + tipuesearch_string_9 + '</div>';     
                          }
                          else
                          {
-                              out += '<div id="tipue_search_warning_head">Search too short</div>';
+                              out += '<div id="tipue_search_warning">' + tipuesearch_string_10 + '</div>';
                               if (set.minimumLength == 1)
                               {
-                                   out += '<div id="tipue_search_warning">Should be one character or more</div>';
+                                   out += '<div id="tipue_search_warning">' + tipuesearch_string_11 + '</div>';
                               }
                               else
                               {
-                                   out += '<div id="tipue_search_warning">Should be ' + set.minimumLength + ' characters or more</div>';
+                                   out += '<div id="tipue_search_warning">' + tipuesearch_string_12 + ' ' + set.minimumLength + ' ' + tipuesearch_string_13 + '</div>';
                               }
                          }
-                    }
-
+                    }                
+                    
+                    $('#tipue_search_content').hide();
                     $('#tipue_search_content').html(out);
                     $('#tipue_search_content').slideDown(200);
-
+                    
                     $('#tipue_search_replaced').click(function()
                     {
                          getTipueSearch(0, false);
-                    });
-
+                    });                
+               
                     $('.tipue_search_foot_box').click(function()
                     {
                          var id_v = $(this).attr('id');
                          var id_a = id_v.split('_');
-
+                    
                          getTipueSearch(parseInt(id_a[0]), id_a[1]);
-                    });
-               }
-
+                    });                                                       
+               }          
+          
           });
      };
-
+   
 })(jQuery);