Changeset 2138

Timestamp:

Oct 16, 2007, 3:46:09 AM (17 years ago)

Author:

rvelices

Message:

• quick search optimizations (less queries)
• added some meta_robots (noindex and nofollow) on popuphelp, search_rules and search seaction (googlebot gets crazy)

Location:

trunk

Files:

• include/functions_search.inc.php (modified) (5 diffs)
• include/section_init.inc.php (modified) (1 diff)
• index.php (modified) (2 diffs)
• popuphelp.php (modified) (2 diffs)
• search_rules.php (modified) (2 diffs)

trunk/include/functions_search.inc.php

@@ -363 +363 @@
  * 'as_is' => 1 (indicates the caller that items are ordered and permissions checked
  * 'qs'    => array(
- *    'matching_tags' => array(85,86) - matching tags
- *    'matching_cats' => array(1,2,3) - matching categories
+ *    'matching_tags' => array of matching tags
+ *    'matching_cats' => array of matching categories
  *    'matching_cats_no_images' =>array(99) - matching categories without images
  *      ))
@@ -432 +432 @@
   { // search name and url name (without accents)
     $query = '
-SELECT id
+SELECT id, name, url_name
   FROM '.TAGS_TABLE.'
   WHERE ('.str_replace($q_like_field, 'CONVERT(name, CHAR)', $q_like_clause).'
     OR '.str_replace($q_like_field, 'url_name', $q_like_clause).')';
-    $tag_ids = array_from_query( $query, 'id');
-    if (!empty($tag_ids))
+    $tags = hash_from_query($query, 'id');
+    if ( !empty($tags) )
     { // we got some tags; get the images
-      $search_results['qs']['matching_tags']=$tag_ids;
+      $search_results['qs']['matching_tags']=$tags;
       $query = '
 SELECT image_id, COUNT(tag_id) AS weight
   FROM '.IMAGE_TAG_TABLE.'
-  WHERE tag_id IN ('.implode(',',$tag_ids).')
+  WHERE tag_id IN ('.implode(',',array_keys($tags)).')
   GROUP BY image_id';
       $result = pwg_query($query);
@@ -458 +458 @@
   global $user;
   $query = '
-SELECT id, nb_images
+SELECT id, name, permalink, nb_images
   FROM '.CATEGORIES_TABLE.'
     INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.' ON id=cat_id
@@ -471 +471 @@
     if ($row['nb_images']==0)
     {
-      $search_results['qs']['matching_cats_no_images'][] = $row['id'];
+      $search_results['qs']['matching_cats_no_images'][] = $row;
     }
     else
     {
-      $search_results['qs']['matching_cats'][] = $row['id'];
+      $search_results['qs']['matching_cats'][$row['id']] = $row;
     }
   }
@@ -495 +495 @@
   {
     $where_clauses[]='category_id IN ('.
-      implode(',',$search_results['qs']['matching_cats']).')';
+      implode(',',array_keys($search_results['qs']['matching_cats'])).')';
   }
   $where_clauses = array( '('.implode("\n    OR ",$where_clauses).')' );

trunk/include/section_init.inc.php

@@ -539 +539 @@
 elseif ('recent_cats'==$page['section'])
 {
+  $page['meta_robots']['noindex']=1;
+}
+elseif ('search'==$page['section'])
+{
   $page['meta_robots']['nofollow']=1;
 }

trunk/index.php

@@ -210 +210 @@
     htmlspecialchars($page['qsearch_details']['q']) );
 
-  $found_cat_ids = array_merge(
+  $cats = array_merge(
       (array)@$page['qsearch_details']['matching_cats_no_images'],
       (array)@$page['qsearch_details']['matching_cats'] );
-  if (count($found_cat_ids))
-  {
+  if (count($cats))
+  {
+    usort($cats, 'name_compare');
     $hints = array();
-    $query = '
-SELECT id, name, permalink FROM '.CATEGORIES_TABLE.'
-  WHERE id IN ('.implode(',', $found_cat_ids).')
-  ORDER BY name
-  LIMIT 10';
-    $result = pwg_query($query);
-    while ( $row = mysql_fetch_assoc($result) )
+    foreach ( $cats as $cat )
     {
-      $hints[] = get_cat_display_name( array($row) );
+      $hints[] = get_cat_display_name( array($cat) );
     }
     $template->assign_block_vars( 'category_search_results',
@@ -233 +228 @@
   }
 
-  $tags = find_tags( (array)@$page['qsearch_details']['matching_tags'] );
+  $tags = (array)@$page['qsearch_details']['matching_tags'];
   if (count($tags))
   {

trunk/popuphelp.php

@@ -3 +3 @@
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
-// | file          : $RCSfile$
+// | file          : $Id$
 // | last update   : $Date$
 // | last modifier : $Author$
@@ -41 +40 @@
 $title = l10n('PhpWebGallery Help');
 $page['page_banner'] = '<h1>'.$title.'</h1>';
+$page['meta_robots']=array('noindex'=>1, 'nofollow'=>1);
 include(PHPWG_ROOT_PATH.'include/page_header.php');
 

trunk/search_rules.php

@@ -3 +3 @@
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
-// +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// +-----------------------------------------------------------------------+
 // | file          : $Id$
 // | last update   : $Date$
@@ -50 +49 @@
 $title = l10n('PhpWebGallery Help');
 $page['page_banner'] = '<h1>'.$title.'</h1>';
+$page['meta_robots']=array('noindex'=>1, 'nofollow'=>1);
 include(PHPWG_ROOT_PATH.'include/page_header.php');