Changeset 1537

Timestamp:

Aug 15, 2006, 4:06:06 AM (18 years ago)

Author:

rvelices

Message:

feature 519: quick search (first version)

Location:

trunk

Files:

• include/config_default.inc.php (modified) (3 diffs)
• include/functions_search.inc.php (modified) (3 diffs)
• include/functions_tag.inc.php (modified) (1 diff, 1 prop)
• include/menubar.inc.php (modified) (2 diffs)
• include/section_init.inc.php (modified) (3 diffs)
• index.php (modified) (1 diff)
• qsearch.php (added)
• search_rules.php (modified) (1 diff)
• template/yoga/default-layout.css (modified) (1 diff)
• template/yoga/index.tpl (modified) (1 diff)
• template/yoga/menubar.css (modified) (2 diffs)
• template/yoga/menubar.tpl (modified) (1 diff, 1 prop)

trunk/include/config_default.inc.php

@@ -207 +207 @@
 
 // enabled_format_email:
-//  on true email will be formatted with name and address 
+//  on true email will be formatted with name and address
 //  on false email will be only address
 // There are webhosting wich not allow email formatted (Lycos, ...)
@@ -474 +474 @@
 $conf['full_tag_cloud_items_number'] = 200;
 
+// menubar_tag_cloud_items_number: number of tags to show in the tag
+// cloud in the menubar. Only the most represented tags will be shown
+$conf['menubar_tag_cloud_items_number'] = 100;
+
+// content_tag_cloud_items_number: number of tags to show in the tag
+// cloud on the content page. Only the most represented tags will be shown
+$conf['content_tag_cloud_items_number'] = 12;
+
 // tags_levels: number of levels to use for display. Each level is bind to a
 // CSS class tagLevelX.
@@ -506 +514 @@
 //        null value, user_layout is used for admin layout
 //        defined value, this value are used for admin layout
-// Next on step 2, default_admin_layout will be used 
+// Next on step 2, default_admin_layout will be used
 //                 if there are not checked like admin layout
 // stored on user informations

trunk/include/functions_search.inc.php

@@ -74 +74 @@
  * need to be transformed into an SQL clause to be used in queries.
  *
- * @param int search_id
+ * @param array search
  * @return string
  */
