Changeset 22246 for extensions/rv_autocomplete

Timestamp:

Apr 17, 2013, 6:20:18 AM (11 years ago)

Author:

rvelices

Message:

rv_autocomplete multi tags (need refinement)

Location:

extensions/rv_autocomplete

Files:

• context_suggest.php (added)
• functions.inc.php (modified) (1 diff)
• main.inc.php (modified) (2 diffs)
• res/suggest-core.js (modified) (5 diffs)
• suggestions.php (modified) (1 diff)

extensions/rv_autocomplete/functions.inc.php

@@ -57 +57 @@
   if ($q != strtolower($l))
     $ret['q'] = $q;
+        if ($item['counter'] > 0)
+                $ret['w'] = $item['counter'];
   return $ret;
 }

extensions/rv_autocomplete/main.inc.php

@@ -45 +45 @@
   global $template;
 
-  $core_src = get_root_url().'plugins/'.RVAC_ID.'/res/suggest-core.js';
+        $plug_root = get_root_url().'plugins/'.RVAC_ID.'/';
+  $core_src = $plug_root.'res/suggest-core.js';
 
   $data_src = rvac_get_data_file();
@@ -51 +52 @@
     $data_src = get_root_url().$data_src;
   else
-    $data_src = get_root_url().'plugins/'.RVAC_ID.'/suggestions.php';
+    $data_src = $plug_root.'suggestions.php';
 
-  $fs = 'var RVAC={};
+  $fs = 'var RVAC={root:"'.$plug_root.'"};
 $("#qsearchInput").one("focus", function() {
 var s;

extensions/rv_autocomplete/res/suggest-core.js

@@ -93 +93 @@
 }
 
+RVAC.requestedContexts = {};
+RVAC.requestingContexts = 0;
+
+RVAC.mergeData = function(data) {
+        RVAC.requestingContexts--;
+        var ctxq = data.ctxq + " "
+                , ctxl = data.ctxl + " ";
+        data = data.dataSource;
+        $.each(data, function(i,item) {
+                if (item.q)
+                        item.q = ctxq + item.q;
+                else
+                        item.q = ctxq + item.label.toLowerCase();
+                item.label = ctxl + item.label;
+                item.ctx = 1;
+        });
+
+        var ids=0, inew=0;
+
+        while (inew < data.length) {
+                while (RVAC.dataSource[ids].w > data[inew].w)
+                        ids++;
+                RVAC.dataSource.splice(ids, 0, data[inew]);
+                RVAC.dataSourceAltLangIndex++;
+                inew++;
+        }
+        
+        var inp = $("#qsearchInput");
+        if (data.length && inp.is(":focus")) {
+                inp.autocomplete("search");
+        }
+};
+
 RVAC.start = function() {
 var $input = $("#qsearchInput");
@@ -124 +157 @@
                         window.location = (url + (/\?/.test(url) ?  "&" : "?") + "acs=" + term);
                 }
-                        
+
                 return false;
         },
@@ -145 +178 @@
                         var item = RVAC.dataSource[i];
                         if ( (item._matchIdx = item.q.search(matcher)) > -1 ) {
+                                if (item.ctx && item._matchIdx>0)
+                                        continue; // context searches only at beginning
                                 if (item.value !== -1) {
                                         if (found.hasOwnProperty(item.value))
@@ -157 +192 @@
 
                 if (res.length > RVAC.suggestions) {//try filter
-                        // compute number of matched "words" or "expression"
+                        // compute number of matched "words" or "expressions"
                         found={};
                         var foundWords=0, word;
@@ -202 +237 @@
                 }
 
+                var that = this;
+                if (!RVAC.requestingContexts && this.options.rv.q.length > 1) {
+                        var eligible = $.grep( res, function(item) {
+                                if (item._matchIdx > 0
+                                        || item.w <= 25
+                                        || item.value === -1
+                                        || item.value[0]!="$" || item.value[1]!="t")
+                                        return 0;
+                                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) {
+                                item = eligible[0];
+                                RVAC.requestedContexts[item.value] = 1;
+                                RVAC.requestingContexts++;
+                                var s=document.createElement("script");s.type="text/javascript";s.async=true;
+                                s.src=RVAC.root+"context_suggest.php?context="+encodeURIComponent(item.value)+"&ctxq="+encodeURIComponent(item.q)+"&ctxl="+encodeURIComponent(item.label);
+                                document.body.appendChild(s);
+                        }
+                }
+
                 response( res );
         }

extensions/rv_autocomplete/suggestions.php

@@ -23 +23 @@
 
 $ds = str_replace(
-  array('\\/', '"q":', '"label":', '"value":'),
-  array('/', 'q:', 'label:', 'value:'),
+  array('\\/', '"q":', '"label":', '"value":', '"w":'),
+  array('/', 'q:', 'label:', 'value:', 'w:'),
   json_encode($data['src']));
 $js = '$.extend(RVAC, {