[cvs] eforum commit by mtraum: fix deprecated

[JCorporate Ltd]

Log Message:
-----------
fix deprecated

Modified Files:
--------------
    eforum/src/WEB-INF/src/com/jcorporate/eforum/controller:
        Search.java

Revision Data
-------------
Index: Search.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/controller/Search.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/controller/Search.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/controller/Search.java -u -r1.7 -r1.8
--- src/WEB-INF/src/com/jcorporate/eforum/controller/Search.java
+++ src/WEB-INF/src/com/jcorporate/eforum/controller/Search.java
@@ -18,6 +18,9 @@
 // History
 // ================================================================================
 //	$Log$
+//	Revision 1.8  2004/11/11 16:51:28  mtraum
+//	fix deprecated
+//	
 //	Revision 1.7  2004/01/29 23:15:00  dlloyd
 //	change deprecated calls
 //	
@@ -79,7 +82,7 @@
 
 /**
  * <p>A special controller action to search the forum, encapsulates
- * the searching tasks, which used to be in the <code>Browse</code>
+ * the searching tasks, which used to be in�the <code>Browse</code>
  * controller and also encapsulates to index forum messages states</p>
  *
  *
@@ -200,7 +203,7 @@
 		session.removePersistentAttribute( SEARCH_RESULT_LIST_KEY );
 		response.addOutput(
 		    new Output("Message1",
-			       "Another indexing task is currently in progress" ));
+			       "Another indexing task is currently in�progress" ));
 		response.addOutput(
 		    new Output("Message2",
 			       "Current Indexing Record = "+progressModel.getIndex()+
@@ -228,10 +231,10 @@
 
 	    // Load the search indexer dynamically
 	    SearchIndexer indexer = SearchIndexerFactory.createInstance(
-		request.getDBName(), getSchema() );
+		request.getDataContext(), getSchema() );
 
 	    // Get the indexer directory pathname
-	    indexerPath	= Setup.getValue( request.getDBName(), getSchema(), "IndexerPath" );
+	    indexerPath	= Setup.getValue( request.getDataContext(), getSchema(), "IndexerPath" );
 
 	    // Set up the index directory path
 	    indexer.setIndexerPath( indexerPath );
@@ -277,7 +280,7 @@
         try {
 	    // FIXME: Only allow administrators to run with indexing
 	    User user = new User();
-	    user.setDBName( request.getDBName() );
+	    user.setDBName( request.getDataContext() );
 	    user.setUid( request.getUid() );
 	    user.retrieve();
 	    if ( !user.isAdmin() ) {
@@ -294,7 +297,7 @@
 		session.removePersistentAttribute( SEARCH_RESULT_LIST_KEY );
 		response.addOutput(
 		    new Output("Message1",
-			       "Another indexing task is currently in progress" ));
+			       "Another indexing task is currently in�progress" ));
 		response.addOutput(
 		    new Output("Message2",
 			       "Current Indexing Record = "+progressModel.getIndex()+
@@ -393,7 +396,7 @@
         try {
 	    // FIXME: Only allow administrators to run with indexing
 	    User user = new User();
-	    user.setDBName( request.getDBName() );
+	    user.setDBName( request.getDataContext() );
 	    user.setUid( request.getUid() );
 	    user.retrieve();
 	    if ( !user.isAdmin() ) {
@@ -474,7 +477,7 @@
         try {
 	    // FIXME: Only allow administrators to run with indexing
 	    User user = new User();
-	    user.setDBName( request.getDBName() );
+	    user.setDBName( request.getDataContext() );
 	    user.setUid( request.getUid() );
 	    user.retrieve();
 	    if ( !user.isAdmin() ) {
@@ -559,7 +562,7 @@
 		// FIXME: i18n the messages
 		response.addOutput(
 		    new Output("Message1",
-			       "Because indexing task is currently in progress, "+
+			       "Because indexing task is currently in�progress, "+
 			       "it is not possible to search the forums. Sorry." ));
 		response.addOutput(
 		    new Output("Message2",
@@ -606,10 +609,10 @@
 
 	    // Load the search indexer dynamically
 	    SearchIndexer indexer = SearchIndexerFactory.createInstance(
-		request.getDBName(), getSchema() );
+		request.getDataContext(), getSchema() );
 
 	    // Get the indexer directory pathname
-	    indexerPath	= Setup.getValue( request.getDBName(), getSchema(), "IndexerPath" );
+	    indexerPath	= Setup.getValue( request.getDataContext(), getSchema(), "IndexerPath" );
 
 	    // Set up the index directory path
 	    indexer.setIndexerPath( indexerPath );
@@ -632,7 +635,7 @@
 	    else if ( sortType == SortType.SORT_BY_DATE )
 		Collections.sort( list, new DefaultSearchResult.DateComparator( reverse ));
 
-	    // Store the search result hit-list directly in the Http
+	    // Store the search result hit-list directly in�the Http
 	    // Session as a List bean, it has to be in session so that
 	    // pagination can work efficiently.
 	    // session.setAttribute( SEARCH_RESULT_LIST_KEY, list );
@@ -649,7 +652,7 @@
      * This controller state to allow the advanced Search form to be
      * pre-populated. This state does nothing except forward to the
      * state's action forward. So this method is in fact a hook method
-     * which will allow the form to be customised for example in web
+     * which will allow the form to be customised for example in�web
      * portal personalisation.
      *
      * @param request The <code>ControllerRequest</code> object