Changeset 2222:30fe556de226 for inc

Timestamp:

10/03/13 00:57:41 (12 years ago)

Author:

Denis Jean-Chirstian <contact@…>

Branch:

dcRepo

Message:

Enhance repository search engine (and some fix)

Location:

inc

Files:

• admin/lib.moduleslist.php (modified) (6 diffs)
• core/class.dc.store.parser.php (modified) (1 diff)
• core/class.dc.store.php (modified) (4 diffs)
• core/class.dc.store.reader.php (modified) (1 diff)

inc/admin/lib.moduleslist.php

@@ -269 +269 @@
                     'tags'                   => '',
                     'details'                => '',
-                    'sshot'             => ''
+                    'sshot'             => '',
+                    'score'                  => 0
                ),
                # Module's values
@@ -314 +315 @@
           }
 
+          if (in_array('score', $cols) && $this->getSearchQuery() !== null && defined('DC_DEBUG') && DC_DEBUG) {
+               echo 
+               '<th class="nowrap">'.__('Score').'</th>';
+          }
+
           if (in_array('version', $cols)) {
                echo 
@@ -381 +387 @@
                     html::escapeHTML($module['name'])
                ).'</td>';
+
+               # Display score only for debug purpose
+               if (in_array('score', $cols) && $this->getSearchQuery() !== null && defined('DC_DEBUG') && DC_DEBUG) {
+                    echo 
+                    '<td class="module-version nowrap count"><span class="debug">'.$module['score'].'</span></td>';
+               }
 
                if (in_array('version', $cols)) {
@@ -863 +875 @@
                }
 
+               # Display score only for debug purpose
+               if (in_array('score', $cols) && $this->getSearchQuery() !== null && defined('DC_DEBUG') && DC_DEBUG) {
+                    $line .= 
+                    '<p class="module-score debug">'.sprintf(__('Score: %s'), $module['score']).'</p>';
+               }
+
                if (in_array('sshot', $cols)) {
                     # Screenshot from url
@@ -901 +919 @@
                }
 
+               if (in_array('current_version', $cols)) {
+                    $line .= 
+                    '<span class="module-current-version">'.sprintf(__('(current version %s)'),html::escapeHTML($module['current_version'])).'</span> ';
+               }
+
                if (in_array('parent', $cols) && $has_parent) {
                     if ($is_parent_present) {
@@ -910 +933 @@
                          '<span class="module-parent-missing">'.sprintf(__('(requires "%s")'),html::escapeHTML($parent)).'</span> ';
                     }
-               }
-
-               if (in_array('version', $cols)) {
-                    $line .= 
-                    '<span class="module-version">'.sprintf(__('version %s'),html::escapeHTML($module['version'])).'</span> ';
                }
 

inc/core/class.dc.store.parser.php

@@ -15 +15 @@
 @ingroup DC_CORE
 @brief Repository modules XML feed parser
+@since 2.6
 
 Provides an object to parse XML feed of modules from a repository.

inc/core/class.dc.store.php

@@ -15 +15 @@
 @ingroup DC_CORE
 @brief Repository modules XML feed reader
+@since 2.6
 
 Provides an object to parse XML feed of modules from repository.
@@ -24 +25 @@
      /** @var  object    dcModules instance */
      public $modules;
+
+     /** @var  array     Modules fields to search on and their weighting */
+     public static $weighting = array('id' => 10, 'name' => 8, 'author' => 6, 'tags' => 4, 'desc' => 2);
 
      /** @var  string    User agent used to query repository */
@@ -126 +130 @@
 
           # Split query into small clean words
-          $patterns = explode(' ', $pattern);
-          array_walk($patterns, array('dcStore','sanitize'));
+          if (!($patterns = self::patternize($pattern))) {
+               return $result;
+          }
 
           # 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('dcStore','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;
-               $result[$id]['accuracy'] = $sorter[$id];
+               $module['id'] = $id;
+
+               # Loop through required module fields
+               foreach(self::$weighting as $field => $weight) {
+
+                    # Skip fields which not exsist on module
+                    if (empty($module[$field])) {
+                         continue;
+                    }
+
+                    # Split field value into small clean word
+                    if (!($subjects = self::patternize($module[$field]))) {
+                         continue;
+                    }
+
+                    # 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 score by matches count * field weight
+                    $sorter[$id] += $nb * $weight;
+                    $result[$id]['score'] = $sorter[$id];
+               }
           }
           # Sort response by matches count
@@ -217 +233 @@
 
      /**
-      * Sanitize string.
+      * Split and clean pattern.
       *
       * @param string    $str      String to sanitize
-      * @param null $_        Unused    param
-      */
-     public static function sanitize(&$str, $_)
-     {
-          $str = strtolower(preg_replace('/[^A-Za-z0-9]/', '', $str));
+      * @return     array     Array of cleaned pieces of string or false if none
+      */
+     public static function patternize($str)
+     {
+          $arr = array();
+
+          foreach(explode(' ', $str) as $_) {
+               $_ = strtolower(preg_replace('/[^A-Za-z0-9]/', '', $_));
+               if (strlen($_) > 2) {
+                    $arr[] = $_;
+               }
+          }
+
+          return empty($arr) ? false : $arr;
      }
 

inc/core/class.dc.store.reader.php

@@ -15 +15 @@
 @ingroup DC_CORE
 @brief Repository modules XML feed reader
+@since 2.6
 
 Provides an object to parse XML feed of modules from repository.