Changeset 28161 for extensions/rv_autocomplete

Timestamp:

Apr 12, 2014, 8:13:46 PM (10 years ago)

Author:

rvelices

Message:

autocomplete fixes for custom suggestions and variants

Location:

extensions/rv_autocomplete

Files:

• admin/functions.inc.php (modified) (6 diffs)
• functions.inc.php (modified) (4 diffs)

extensions/rv_autocomplete/admin/functions.inc.php

@@ -22 +22 @@
                         $q = substr($q, 0, $pos);
                 }
+                $invalid = '&()".:;,';
+                $q = strtr($q, $invalid, str_repeat(' ', strlen($invalid)));
+                for($i=0; $i<3; $i++)
+                        $q = str_replace('  ', ' ', $q);
         }
         elseif (strncmp($url,'q=',2)==0)
@@ -35 +39 @@
         if (isset($q))
         {
-                if ( ($pos=strpos($q,' ')) !== false )
-                {
-                        $q = '"'.$q.'"';
-                }
                 $url = get_root_url().'qsearch.php?q='.rawurlencode($q);
         }
@@ -198 +198 @@
                         $results = $rule['out'];
                         $processed = array();
+                        if ('a' == $rule['type'])
+                                $processed[$in_word_t] = 1;
+
                         for ($i=0; $i<count($results); $i++)
                         {
@@ -247 +250 @@
                 file_put_contents($file, $save);
         }
-        @file_put_contents($file.'.txt', var_export($res,true) );
+        $file=PHPWG_ROOT_PATH.$conf['data_location'].'tmp/autocomplete_variants.txt';
+        if ($fh = @fopen($file, 'w'))
+        {
+                fputcsv($fh, array("Type", "In", "Out"), "\t");
+                foreach($rmap as $in => $words)
+                        fputcsv($fh, array("r", $in, implode(',', $words)), "\t");
+                foreach($amap as $in => $words)
+                        fputcsv($fh, array("r", $in, implode(',', $words)), "\t");
+                fclose($fh);
+        }
 }
 
@@ -282 +294 @@
         sort($in_trans);
         $key = implode(',', $in_trans);
-        if (strlen($key)>16)
+        if (strlen($key)>24)
                 $key = md5($key);
 
@@ -308 +320 @@
         );
         if (!empty($params['comment']))
-                $rule['comment'] = $params['comment'];
+                $rule['comment'] = stripslashes($params['comment']);
         $rules[$key] = $rule;
 

extensions/rv_autocomplete/functions.inc.php

@@ -37 +37 @@
 function rvac_normalize($name)
 {
-        $invalid = '&().,-';
+        $invalid = '&()".,:;-';
         $name = strtr($name, $invalid, str_repeat(' ', strlen($invalid)));
         $name = transliterate($name);
@@ -238 +238 @@
                 }
 
-                $in_list = $processed = array();
+                $processed = array();
                 for ($i=0; $i<count($all); $i++)
                 {
@@ -244 +244 @@
                         $in_t = transliterate($in);
 
-                        if (isset($in_list[$in_t]))
+                        if (isset($processed[$in_t]))
                         {
                                 array_splice($all, $i, 1);
@@ -250 +250 @@
                                 continue;
                         }
-
-                        if (isset($processed[$in_t]))
-                                continue;
                         $processed[$in_t] = 1;
 
                         if (isset($amap[$in_t]))
                         {
-                                array_splice($all, $i, 0, $amap[$in_t]);
+                                $all = array_merge($all, $amap[$in_t]);
                         }
                 }