diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 5889ef294..b609a667d 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -87,4 +87,8 @@ webgui.
- Added a variation on Len's Advanced Search wobject. Thanks to Len
Kranendonk for creating the original version for the WebGUI community
contest.
+ - Removed the old realtime search subsystem in favor of the new search
+ wobject.
+
+
diff --git a/docs/gotcha.txt b/docs/gotcha.txt
index 1ebf53e5c..693e2fb9d 100644
--- a/docs/gotcha.txt
+++ b/docs/gotcha.txt
@@ -50,6 +50,10 @@ save you many hours of grief.
the new configurable navigation system. See migration.txt
for additional details.
+ * The old realtime search subsystem has been replaced with the new
+ indexed search wobject. As such we've removed the ^?; macro.
+ If you were using the ^?; macro then you'll need to set up
+ a search wobject to replace it.
5.5.0
diff --git a/docs/upgrades/upgrade_5.9.9-6.0.0.pl b/docs/upgrades/upgrade_5.9.9-6.0.0.pl
index 5358a5fe0..d67e7afad 100644
--- a/docs/upgrades/upgrade_5.9.9-6.0.0.pl
+++ b/docs/upgrades/upgrade_5.9.9-6.0.0.pl
@@ -510,6 +510,7 @@ foreach my $macro (keys %{$macros}) {
|| $macros->{$macro} eq "SpecificDropMenu"
|| $macros->{$macro} eq "TopDropMenu"
|| $macros->{$macro} eq "Synopsis"
+ || $macros->{$macro} eq "Question_search"
) {
$newMacros{$macro} = $macros->{$macro};
}
@@ -571,6 +572,8 @@ unlink("../../lib/WebGUI/Macro/rootmenuHorizontal.pm");
unlink("../../lib/WebGUI/Macro/RootTab.pm");
unlink("../../lib/WebGUI/Macro/SpecificDropMenu.pm");
unlink("../../lib/WebGUI/Macro/TopDropMenu.pm");
+unlink("../../lib/WebGUI/Macro/Question_search.pm");
+unlink("../../lib/WebGUI/Operation/Search.pm");
rmtree("../../lib/WebGUI/Authentication");
rmtree("../../www/extras/toolbar/default");
diff --git a/docs/upgrades/upgrade_5.9.9-6.0.0.sql b/docs/upgrades/upgrade_5.9.9-6.0.0.sql
index bf1f9fbcb..1cd18c831 100644
--- a/docs/upgrades/upgrade_5.9.9-6.0.0.sql
+++ b/docs/upgrades/upgrade_5.9.9-6.0.0.sql
@@ -661,4 +661,6 @@ INSERT INTO international VALUES (29,'IndexedSearch',1,'Search template',1070202
INSERT INTO template VALUES (2,'Advanced Search','\r\n \r\n\r\n\r\n
\r\n \r\n\r\n\r\n\r\n
\r\n\r\n Results - of about \r\n containing \"\" . Search took
\r\n \r\n\">\r\n\r\n\r\n \r\n \">\r\n No Title \r\n \r\n by \"> \r\n \r\n \r\n \r\n \r\n
\r\n \r\n \r\n\r\n \r\n\n\n\n\n \n \n','IndexedSearch');
INSERT INTO template VALUES (3,'Search in Help','\r\n \r\n\r\n\r\n
\r\n \r\n\r\n\r\n\r\n
\r\n\r\n Results - of about \r\n containing \"\" . Search took
\r\n \r\n\">\r\n\r\n\r\n \r\n \">\r\n No Title \r\n \r\n \r\n \r\n Namespace: \r\n
\r\n \r\n \r\n\r\n \r\n\n\n\n\n \n \n','IndexedSearch');
INSERT INTO template VALUES (1,'Default Search','\r\n \r\n\r\n\r\n
\r\n \r\n\r\n\r\n\r\n
\r\n\r\n Results - of about \r\n containing \"\" . Search took
\r\n \">\r\n \r\n \r\n \">\r\n No Title \r\n \r\n \r\n \r\n Location: \r\n
\r\n \r\n \r\n \r\n \n\n\n\n \n \n','IndexedSearch');
+delete from international where internationalId=365 and namespace='WebGUI';
+delete from international where internationalId=366 and namespace='WebGUI';
diff --git a/lib/WebGUI/Macro/Question_search.pm b/lib/WebGUI/Macro/Question_search.pm
deleted file mode 100644
index 25c3cecab..000000000
--- a/lib/WebGUI/Macro/Question_search.pm
+++ /dev/null
@@ -1,30 +0,0 @@
-package WebGUI::Macro::Question_search;
-
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2003 Plain Black LLC.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com info@plainblack.com
-#-------------------------------------------------------------------
-
-use strict;
-use WebGUI::HTMLForm;
-use WebGUI::International;
-use WebGUI::Session;
-use WebGUI::URL;
-
-#-------------------------------------------------------------------
-sub process {
- my ($f);
- $f = WebGUI::HTMLForm->new(1);
- $f->hidden("op","search");
- $f->text("atLeastOne",'',$session{form}{atLeastOne});
- $f->submit(WebGUI::International::get(364));
- return $f->print;
-}
-
-
-1;
diff --git a/lib/WebGUI/Operation.pm b/lib/WebGUI/Operation.pm
index 50e3ebea3..1b15c12f9 100644
--- a/lib/WebGUI/Operation.pm
+++ b/lib/WebGUI/Operation.pm
@@ -27,7 +27,6 @@ use WebGUI::Operation::ProfileSettings;
use WebGUI::Operation::Replacements;
use WebGUI::Operation::Root;
use WebGUI::Operation::Scratch;
-use WebGUI::Operation::Search;
use WebGUI::Operation::Settings;
use WebGUI::Operation::Statistics;
use WebGUI::Operation::Style;
diff --git a/lib/WebGUI/Operation/Search.pm b/lib/WebGUI/Operation/Search.pm
deleted file mode 100644
index 7b98c5085..000000000
--- a/lib/WebGUI/Operation/Search.pm
+++ /dev/null
@@ -1,66 +0,0 @@
-package WebGUI::Operation::Search;
-
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2003 Plain Black LLC.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com info@plainblack.com
-#-------------------------------------------------------------------
-
-use Exporter;
-use strict;
-use WebGUI::HTMLForm;
-use WebGUI::International;
-use WebGUI::Paginator;
-use WebGUI::Privilege;
-use WebGUI::Search;
-use WebGUI::Session;
-use WebGUI::SQL;
-use WebGUI::URL;
-
-our @ISA = qw(Exporter);
-our @EXPORT = qw(&www_search);
-
-#-------------------------------------------------------------------
-sub www_search {
- my ($constraints, $p, $output, %page, $sth, @row, $i, $url);
- $url = WebGUI::URL::page('op=search');
- $url = WebGUI::URL::append($url,'all='.$session{form}{all}) if ($session{form}{all} ne "");
- $url = WebGUI::URL::append($url,'exactPhrase='.$session{form}{exactPhrase}) if ($session{form}{exactPhrase} ne "");
- $url = WebGUI::URL::append($url,'atLeastOne='.$session{form}{atLeastOne}) if ($session{form}{atLeastOne} ne "");
- $url = WebGUI::URL::append($url,'without='.$session{form}{without}) if ($session{form}{without} ne "");
- $output = WebGUI::Search::form({op=>'search'});
- $constraints = WebGUI::Search::buildConstraints([qw(page.synopsis page.title page.menuTitle page.metaTags
- page.urlizedTitle wobject.description wobject.title wobject.namespace)]);
- if ($constraints ne "") {
- tie %page, 'Tie::CPHash';
- $sth = WebGUI::SQL->read("select page.urlizedTitle,page.title,wobject.wobjectId,page.pageId from page,wobject where $constraints
- and page.pageId=wobject.pageId and (page.pageId > 999 or page.pageId<=1)
- and page.pageId<>$session{page}{pageId} order by lastEdited");
- while (%page = $sth->hash) {
- if (WebGUI::Privilege::canViewPage($page{pageId})) {
- $row[$i] = ''.$page{title}.' ';
- $i++;
- }
- }
- $sth->finish;
- }
- if ($row[0] ne "") {
- $p = WebGUI::Paginator->new($url,$session{scratch}{numResults});
- $p->setDataByArrayRef(\@row);
- $output .= '
'.WebGUI::International::get(365).'
';
- $output .= $p->getPage($session{form}{pn});
- $output .= ' '.$p->getBarTraditional($session{form}{pn});
- } elsif ($session{form}{exactPhrase} ne "" || $session{form}{all} ne "" || $session{form}{without} ne "" || $session{form}{atLeastOne} ne "") {
- $output .= '
'.WebGUI::International::get(366).'
';
- }
- return $output;
-}
-
-
-
-1;
-
diff --git a/sbin/preload.perl b/sbin/preload.perl
index 6a28d3067..1f009d24a 100644
--- a/sbin/preload.perl
+++ b/sbin/preload.perl
@@ -101,6 +101,7 @@ use WebGUI::Operation::Group ();
use WebGUI::Operation::Help ();
use WebGUI::Operation::International ();
use WebGUI::Operation::MessageLog ();
+use WebGUI::Operation::Navigation ();
use WebGUI::Operation::Package ();
use WebGUI::Operation::Page ();
use WebGUI::Operation::Profile ();
@@ -108,7 +109,6 @@ use WebGUI::Operation::ProfileSettings ();
use WebGUI::Operation::Replacements ();
use WebGUI::Operation::Root ();
use WebGUI::Operation::Scratch ();
-use WebGUI::Operation::Search ();
use WebGUI::Operation::Settings ();
use WebGUI::Operation::Shared ();
use WebGUI::Operation::Statistics ();
diff --git a/www/extras/htmlArea/popups/macros.html b/www/extras/htmlArea/popups/macros.html
index 8fc3f6863..5254cf53b 100644
--- a/www/extras/htmlArea/popups/macros.html
+++ b/www/extras/htmlArea/popups/macros.html
@@ -46,7 +46,6 @@ function returnSelected(in_values) {
Specific SubMenu (Vertical)
Specific SubMenu (Horizontal)
Specific Dropdown Menu
-Synopsis Menu
Top Level Menu (Vertical)
Top Level Menu (Horizontal)
Top Dropdown Menu
@@ -64,8 +63,8 @@ function returnSelected(in_values) {
My Account Link
Can Edit Page Message
Admin Mode Message
-Join Group
+Leave Group
Group Message
Page Editable Toggle
Admin Toggle
@@ -84,10 +83,8 @@ function returnSelected(in_values) {
Page Title
Make Page Printable
Root Title
-Search Box
Extras Folder
-Admin Bar
-Separator
+Admin Bar