Changeset 2148:621d4c6f4e8c

Timestamp:

09/29/13 01:16:03 (11 years ago)

Author:

Denis Jean-Chirstian <contact@…>

Branch:

dcRepo

Message:

Better repository search engine (and other stuff)

Location:

inc

Files:

• admin/lib.moduleslist.php (modified) (4 diffs)
• core/class.dc.repository.php (modified) (2 diffs)

inc/admin/lib.moduleslist.php

@@ -115 +115 @@
      public function displayNavMenu()
      {
-          if (empty($this->modules)) {
+          if (empty($this->modules) || $this->getSearchQuery() !== null) {
                return $this;
           }
@@ -222 +222 @@
      }
 
+     public static function isDistributedModule($module)
+     {
+          return in_array($module, array(
+               'aboutConfig',
+               'akismet',
+               'antispam',
+               'attachments',
+               'blogroll',
+               'blowupConfig',
+               'daInstaller',
+               'fairTrackbacks',
+               'importExport',
+               'maintenance',
+               'pages',
+               'pings',
+               'simpleMenu',
+               'tags',
+               'themeEditor',
+               'userPref',
+               'widgets'
+          ));
+     }
+
      public static function sortModules($modules, $field, $asc=true)
      {
@@ -270 +293 @@
 
           # Sort modules by id
-          $modules = self::sortModules($this->modules, $sort_field, $this->sort_asc);
+          $modules = $this->getSearchQuery() === null ?
+               self::sortModules($this->modules, $sort_field, $this->sort_asc) :
+               $this->modules;
 
           $count = 0;
@@ -303 +328 @@
                }
 
-               if (in_array('old_version', $cols)) {
+               if (in_array('current_version', $cols)) {
                     echo 
-                    '<td class="nowrap count">'.html::escapeHTML($module['old_version']).'</td>';
+                    '<td class="nowrap count">'.html::escapeHTML($module['current_version']).'</td>';
                }
 

inc/core/class.dc.repository.php

@@ -63 +63 @@
      }
 
-     public function search($search)
+     public function search($pattern)
      {
           $result = array();
 
-          foreach ($this->data['new'] as $module)
-          {
-               if ( preg_match('/'.$search.'/i',$module['id']) ||
-                    preg_match('/'.$search.'/i',$module['name']) ||
-                    preg_match('/'.$search.'/i',$module['desc']))
-               {
-                    $result[] = $module;
+          # Split query into small clean words
+          $patterns = explode(' ', $pattern);
+          array_walk($patterns, array('dcRepository','sanitize'));
+
+          # For each modules
+          foreach ($this->data['new'] as $id => $module) {
+
+               # Split modules infos into small clean word
+               $subjects = explode(' ', $id.' '.$module['name'].' '.$module['desc']);
+               array_walk($subjects, array('dcRepository','sanitize'));
+
+               # Check contents
+               if (!($nb = preg_match_all('/('.implode('|', $patterns).')/', implode(' ', $subjects)))) {
+                    continue;
                }
+
+               # Add module to result
+               if (!isset($sorter[$id])) {
+                    $sorter[$id] = 0;
+                    $result[$id] = $module;
+               }
+
+               # Increment matches count
+               $sorter[$id] += $nb;
+          }
+          # Sort response by matches count
+          if (!empty($result)) {
+               array_multisort($sorter, SORT_DESC, $result);
           }
           return $result;
@@ -104 +124 @@
      }
 
+     public static function sanitize(&$str, $_)
+     {
+          $str = strtolower(preg_replace('/[^A-Za-z0-9]/', '', $str));
+     }
+
      private static function compare($v1,$v2,$op)
      {