[junk-cvs-sync] junk/WEB-INF/classes/junk/controller SearchAction.java,1.4,1.5

[Tyron E. <ty...@us...>]

Update of /cvsroot/junk/junk/WEB-INF/classes/junk/controller
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20813

Modified Files:
	SearchAction.java 
Log Message:
Works with new datasource plugin instead of dscp



Index: SearchAction.java
===================================================================
RCS file: /cvsroot/junk/junk/WEB-INF/classes/junk/controller/SearchAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SearchAction.java	18 Nov 2003 19:14:30 -0000	1.4
--- SearchAction.java	25 Mar 2004 15:08:45 -0000	1.5
***************
*** 41,45 ****
  import org.apache.struts.action.*;
  import org.apache.struts.util.*;
! 
  
  /** Action Class takes care of processing search requests.
--- 41,45 ----
  import org.apache.struts.action.*;
  import org.apache.struts.util.*;
! import junk.plugin.database.*;
  
  /** Action Class takes care of processing search requests.
***************
*** 130,134 ****
                  // Get a Connection from the DatasourceConnectionPool
                  dataSource = getDataSource(httpServletRequest);
!                 myConnection = dataSource.getConnection();
  
                  // Start search via DBNetFiles DB - Helper Class
--- 130,136 ----
                  // Get a Connection from the DatasourceConnectionPool
                  dataSource = getDataSource(httpServletRequest);
!                
!                 myConnection = ((ConnectionProvider)getServlet().getServletContext().getAttribute(DatabasePlugin.KEY_DATABASE_CON)).getConnection();
!                 // myConnection = dataSource.getConnection();
  
                  // Start search via DBNetFiles DB - Helper Class