Changeset 5077

Timestamp:

09/21/09 15:47:50 (3 years ago)

Author:

AndrewJones

Message:

Item1363: Missed a preference setting when I moved them to configure

Location:

trunk/SearchEngineKinoSearchAddOn/lib/Foswiki/Contrib/SearchEngineKinoSearchAddOn

Files:

• Config.spec (modified) (1 diff)
• Search.pm (modified) (4 diffs)

trunk/SearchEngineKinoSearchAddOn/lib/Foswiki/Contrib/SearchEngineKinoSearchAddOn/Config.spec

@@ -34 +34 @@
 
 # **BOOLEAN**
-# Search attachments only
+# Provide a link in the templates to search attachments only
 $Foswiki::cfg{SearchEngineKinoSearchAddOn}{SearchAttachmentsOnly} = '0';
+
+# **STRING**
+# Attachments only label. Provides a link to search for attachments only if $Foswiki::cfg{SearchEngineKinoSearchAddOn}{SearchAttachmentsOnly} is true.
+$Foswiki::cfg{SearchEngineKinoSearchAddOn}{AttachmentsOnlyLabel} = 'Show only attachments';
 
 # **SELECT antiword,wv,abiword**

trunk/SearchEngineKinoSearchAddOn/lib/Foswiki/Contrib/SearchEngineKinoSearchAddOn/Search.pm

@@ -36 +36 @@
     my $searcher = Foswiki::Contrib::SearchEngineKinoSearchAddOn::Search->newSearch();
     
-    my $text = $searcher->search($Foswiki::cfg{SearchEngineKinoSearchAddOn}{Debug}, $session);
+    my $text = $searcher->search(undef, $session);
   
     $session->writeCompletePage($text, 'view');
@@ -45 +45 @@
     my ($self, $debug, $session) = (@_);
     
-    $self->{Debug}   = $debug;
+    $self->{Debug}   = $debug || $Foswiki::cfg{SearchEngineKinoSearchAddOn}{Debug} || 0;
     $session ||= $Foswiki::Plugins::SESSION;
     
@@ -66 +66 @@
     my $showlock      = $query->param( "showlock" )  || "";
     my $rss           = $query->param( "rss" )       || "";
+    
+    $debug && Foswiki::Func::writeDebug( "searching:'$search' from:'$webName.$topicName' in web:'$websStr' by:'$remoteUser'" );
 
     # usersearch will be printed out
@@ -127 +129 @@
         $tempVal =~ s/\+/\%2B/go; # just for the above URL
         $tempVal =~ s/\"/\%22/go; # just for the above URL
-        my $attachmentsOnlyLabel = Foswiki::Func::getPreferencesValue( "KINOSEARCHATTACHMENTSONLYLABEL" ) || "Show only attachments";
+        my $attachmentsOnlyLabel = $Foswiki::cfg{SearchEngineKinoSearchAddOn}{AttachmentsOnlyLabel} || "Show only attachments";
         $tmplSearch =~ s/%SEARCHATTACHMENTSONLY%/<a href="%SCRIPTURLPATH%\/kinosearch\/$webName\/?search=$tempVal\%20\%2Battachment:yes">$attachmentsOnlyLabel<\/a>/go;
         $tmplSearch = Foswiki::Func::expandCommonVariables ( $tmplSearch, $topicName, $webName );