-function get_sql_search_clause($search_id)
-{
-  $search = get_search_array($search_id);
-
+function get_sql_search_clause($search)
+{
   // SQL where clauses are stored in $clauses array during query
   // construction
@@ -213 +211 @@
 
 /**
- * returns the list of items corresponding to the search id
- *
- * @param int search id
+ * returns the list of items corresponding to the advanced search array
+ *
+ * @param array search
  * @return array
  */
-function get_search_items($search_id)
+function get_regular_search_results($search)
 {
   $items = array();
-  
-  $search_clause = get_sql_search_clause($search_id);
-  
+
+  $search_clause = get_sql_search_clause($search);
+
   if (!empty($search_clause))
   {
@@ -270 +268 @@
     }
   }
-  
+
   return $items;
 }
+
+
+if (!function_exists('array_intersect_key')) {
+   function array_intersect_key()
+   {
+       $arrs = func_get_args();
+       $result = array_shift($arrs);
+       foreach ($arrs as $array) {
+           foreach ($result as $key => $v) {
+               if (!array_key_exists($key, $array)) {
+                   unset($result[$key]);
+               }
+           }
+       }
+       return $result;
+   }
+}
+
+
+function get_qsearch_like_clause($q, $field)
+{
+  $tokens = preg_split('/[\s,.;!\?]+/', $q);
+  for ($i=0; $i<count($tokens); $i++)
+  {
+    $tokens[$i]=str_replace('*','%', $tokens[$i]);
+    if (preg_match('/^[+<>]/',$tokens[$i]) )
+      $tokens[$i]=substr($tokens[$i], 1);
+    else if (substr($tokens[$i], 0, 1)=='-')
+    {
+      unset($tokens[$i]);
+      $i--;
+    }
+  }
+
+  if (!empty($tokens))
+  {
+    $query = '(';
+    for ($i=0; $i<count($tokens); $i++)
+    {
+      if ($i>0) $query .= 'OR ';
+      $query .= ' '.$field.' LIKE "%'.$tokens[$i].'%" ';
+    }
+    $query .= ')';
+    return $query;
+  }
+  return null;
+}
+
+
+/**
+ * returns the search results corresponding to a quick search
+ *
+ * @param string q
+ * @return array
+ */
+function get_quick_search_results($q)
+{
+  global $user, $page;
+  $search_results = array();
+
+  $q_like_clause = get_qsearch_like_clause($q, 'CONVERT(name, CHAR)' );
+  $by_tag_weights=array();
+  if (!empty($q_like_clause))
+  {
+    $query = '
+SELECT id
+  FROM '.TAGS_TABLE.'
+  WHERE '.$q_like_clause;
+    $tag_ids = array_from_query( $query, 'id');
+    if (!empty($tag_ids))
+    {
+      $query = '
+SELECT image_id, COUNT(tag_id) AS q
+  FROM '.IMAGE_TAG_TABLE.'
+  WHERE tag_id IN ('.implode(',',$tag_ids).')
+  GROUP BY image_id';
+      $result = pwg_query($query);
+      while ($row = mysql_fetch_array($result))
+      {
+        $by_tag_weights[(int)$row['image_id']] = $row['q'];
+      }
+    }
+  }
+
+  $query = '
+SELECT
+  i.id, i.file, CAST( CONCAT_WS(" ",
+    IFNULL(i.name,""),
+    IFNULL(i.comment,""),
+    IFNULL(GROUP_CONCAT(DISTINCT co.content),""),
+    IFNULL(GROUP_CONCAT(DISTINCT c.dir),""),
+    IFNULL(GROUP_CONCAT(DISTINCT c.name),""),
+    IFNULL(GROUP_CONCAT(DISTINCT c.comment),"") ) AS CHAR) AS ft
+FROM (
+  (
+    '.IMAGES_TABLE.' i LEFT JOIN '.COMMENTS_TABLE.' co on i.id=co.image_id
+  )
+    INNER JOIN
+  '.IMAGE_CATEGORY_TABLE.' ic on ic.image_id=i.id
+  )
+    INNER JOIN
+  '.CATEGORIES_TABLE.' c on c.id=ic.category_id
+WHERE category_id NOT IN ('.$user['forbidden_categories'].')
+GROUP BY i.id';
+
+  $query = 'SELECT id, MATCH(ft) AGAINST( "'.$q.'" IN BOOLEAN MODE) AS q FROM ('.$query.') AS Y
+WHERE MATCH(ft) AGAINST( "'.$q.'" IN BOOLEAN MODE)';
+
+  $q_like_clause = get_qsearch_like_clause($q, 'file' );
+  if (! empty($q_like_clause) )
+  {
+    $query .= ' OR '.$q_like_clause;
+  }
+
+  $by_weights=array();
+  $result = pwg_query($query);
+  while ($row = mysql_fetch_array($result))
+  {
+    $by_weights[(int)$row['id']] = $row['q'] ? $row['q'] : 0;
+  }
+
+  foreach ( $by_weights as $image=>$w )
+  {
+    $by_tag_weights[$image] = 2*$w+ (isset($by_tag_weights[$image])?$by_tag_weights[$image]:0);
+  }
+
+  if ( empty($by_tag_weights) or isset($page['super_order_by']) )
+  {
+    if (! isset($page['super_order_by']) )
+    {
+      arsort($by_tag_weights, SORT_NUMERIC);
+      $search_results['as_is']=1;
+    }
+    $search_results['items'] = array_keys($by_tag_weights);
+  }
+  else
+  {
+    $query = '
+SELECT DISTINCT(id)
+  FROM '.IMAGES_TABLE.'
+    INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id = ic.image_id
+  WHERE id IN ('.implode(',', array_keys($by_tag_weights) ).')
+    AND category_id NOT IN ('.$user['forbidden_categories'].')';
+
+    $allowed_image_ids = array_from_query( $query, 'id');
+    $by_tag_weights = array_intersect_key($by_tag_weights, array_flip($allowed_image_ids));
+    arsort($by_tag_weights, SORT_NUMERIC);
+    $search_results = array(
+          'items'=>array_keys($by_tag_weights),
+          'as_is'=>1
+        );
+  }
+  return $search_results;
+}
+
+/**
+ * returns an array of 'items' corresponding to the search id
+ *
+ * @param int search id
+ * @return array
+ */
+function get_search_results($search_id)
+{
+  $search = get_search_array($search_id);
+  if ( !isset($search['q']) )
+  {
+    $result['items'] = get_regular_search_results($search);
+    return $result;
+  }
+  else
+  {
+    return get_quick_search_results($search['q']);
+  }
+}
 ?>

trunk/include/functions_tag.inc.php

@@ -222 +222 @@
   }
 }
