Changeset 1015 for trunk

Timestamp:

Jan 27, 2006, 11:40:51 PM (18 years ago)

Author:

plg

Message:

Search engine redesign, second part :

improvement: in category.php, an icon opening a popup display the list of
search rules.

modification: function get_search_array is responsible of search rules
retrieving from database. This function is called from get_sql_search_clause
and from search_rules.php

modification: ability to search multiple authors. Warning: this version of
search tool can't search author names including any blank space.

Location:

trunk

Files:

• category.php (modified) (1 diff)
• include/functions.inc.php (modified) (2 diffs)
• language/en_UK.iso-8859-1/common.lang.php (modified) (14 diffs)
• language/fr_FR.iso-8859-1/common.lang.php (modified) (10 diffs)
• search.php (modified) (1 diff)
• search_rules.php (added)
• template/yoga/category.tpl (modified) (1 diff)
• template/yoga/icon/search_rules.png (added)
• template/yoga/search_rules.tpl (added)

trunk/category.php

@@ -166 +166 @@
   )
 );
+
+if (isset($page['cat']) and 'search' == $page['cat'])
+{
+  $template->assign_block_vars(
+    'search_rules',
+    array(
+      'URL' => PHPWG_ROOT_PATH.'/search_rules.php?search_id='.$_GET['search'],
+      )
+    );
+}
 //-------------------------------------------------------------- external links
 if (count($conf['links']) > 0)

trunk/include/functions.inc.php

