fixin...

git-svn-id: svn://svn.open-ils.org/ILS/trunk@772 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/extras/opensearch.pm b/Open-ILS/src/extras/opensearch.pm
index 479334c..a5dbe8e 100644 (file)
--- a/Open-ILS/src/extras/opensearch.pm
+++ b/Open-ILS/src/extras/opensearch.pm
@@ -17,7 +17,7 @@ use OpenSRF::System;
 
 my $child_init_ttk = "opensearch.ttk";
 
-my $includes = [ '/pines/cvs/ILS/Open-ILS/src/templates' ];
+my $includes = [ '/pines/cvs/ILS/Open-ILS/src/extras' ];
 
 my $plugin_base = 'OpenILS::Template::Plugin';
 
@@ -29,7 +29,7 @@ sub handler {
        _process_template(
                        apache          => $apache,
                        template                => 'opensearch.ttk',
-                       pre_process     => $init_ttk );
+                       );
 
        return Apache::OK;
 }
@@ -67,8 +67,7 @@ sub _process_template {
                        my $err = $template->error();
                        $err =~ s/\n/\<br\/\>/g;
                        warn "Error processing template $ttk\n";        
-                       my $string =  "<br><b>Unable to process template:<br/><br/> " . $err . "!!!</b>";
-                       $template->process( $error_ttk , { error => $string } );
+                       print "<br><b>Unable to process template:<br/><br/> " . $err . "!!!</b>";
                }
 
        } catch Error with {

diff --git a/Open-ILS/src/extras/opensearch.ttk b/Open-ILS/src/extras/opensearch.ttk
index 91a43a9..b2b210d 100644 (file)
--- a/Open-ILS/src/extras/opensearch.ttk
+++ b/Open-ILS/src/extras/opensearch.ttk
@@ -1,7 +1,7 @@
 [%-
 USE CGI;
-USE WebSession;
-WebSession.bootstrap();
+USE ws = WebSession;
+ws.bootstrap_client("/pines/conf/bootstrap.conf");
 
 rank_threshold = 5000;
 
@@ -13,7 +13,7 @@ count_meth = 'open-ils.search.biblio.class.count';
 #type,string,location,depth,limit,offset
 search_meth = 'open-ils.search.biblio.class';
 
-session = WebSession.init_app_session('open-ils.search');
+session = ws.init_app_session('open-ils.search');
 
 type = CGI.param('mr_search_type');
 string = CGI.param('mr_search_query');