+
+/**
+ * return a list of tags corresponding to given items.
+ *
+ * @param array items
+ * @param array max_tags
+ * @param array excluded_tag_ids
+ * @return array
+ */
+function get_common_tags($items, $max_tags, $excluded_tag_ids=null)
+{
+  if (empty($items))
+  {
+    return array();
+  }
+  $query = '
+SELECT tag_id, name, url_name, count(*) counter
+  FROM '.IMAGE_TAG_TABLE.'
+    INNER JOIN '.TAGS_TABLE.' ON tag_id = id
+  WHERE image_id IN ('.implode(',', $items).')';
+  if (!empty($excluded_tag_ids))
+  {
+    $query.='
+    AND tag_id NOT IN ('.implode(',', $excluded_tag_ids).')';
+  }
+  $query .='
+  GROUP BY tag_id
+  ORDER BY counter DESC';
+  if ($max_tags>0)
+  {
+    $query .= '
+  LIMIT 0,'.$max_tags;
+  }
+
+  $result = pwg_query($query);
+  $tags = array();
+  while($row = mysql_fetch_array($result))
+  {
+    array_push($tags, $row);
+  }
+  usort($tags, 'name_compare');
+  return $tags;
+}
 ?>

trunk/include/menubar.inc.php

@@ -77 +77 @@
   if ( !empty($page['items']) )
   {
-    $query = '
-SELECT tag_id, name, url_name, count(*) counter
-  FROM '.IMAGE_TAG_TABLE.'
-    INNER JOIN '.TAGS_TABLE.' ON tag_id = id
-  WHERE image_id IN ('.implode(',', $items).')
-    AND tag_id NOT IN ('.implode(',', $page['tag_ids']).')
-  GROUP BY tag_id
-  ORDER BY name ASC
-;';
-    $result = pwg_query($query);
-    while($row = mysql_fetch_array($result))
-    {
-      array_push($tags, $row);
-    }
+    $tags = get_common_tags($page['items'],
+        $conf['menubar_tag_cloud_items_number'], $page['tag_ids']);
   }
 
@@ -270 +258 @@
     )
   );
+$template->assign_block_vars( 'summary.quick_search',  array() );
 
 // comments link

trunk/include/section_init.inc.php

@@ -451 +451 @@
     include_once( PHPWG_ROOT_PATH .'include/functions_search.inc.php' );
 
-    $search_items = get_search_items($page['search']);
-    if ( !empty($search_items) )
+    $search_result = get_search_results($page['search']);
+    if ( !empty($search_result['items']) and !isset($search_result['as_is']) )
     {
       $query = '
@@ -458 +458 @@
   FROM '.IMAGES_TABLE.'
     INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id = ic.image_id
-  WHERE id IN ('.implode(',', $search_items).')
+  WHERE id IN ('.implode(',', $search_result['items']).')
     AND '.$forbidden.'
   '.$conf['order_by'].'
@@ -466 +466 @@
     else
     {
-      $page['items'] = array();
+      $page['items'] = $search_result['items'];
     }
 

trunk/index.php

@@ -199 +199 @@
   }
 
