From e0202d82a1e33dc2c2ed5b8fcec46440cc905d3f Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 22 Mar 2011 16:34:12 -0700 Subject: [PATCH] add fulltext index on keywords, missed some directory localisations --- boot.php | 2 +- database.sql | 4 +++- mod/directory.php | 6 +++--- update.php | 8 ++++++++ 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/boot.php b/boot.php index 9bac155b9a..3bec6c48f5 100644 --- a/boot.php +++ b/boot.php @@ -4,7 +4,7 @@ set_time_limit(0); define ( 'FRIENDIKA_VERSION', '2.1.926' ); define ( 'DFRN_PROTOCOL_VERSION', '2.1' ); -define ( 'DB_UPDATE_VERSION', 1044 ); +define ( 'DB_UPDATE_VERSION', 1045 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/database.sql b/database.sql index 0a718c8c22..114f0d3d94 100644 --- a/database.sql +++ b/database.sql @@ -315,7 +315,9 @@ CREATE TABLE IF NOT EXISTS `profile` ( `thumb` char(255) NOT NULL, `publish` tinyint(1) NOT NULL DEFAULT '0', `net-publish` tinyint(1) NOT NULL DEFAULT '0', - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + FULLTEXT KEY `pub_keywords` (`pub_keywords`), + FULLTEXT KEY `prv_keywords` (`prv_keywords`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -------------------------------------------------------- diff --git a/mod/directory.php b/mod/directory.php index 825e2a375f..72c30fb317 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -86,10 +86,10 @@ function directory_content(&$a) { } if(strlen($rr['dob'])) { if(($years = age($rr['dob'],$rr['timezone'],'')) != 0) - $details .= "
Age: $years" ; + $details .= '
' . t('Age: ') . $years ; } if(strlen($rr['gender'])) - $details .= '
Gender: ' . $rr['gender']; + $details .= '
' . t('Gender: ') . $rr['gender']; $entry = replace_macros($tpl,array( '$id' => $rr['id'], @@ -115,7 +115,7 @@ function directory_content(&$a) { } else - notice("No entries (some entries may be hidden)."); + notice( t("No entries \x28some entries may be hidden\x29.") . EOL); return $o; } \ No newline at end of file diff --git a/update.php b/update.php index 9f94cd511b..3672b2bfee 100644 --- a/update.php +++ b/update.php @@ -410,3 +410,11 @@ function update_1042() { function update_1043() { q("ALTER TABLE `user` ADD `blockwall` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `blocked` "); } + +function update_1044() { + q("ALTER TABLE `profile` ADD FULLTEXT ( `pub_keywords` ) "); + q("ALTER TABLE `profile` ADD FULLTEXT ( `prv_keywords` ) "); +} + + + \ No newline at end of file