Changeset 7267 for RevitalizationWS/ws/DiscoveryService/trunk/src/main/java

Timestamp:

04/08/10 10:38:59 (9 years ago)

Author:

mnagni

Message:

Minor changes to some Exception strategy

Location:

RevitalizationWS/ws/DiscoveryService/trunk/src/main/java/ndg/services

Files:

• discovery/model/CommonMethods.java (modified) (2 diffs)
• discovery/model/PresentAgent.java (modified) (6 diffs)
• discovery/model/SearchAgent.java (modified) (2 diffs)
• schemas/discovery/DiscoveryServiceSkeleton.java (modified) (5 diffs)

RevitalizationWS/ws/DiscoveryService/trunk/src/main/java/ndg/services/discovery/model/CommonMethods.java

@@ -11 +11 @@
 import ndg.common.NdgMessage;
 import ndg.common.exception.AssembleQueryException;
-import ndg.common.exception.NdgException;
 import ndg.common.exception.NdgSQLException;
 import ndg.common.exception.ResourceNotAvailable;
@@ -121 +120 @@
         
         String assembleSearch(SearchCriteria criteria, RetrieveCriteriaType retrieveType) 
-                        throws NdgException{
+                throws AssembleQueryException{
 
                 // NB, we use the postgres text search function to do term searches

RevitalizationWS/ws/DiscoveryService/trunk/src/main/java/ndg/services/discovery/model/PresentAgent.java

@@ -15 +15 @@
 import ndg.common.NdgLogger;
 import ndg.common.NdgMessage;
+import ndg.common.exception.AssembleQueryException;
 import ndg.common.exception.NdgException;
 import ndg.common.exception.NdgSQLException;
@@ -21 +22 @@
 import ndg.services.discovery.basic.DiscoveryDictionary;
 import ndg.services.discovery.basic.DiscoveryDictionary.OriginalDocumentToTable;
+import ndg.services.jpa.OriginalDocument;
 import ndg.services.schemas.discovery.BoundingBoxType;
 import ndg.services.schemas.discovery.DateRangeType;
@@ -28 +30 @@
 import ndg.services.schemas.discovery.TemporalType;
 import ndg.services.schemas.discovery.SearchType.SearchCriteria;
-import ndg.services.jpa.OriginalDocument;
 
 import org.apache.log4j.Level;
@@ -203 +204 @@
          */
         public List<OriginalDocument> doPresent(Connection conn, List<String> documentsId, RetrieveCriteriaType type)
-                        throws NdgException {
+                        throws NdgSQLException, AssembleQueryException, ResourceNotAvailable {
                 if (documentsId == null || documentsId.size() == 0)
                         return new ArrayList<OriginalDocument>();
@@ -276 +277 @@
                         start = rs.getTimestamp("start_time");
                         if (start != null) {
-                                calendar = calendar.getInstance();
+                                calendar = Calendar.getInstance();
                                 calendar.setTimeInMillis(start.getTime());
                         } else {
@@ -287 +288 @@
                         end = rs.getTimestamp("end_time");
                         if (end != null) {
-                                calendar = calendar.getInstance();
+                                calendar = Calendar.getInstance();
                                 calendar.setTimeInMillis(end.getTime());
                         } else {

RevitalizationWS/ws/DiscoveryService/trunk/src/main/java/ndg/services/discovery/model/SearchAgent.java

@@ -90 +90 @@
                         // NdgMessage msg = new NdgMessage("sql.resultset.parsing.error",
                         // new Object[] { sqlQuery });
-                } catch (NdgException e) {
-                        logHelper.logMessage(e, Level.ERROR);
-                        throw new NdgException(e.getBundlMessage());
                 } finally {
                         commitOrRollback(conn, commit);
@@ -112 +109 @@
          *             if an error during the database access
          **/
-        private List<OriginalDocument> searchDocuments(Connection conn, SearchCriteria criteria) throws NdgException {
+        private List<OriginalDocument> searchDocuments(Connection conn, SearchCriteria criteria) throws AssembleQueryException, NdgSQLException, ResourceNotAvailable {
                 List<OriginalDocument> res = new ArrayList<OriginalDocument>();
                 List<String> toFilter = executeSearch(conn, assembleSearch(criteria, searchType.getRetrieveCriteria()));

RevitalizationWS/ws/DiscoveryService/trunk/src/main/java/ndg/services/schemas/discovery/DiscoveryServiceSkeleton.java

@@ -4 +4 @@
 import java.lang.reflect.InvocationTargetException;
 import java.sql.Connection;
-import java.sql.PreparedStatement;
 import java.sql.SQLException;
-import java.sql.Timestamp;
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.List;
 
@@ -14 +11 @@
 import ndg.common.NdgMessage;
 import ndg.common.exception.NdgException;
-import ndg.common.exception.ResourceNotAvailable;
 import ndg.services.discovery.basic.DiscoveryBasic;
 import ndg.services.discovery.basic.DiscoveryDictionary;
@@ -23 +19 @@
 import ndg.services.discovery.model.SearchAgent;
 import ndg.services.jpa.OriginalDocument;
-import ndg.services.schemas.discovery.CustomInfo;
-import ndg.services.schemas.discovery.DiscoveryServiceSkeletonInterface;
-import ndg.services.schemas.discovery.DoPresentDocument;
-import ndg.services.schemas.discovery.DoPresentReturnDocument;
-import ndg.services.schemas.discovery.DoSearchDocument;
-import ndg.services.schemas.discovery.DoSearchReturnDocument;
-import ndg.services.schemas.discovery.Documents;
-import ndg.services.schemas.discovery.GetListDocument;
-import ndg.services.schemas.discovery.GetListNamesDocument;
-import ndg.services.schemas.discovery.GetListNamesReturnDocument;
-import ndg.services.schemas.discovery.GetListNamesReturnType;
-import ndg.services.schemas.discovery.GetListReturnDocument;
-import ndg.services.schemas.discovery.GetListReturnType;
-import ndg.services.schemas.discovery.GetListType;
-import ndg.services.schemas.discovery.OrderByType;
-import ndg.services.schemas.discovery.OrderingMetricType;
-import ndg.services.schemas.discovery.PresentReturnType;
-import ndg.services.schemas.discovery.RetrieveCriteriaType;
-import ndg.services.schemas.discovery.ReturnBriefType;
-import ndg.services.schemas.discovery.ReturnFullType;
-import ndg.services.schemas.discovery.ReturnSimpleType;
-import ndg.services.schemas.discovery.ReturnSummaryType;
-import ndg.services.schemas.discovery.SearchReturnType;
-import ndg.services.schemas.discovery.SearchType;
-import ndg.services.schemas.discovery.SimpleDocument1;
-import ndg.services.schemas.discovery.TermSearchType;
 import ndg.services.schemas.discovery.SearchType.SearchCriteria;
 
-import org.apache.axis2.context.MessageContext;
 import org.apache.log4j.Level;
 
@@ -60 +29 @@
  */
 public class DiscoveryServiceSkeleton implements DiscoveryServiceSkeletonInterface {
-
-        private static String insLogSQL = "INSERT INTO discoverySearchLogging(search_term, date_of_search, scope, originator_IP, number_results_returned) values (?,?,?,?,?)";
 
         private NdgLogger logHelper = DiscoveryBasic.getInstance().getNdgInstance(
@@ -431 +398 @@
                 type.setDocumentId(result.getOriginalDocumentFilename());
         }
-
-        private void logClientIP(SearchReturnType responseContent, DoSearchDocument doSearch) {
-                String ipAddress = "";
-                MessageContext messageContext = MessageContext.getCurrentMessageContext();
-                if (messageContext != null) {
-                        ipAddress = (String) messageContext.getProperty(MessageContext.REMOTE_ADDR);
-                }
-                try {
-                        insertInLogDB(doSearch, responseContent, ipAddress);
-                } catch (ResourceNotAvailable e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                } catch (SQLException e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                }
-                NdgMessage msg = new NdgMessage("client.ip", new Object[] { ipAddress });
-                logHelper.logMessage(msg, Level.INFO);
-        }
-
-        private void insertInLogDB(DoSearchDocument doSearch, SearchReturnType responseContent, String clientIP)
-                        throws SQLException, ResourceNotAvailable {
-                Connection conn = DiscoveryBasic.getInstance().getLogConnection();
-                PreparedStatement stat = conn.prepareStatement(insLogSQL);
-                String termSearch = doSearch.getDoSearch() != null ? assembleTermSearch(doSearch.getDoSearch()
-                                .getSearchCriteria()) : null;
-                stat.setString(1, termSearch);
-                stat.setTimestamp(2, new Timestamp(Calendar.getInstance().getTimeInMillis()));
-                String scope = doSearch.getDoSearch() != null ? getScope(doSearch.getDoSearch().getScopeArray()) : null;
-                stat.setString(3, scope);
-                stat.setString(4, clientIP);
-                stat.setInt(5, responseContent.getHits());
-                stat.executeUpdate();
-                if (conn != null)
-                        conn.close();
-        }
-
-        private String getScope(String[] scopes) {
-                StringBuffer sb = new StringBuffer();
-                for (String item : scopes) {
-                        sb.append(item);
-                        sb.append(", ");
-                }
-                if (sb.length() > 0)
-                        sb.delete(sb.length() - 2, sb.length());
-                return sb.toString();
-        }
-
-        private String assembleTermSearch(SearchCriteria criteria) {
-                StringBuffer sb = new StringBuffer();
-                for (TermSearchType ts : criteria.getTermSearchArray()) {
-                        sb.append(ts.getTerm());
-                        sb.append(", ");
-                }
-                if (sb.length() > 0)
-                        sb.delete(sb.length() - 2, sb.length());
-                return sb.toString();
-        }
 }