+if ( $page['section']=='search' and $page['start']==0 )
+{
+  $tags = get_common_tags($page['items'],
+      $conf['content_tag_cloud_items_number'], null);
+  if ( count($tags)>1 )
+  {
+    $template->assign_block_vars('related_tags', array() );
+
+    $tags = add_level_to_tags($tags);
+    foreach ($tags as $tag)
+    {
+      $template->assign_block_vars(
+      'related_tags.tag', array(
+        'URL' => make_index_url(
+          array(
+            'tags' => array(
+              array(
+                'id' => $tag['tag_id'],
+                'url_name' => $tag['url_name'],
+                ),
+              )
+            )
+          ),
+        'NAME' => $tag['name'],
+        'TITLE' => sprintf(
+          l10n('%d pictures are also linked to current tags'),
+          $tag['counter']
+          ),
+        'CLASS' => 'tagLevel'.$tag['level']
+        )
+      );
+    }
+  }
+}
+
 //------------------------------------------------------ main part : thumbnails
 if (isset($page['thumbnails_include']))

trunk/search_rules.php

@@ -62 +62 @@
 $search = get_search_array($_GET['search_id']);
 
-$template->assign_vars(
-  array(
-    'INTRODUCTION'
-      => 'OR' == $search['mode']
-      ? l10n('At least one listed rule must be satisfied.')
-      : l10n('Each listed rule must be satisfied.'),
-    )
-  );
+if (isset($search['q']))
+{
+  $template->assign_block_vars(
+    'words',
+    array(
+      'CONTENT' => $search['q']
+        )
+    );
+}
+else
+{
+  $template->assign_vars(
+    array(
+      'INTRODUCTION'
+        => 'OR' == $search['mode']
+        ? l10n('At least one listed rule must be satisfied.')
+        : l10n('Each listed rule must be satisfied.'),
+      )
+    );
+}
 
 if (isset($search['fields']['allwords']))

trunk/template/yoga/default-layout.css

@@ -238 +238 @@
 }
 
-#fullTagCloud { font-size: 140%; }
-
-#fullTagCloud LI { display: inline; }
+#fullTagCloud {
+  font-size: 140%;
+  text-align: justify;
+  padding: 0;
+  margin: 1em 2em 1em 2em;
+}
+
+#fullTagCloud LI {
+  display: inline;
+  white-space: nowrap;
+}
+
+#content #fullTagCloud {
+  font-size: 120%;
+}
 
 .tagLevel5 { font-size: 150%; }

trunk/template/yoga/index.tpl

@@ -91 +91 @@
 <!-- END cat_infos -->
 
+<!-- BEGIN related_tags -->
+  <ul id="fullTagCloud">
+    <li>{lang:Related tags}:</li>
+    <!-- BEGIN tag -->
+    <li><a href="{related_tags.tag.URL}" class="{related_tags.tag.CLASS}" title="{related_tags.tag.TITLE}">{related_tags.tag.NAME}</a></li>
+    <!-- END tag -->
+  </ul>
+<!-- END related_tags -->
+
+
 </div> <!-- content -->

trunk/template/yoga/menubar.css

@@ -58 +58 @@
 
 /* quickconnect form */
-FORM#quickconnect { 
+FORM#quickconnect {
   margin: 0;
   padding: 5px;
@@ -115 +115 @@
 }*/
 
+FORM#quicksearch {
+  margin-top: 4px;
+  margin-bottom: 1px;
+}
+
 #menubar #menuTagCloud {
   text-align: center;

trunk/template/yoga/menubar.tpl

@@ -52 +52 @@
     <ul>
       <!-- BEGIN summary -->
+      <!-- BEGIN quick_search -->
+      <form action="{pwg_root}qsearch.php" method="get" id="quicksearch"><input type="text" name="q" id="qsearchInput" onfocus="if (value==qsearch_prompt) value='';" onblur="if (value=='') value=qsearch_prompt;"></form>
+      <script type="text/javascript">var qsearch_prompt="{lang:search}"; document.getElementById('qsearchInput').value=qsearch_prompt;</script>
+      <!-- END quick_search -->
       <li><a href="{summary.U_SUMMARY}" title="{summary.TITLE}" {summary.REL}>{summary.NAME}</a></li>
       <!-- END summary -->