Changeset 22304 for extensions/rv_autocomplete

Timestamp:

Apr 20, 2013, 6:49:01 AM (11 years ago)

Author:

rvelices

Message:

 

Location:

extensions/rv_autocomplete

Files:

• context_suggest.php (modified) (2 diffs)
• res/suggest-core.js (modified) (3 diffs)
• suggestions.php (modified) (2 diffs)

extensions/rv_autocomplete/context_suggest.php

@@ -48 +48 @@
 });
 
+// remove non filtering tags
+$max = intval(0.9*count($context_image_ids));
+while( count($tags) && $tags[0]['counter'] >= $max)
+        array_shift($tags);
+$tags = trigger_event('rvac_filter_context_tags', $tags);
+
 $suggestions = array();
 foreach($tags as $tag)
 {
-        if ($tag['counter']==count($context_image_ids))
-                continue;
         $label = $tag['name'];
 
@@ -97 +101 @@
 })';
 
+header("Content-Type: application/javascript; charset=".get_pwg_charset());
+$expires = time() + 300;
+header("Pragma:");
+header("Cache-control: private, max-age=300");
+header('Expires: '.gmdate('D, d M Y H:i:s', $expires).' GMT');
+
 echo $js;
 

extensions/rv_autocomplete/res/suggest-core.js

@@ -119 +119 @@
                 inew++;
         }
-        
+
         var inp = $("#qsearchInput");
         if (data.length && inp.is(":focus")) {
@@ -191 +191 @@
                 }
 
-                if (res.length > RVAC.suggestions) {//try filter
-                        // compute number of matched "words" or "expressions"
-                        found={};
-                        var foundWords=0, word;
-                        for (i=0; i<res.length; i++) {
-                                word = res[i]._matchWord = ac_match_word( res[i], this.options.rv.q );
-                                if (!found.hasOwnProperty(word)) {
-                                        foundWords++;
-                                        found[word]=1;
-                                        if (foundWords == RVAC.maxSuggestions)
-                                                res = res.slice(0, i+1);
-                                }
-                                else
-                                        found[word]++;
-                        }
-
-                        if (foundWords==1)
-                                res = res.slice(0, RVAC.maxSuggestions);
-                        else if (foundWords > RVAC.suggestions) {
-                                for (i=1; i<foundWords; i++) {
-                                        word = res[i]._matchWord;
-                                        if ( found[word] > 1 ) {
-                                                for (j=i-1; j>=0; j--) {
-                                                        if (res[j]._matchWord == word) {
-                                                                res.splice(i--, 1);
-                                                                found[word]--;
-                                                                break;
-                                                        }
+                // compute number of matched "words" or "expressions"
+                found={};
+                var foundWords=0, word;
+                for (i=0; i<res.length; i++) {
+                        word = res[i]._matchWord = ac_match_word( res[i], this.options.rv.q );
+                        if (!found.hasOwnProperty(word)) {
+                                foundWords++;
+                                found[word]=1;
+                                if (foundWords == RVAC.maxSuggestions)
+                                        res = res.slice(0, i+1);
+                        }
+                        else
+                                found[word]++;
+                }
+
+                if (foundWords==1)
+                        res = res.slice(0, RVAC.maxSuggestions);
+                else if (foundWords > RVAC.suggestions) {
+                        for (i=1; i<foundWords; i++) {
+                                word = res[i]._matchWord;
+                                if ( found[word] > 1 ) {
+                                        for (j=i-1; j>=0; j--) {
+                                                if (res[j]._matchWord == word) {
+                                                        res.splice(i--, 1);
+                                                        found[word]--;
+                                                        break;
                                                 }
                                         }
                                 }
-                                res = res.slice(0, foundWords);
-                        }
-                        else {
-                                for (i=res.length-1; i>=0 && res.length > RVAC.suggestions; i--) {
-                                        word = res[i]._matchWord;
-                                        for (j=i-1; j>=0; j--) {
-                                                        if (res[j]._matchWord == word) {
-                                                                res.splice(i, 1);
-                                                                break;
-                                                        }
-                                        }
-                                }
-                        }
-                }
-
-                var that = this;
+                        }
+                        res = res.slice(0, foundWords);
+                }
+                else {
+                        for (i=res.length-1; i>=0 && res.length > RVAC.suggestions; i--) {
+                                word = res[i]._matchWord;
+                                for (j=i-1; j>=0; j--) {
+                                                if (res[j]._matchWord == word) {
+                                                        res.splice(i, 1);
+                                                        break;
+                                                }
+                                }
+                        }
+                }
+
+                // check for multi tags
                 if (!RVAC.requestingContexts && this.options.rv.q.length > 1) {
                         var eligible = $.grep( res, function(item) {
                                 if (item._matchIdx > 0
-                                        || item.w <= 25
+                                        || item.w <= RVAC.minWeightForContextTrigger
                                         || item.value === -1
                                         || item.value[0]!="$" || item.value[1]!="t")
@@ -247 +245 @@
                                 if (RVAC.requestedContexts.hasOwnProperty(item.value))
                                         return 0;
-                                if (item.q.length - that.options.rv.q.length > 3)
-                                        return 0;
                                 return 1;
                         } );
+
+                        if (eligible.length==1) {
+                                if (res.length > RVAC.suggestions || foundWords>1) {
+                                        if (this.options.rv.q.length <= eligible[0].q.length/2 )
+                                                eligible.length = 0;
+                                }
+                        }
+                        else {
+                                for (i=0; i<eligible.length; i++)
+                                        if (this.options.rv.q.length == eligible[i].q.length) {
+                                                eligible = [ eligible[i] ];
+                                                break;
+                                        }
+
+                                if (eligible.length > 1)
+                                        eligible.length = 0;
+                        }
 
                         if (eligible.length) {

extensions/rv_autocomplete/suggestions.php

@@ -5 +5 @@
 
 if (!defined('RVAC_ID')) {
-  set_status_header(501);
-  exit;
+        set_status_header(501);
+        exit;
 }
 
@@ -16 +16 @@
 
 if (isset($_GET['txt'])) {
-  foreach($data['src'] as $item)
-    echo implode("\t", $item)."\n";
-  exit;
+        foreach($data['src'] as $item)
+                echo implode("\t", $item)."\n";
+        exit;
 }
 
 
 $ds = str_replace(
-  array('\\/', '"q":', '"label":', '"value":', '"w":'),
-  array('/', 'q:', 'label:', 'value:', 'w:'),
-  json_encode($data['src']));
+        array('\\/', '"q":', '"label":', '"value":', '"w":'),
+        array('/', 'q:', 'label:', 'value:', 'w:'),
+        json_encode($data['src']));
 $js = '$.extend(RVAC, {
-  dataSource:'.$ds.',
-  dataSourceAltLangIndex: '.$data['altLangIndex'].',
-  roots: '.json_encode($data['roots']).',
-  minForAltLang: 2,
-  stopLookingAfter: 100,
-  suggestions: 5,
-  maxSuggestions: 10
+        dataSource:'.$ds.',
+        dataSourceAltLangIndex: '.$data['altLangIndex'].',
+        roots: '.json_encode($data['roots']).',
+        minForAltLang: 2,
+        stopLookingAfter: 80,
+        suggestions: 4,
+        maxSuggestions: 8,
+        minWeightForContextTrigger: 25
 });
 $.each(RVAC.dataSource, function(i,item) {
-  item.q = item.q || item.label.toLowerCase()
+        item.q = item.q || item.label.toLowerCase()
 });
 RVAC.start && RVAC.start();';
 
+header("Content-Type: application/javascript; charset=".get_pwg_charset());
 echo $js;