@@ -774 +774 @@
 
 /**
- * returns the SQL clause from a search identifier
- *
- * Search rules are stored in search table as a serialized array. This array
- * need to be transformed into an SQL clause to be used in queries.
+ * returns search rules stored into a serialized array in "search"
+ * table. Each search rules set is numericaly identified.
  *
  * @param int search_id
- * @return string
- */
-function get_sql_search_clause($search_id)
+ * @return array
+ */
+function get_search_array($search_id)
 {
   if (!is_numeric($search_id))
@@ -792 +790 @@
 SELECT rules
   FROM '.SEARCH_TABLE.'
-  WHERE id = '.$_GET['search'].'
+  WHERE id = '.$search_id.'
 ;';
   list($serialized_rules) = mysql_fetch_row(pwg_query($query));
   
-  $search = unserialize($serialized_rules);
-
-//   echo '<pre>';
-//   print_r($search);
-//   echo '</pre>';
-
+  return unserialize($serialized_rules);
+}
+
+/**
+ * returns the SQL clause from a search identifier
+ *
+ * Search rules are stored in search table as a serialized array. This array
+ * need to be transformed into an SQL clause to be used in queries.
+ *
+ * @param int search_id
+ * @return string
+ */
+function get_sql_search_clause($search_id)
+{
+  $search = get_search_array($search_id);
+  
   // SQL where clauses are stored in $clauses array during query
   // construction

trunk/language/en_UK.iso-8859-1/common.lang.php

@@ -42 +42 @@
 $lang['%d waiting elements'] = '%d waiting elements';
 $lang['About'] = 'About';
+$lang['At least one listed rule must be satisfied.'] = 'At least one listed rule must be satisfied.';
 $lang['Author'] = 'Author';
 $lang['Average rate'] = 'Average rate';
@@ -48 +49 @@
 $lang['Close this window'] = 'Close this window';
 $lang['Confirm Password'] = 'Confirm Password';
+$lang['Connection settings'] = 'Connection settings';
 $lang['Connection'] = 'Connection';
-$lang['Quick connect'] = 'Quick connect';
-$lang['Connection settings'] = 'Connection settings';
 $lang['Contact webmaster'] = 'Contact webmaster';
 $lang['Create a new account'] = 'Create a new account';
@@ -57 +57 @@
 $lang['Dimensions'] = 'Dimensions';
 $lang['Display'] = 'Display';
+$lang['Each listed rule must be satisfied.'] = 'Each listed rule must be satisfied.';
 $lang['Email address is missing'] = 'Email address is missing';
 $lang['Email address'] = 'Email address';
@@ -86 +87 @@
 $lang['PhpWebGallery Help'] = 'PhpWebGallery Help';
 $lang['Profile'] = 'Profile';
+$lang['Quick connect'] = 'Quick connect';
 $lang['RSS feed'] = 'RSS feed';
 $lang['Register'] = 'Register';
@@ -92 +94 @@
 $lang['Reset'] = 'Reset';
 $lang['Retrieve password'] = 'Retrieve password';
+$lang['Search rules'] = 'Search rules';
 $lang['Search'] = 'Search';
 $lang['Send new password'] = 'Send new password';
@@ -109 +112 @@
 $lang['add_favorites_hint'] = 'Add this picture to your favorites';
 $lang['admin'] = 'Administration';
+$lang['all'] = 'all';
 $lang['all_categories'] = 'all categories';
 $lang['already_rated'] = 'You\'ve already rated this item';
+$lang['ascending'] = 'ascending';
+$lang['author(s) : %s'] = 'author(s) : %s';
 $lang['auto_expand'] = 'Expand all categories';
+$lang['became available after %s (%s)'] = 'became available after %s (%s)';
+$lang['became available before %s (%s)'] = 'became available before %s (%s)';
+$lang['became available between %s (%s) and %s (%s)'] = 'became available between %s (%s) and %s (%s)';
+$lang['became available on %s'] = 'became available on %s';
 $lang['best_rated_cat'] = 'best rated';
 $lang['best_rated_cat_hint'] = 'displays best rated items';
@@ -119 +129 @@
 $lang['calendar_picture_hint'] = 'displays pictures added on ';
 $lang['categories'] = 'Categories';
+$lang['comment date'] = 'comment date';
 $lang['comment'] = 'Comment';
 $lang['comment_added'] = 'Your comment has been registered';
@@ -129 +140 @@
 $lang['comments_title'] = 'Comments from the users of the site';
 $lang['confirm_password_hint'] = 'You only have to confirm your new password if you wish to change it.';
+$lang['created after %s (%s)'] = 'created after %s (%s)';
+$lang['created before %s (%s)'] = 'created before %s (%s)';
+$lang['created between %s (%s) and %s (%s)'] = 'created between %s (%s) and %s (%s)';
+$lang['created on %s'] = 'created on %s';
 $lang['customize'] = 'Customize';
 $lang['customize_page_title'] = 'Your Gallery Customization ';
@@ -143 +158 @@
 $lang['del_favorites_hint'] = 'Delete this picture from your favorites';
 $lang['delete'] = 'Delete';
+$lang['descending'] = 'descending';
 $lang['download'] = 'download';
 $lang['download_hint'] = 'download this file';
@@ -148 +164 @@
 $lang['edit'] = 'edit';
 $lang['err_date'] = 'wrong date';
+$lang['excluded'] = 'excluded';
 $lang['favorite_cat'] = 'My favorites';
 $lang['favorite_cat_hint'] = 'display my favorites pictures';
@@ -169 +186 @@
 $lang['identification'] = 'Identification';
 $lang['images_available'] = 'images in this category';
+$lang['included'] = 'included';
 $lang['invalid_pwd'] = 'Invalid password!';
 $lang['language']='Language';
@@ -211 +229 @@
 $lang['password_hint'] = 'You only have to give your password if you wish to change your e-mail';
 $lang['periods_error'] = 'Recent period must be a positive integer value';
+$lang['picture'] = 'picture';
 $lang['picture_high'] = 'Click on the picture to see it in high definition';
 $lang['picture_show_metadata'] = 'Show file metadata';
@@ -259 +278 @@
 $lang['search_subcats_included'] = 'Search in subcategroies';
 $lang['search_title'] = 'Search';
+$lang['searched words : %s'] = 'searched words : %s';
 $lang['send_mail'] = 'Contact';
 $lang['set as category representative'] = 'set as category representative';
@@ -300 +320 @@
 $lang['w_month'] = 'Month';
 $lang['yes'] = 'Yes';
-
-$lang['descending'] = 'descending';
-$lang['all'] = 'all';
-$lang['ascending'] = 'ascending';
-$lang['comment date'] = 'comment date';
-$lang['picture'] = 'picture';
 ?>

trunk/language/fr_FR.iso-8859-1/common.lang.php

@@ -41 +41 @@
 $lang['%d new users'] = '%d nouveaux utilisateurs';
 $lang['About'] = 'À propos';
+$lang['At least one listed rule must be satisfied.'] = 'Au moins un des critères doit être satisfait.';
 $lang['Author'] = 'Auteur';
 $lang['Average rate'] = 'Note moyenne';
@@ -47 +48 @@
 $lang['Close this window'] = 'Fermer cette fenêtre';
 $lang['Confirm Password'] = 'Confirmer le mot de passe';
+$lang['Connection settings'] = 'Paramètres de connexion';
 $lang['Connection'] = 'Connexion';
-$lang['Quick connect'] = 'Connexion rapide';
-$lang['Connection settings'] = 'Paramètres de connexion';
 $lang['Contact webmaster'] = 'Contacter le webmestre';
 $lang['Create a new account'] = 'Créer un nouveau compte';
@@ -56 +56 @@
 $lang['Dimensions'] = 'Dimensions';
 $lang['Display'] = 'Affichage';
+$lang['Each listed rule must be satisfied.'] = 'Chaque critère doit être satisfait';
 $lang['Email address is missing'] = 'L\'adresse e-mail manque';
 $lang['Email address'] = 'Adresse e-mail';
@@ -85 +86 @@
 $lang['PhpWebGallery Help'] = 'Aide de PhpWebGallery';
 $lang['Profile'] = 'Profil';
+$lang['Quick connect'] = 'Connexion rapide';
 $lang['RSS feed'] = 'flux RSS';
 $lang['Register'] = 'S\'enregistrer';
@@ -91 +93 @@
 $lang['Reset'] = 'Annuler';
 $lang['Retrieve password'] = 'Récupérer un mot de passe';
+$lang['Search rules'] = 'Critères de recherche';
 $lang['Search'] = 'Rechercher';
 $lang['Send new password'] = 'Envoyer le nouveau mot de passe';
@@ -112 +115 @@
 $lang['already_rated'] = 'Vous avez déjà voté pour cette image';
 $lang['ascending'] = 'croissant';
+$lang['author(s) : %s'] = 'auteur(s) : %s';
 $lang['auto_expand'] = 'Développer toutes les catégories';
+$lang['became available after %s (%s)'] = 'mis à disposition après le %s (%s)';
+$lang['became available before %s (%s)'] = 'mis à disposition avant le %s (%s)';
+$lang['became available between %s (%s) and %s (%s)'] = 'mis à disposition entre le %s (%s) et le %s (%s)';
+$lang['became available on %s'] = 'mis à disposition le %s';
 $lang['best_rated_cat'] = 'Mieux notées';
 $lang['best_rated_cat_hint'] = 'affiche les images les mieux notées';
@@ -131 +139 @@
 $lang['comments_title'] = 'Commentaires des utilisateurs';
 $lang['confirm_password_hint'] = 'Vous n\'avez à confirmer votre mot de passe que si vous désirez en changer.';
+$lang['created after %s (%s)'] = 'créée après le %s (%s)';
+$lang['created before %s (%s)'] = 'créée avant le %s (%s)';
+$lang['created between %s (%s) and %s (%s)'] = 'créée entre le %s (%s) et le %s (%s)';
+$lang['created on %s'] = 'créée le %s';
 $lang['customize'] = 'Personnaliser';
 $lang['customize_page_title'] = 'Personnalisation de votre affichage ';
@@ -151 +163 @@
 $lang['edit'] = 'éditer';
 $lang['err_date'] = 'date erronée';
+$lang['excluded'] = 'exclus';
 $lang['favorite_cat'] = 'Mes favorites';
 $lang['favorite_cat_hint'] = 'afficher mes images favorites';
@@ -172 +185 @@
 $lang['identification'] = 'Identification';
 $lang['images_available'] = 'images dans cette catégorie';
+$lang['included'] = 'inclus';
 $lang['invalid_pwd'] = 'Mot de passe invalide !';
 $lang['language'] = 'Langue';
@@ -263 +277 @@
 $lang['search_subcats_included'] = 'Rechercher dans les sous-catégories';
 $lang['search_title'] = 'Recherche';
+$lang['searched words : %s'] = 'mots recherchés : %s';
 $lang['send_mail'] = 'Contacter';
 $lang['set as category representative'] = 'élire comme représentant de cette catégorie';

trunk/search.php

@@ -65 +65 @@
   {
     $search['fields']['author'] = array(
-      'words' => array($_POST['search_author']),
+      'words' => preg_split(
+        '/\s+/',
+        $_POST['search_author']
+        ),
+      'mode' => 'OR',
       );
   }

trunk/template/yoga/category.tpl

@@ -108 +108 @@
     <ul class="categoryActions">
       <li>&nbsp;</li>
+      
       <!-- BEGIN caddie -->
       <li><a href="{caddie.URL}" title="{lang:add to caddie}"><img src="{themeconf:icon_dir}/caddie_add.png" class="button" alt="{lang:caddie}"/></a></li>
       <!-- END caddie -->
+      
       <!-- BEGIN edit -->
       <li><a href="{edit.URL}" title="{lang:edit category informations}"><img src="{themeconf:icon_dir}/category_edit.png" class="button" alt="{lang:edit}"/></a></li>
       <!-- END edit -->
+
+      <!-- BEGIN search_rules -->
+      <li><a href="{search_rules.URL}" style="border:none;" onclick="popuphelp(this.href); return false;" title="{lang:Search rules}"><img src="{themeconf:icon_dir}/search_rules.png" class="button" alt="(?)"></a></li>
+      <!-- END search_rules -->
+
     </ul>
-    <h2>{TITLE}</h2>
-  </div>
+    
+  <h2>{TITLE}</h2>
+    
+  </div> <!-- content -->
+    
 <!-- BEGIN calendar -->
 <div class="navigationBar">{calendar.YEARS_NAV_BAR}</div>