Changeset 8172

Timestamp:

20/03/12 15:14:43 (8 years ago)

Author:

mnagni

Message:

improved the excpetion chain

Location:

mauRepo/revitalizationProject/branches/MEDIN/dpws/src/main/java/ndg/services/revitalization/ejb/discovery

Files:

• CommonMethods.java (modified) (2 diffs)
• DiscoveryService.java (modified) (2 diffs)
• PresentHelper.java (modified) (5 diffs)
• SearchHelper.java (modified) (9 diffs)

mauRepo/revitalizationProject/branches/MEDIN/dpws/src/main/java/ndg/services/revitalization/ejb/discovery/CommonMethods.java

@@ -35 +35 @@
          * the SELECT clause where the fields used by the ORDER BY clause have to be
          * added.
-         * @throws AssembleQueryException 
-         * @throws NdgExecutionException 
+         * @throws AssembleQueryException  
          * */
         StringBuffer getOrderBy(RetrieveCriteriaType criteria, StringBuffer sqlCmd) throws AssembleQueryException {
@@ -66 +65 @@
                                 // name?
                                 if (order.getOrderByDirection() != null) {
-                                        ListNamesItem direction = DiscoveryDictionaryDPWS.getOrderDirection(order
-                                                        .getOrderByDirection().toString());
-                                        /*
-                                         * -- Append direction for the ORDER BY specific field --
-                                         */
-                                        orderSQL.append(" ");
-                                        orderSQL.append(direction.getName());
+                                        try {
+                                                ListNamesItem direction = DiscoveryDictionaryDPWS.getOrderDirection(order
+                                                                .getOrderByDirection().toString());
+                                                /*
+                                                 * -- Append direction for the ORDER BY specific field --
+                                                 */
+                                                orderSQL.append(" ");
+                                                orderSQL.append(direction.getName());
+                                        } catch (NdgExecutionException e) {
+                                                throw new AssembleQueryException(e);
+                                        }
+
                                 }
 

mauRepo/revitalizationProject/branches/MEDIN/dpws/src/main/java/ndg/services/revitalization/ejb/discovery/DiscoveryService.java

@@ -141 +141 @@
                 } catch (SQLException e) {
                         throw new NdgExecutionException(e);
-                } catch (NdgSQLException e) {
-                        throw new NdgExecutionException(e);
-                } catch (AssembleQueryException e) {
-                        throw new NdgExecutionException(e);
-                } catch (ResourceNotAvailable e) {
+                } catch (NdgException e) {
                         throw new NdgExecutionException(e);
                 } finally {
@@ -165 +161 @@
                         throw new NdgExecutionException(e);
                 } catch (NdgSQLException e) {
-                        throw new NdgExecutionException(e);
-                } catch (AssembleQueryException e) {
-                        throw new NdgExecutionException(e);
-                } catch (ResourceNotAvailable e) {
                         throw new NdgExecutionException(e);
                 } catch (NdgException e) {

mauRepo/revitalizationProject/branches/MEDIN/dpws/src/main/java/ndg/services/revitalization/ejb/discovery/PresentHelper.java

@@ -20 +20 @@
 import ndg.common.exception.AssembleQueryException;
 import ndg.common.exception.NdgException;
+import ndg.common.exception.NdgExecutionException;
 import ndg.common.exception.NdgSQLException;
 import ndg.common.exception.ResourceNotAvailable;
@@ -98 +99 @@
         @Override
         void assembleSearchQuery(StringBuffer selectSQL, StringBuffer fromSQL, StringBuffer whereSQL,
-                        SearchCriteria criteria, RetrieveCriteriaType retrieveType) {
+                        SearchCriteria criteria, RetrieveCriteriaType retrieveType) throws AssembleQueryException {
 
                 String customInfo = "dataset_metadata_update_date, original_document.authors, original_document.parameters, original_document.resource_type, original_document.topic_category, original_document.lineage, original_document.limitations_public_access, original_document.data_originator, original_document.original_format_name, original_document.resource_locator";
 
                 String recDetail = retrieveType == null ? null : retrieveType.getRecordDetail();
-                ListNamesItem detail = DiscoveryDictionaryDPWS.getRecordDetails(recDetail);
+                ListNamesItem detail;
+                try {
+                        detail = DiscoveryDictionaryDPWS.getRecordDetails(recDetail);
+                } catch (NdgExecutionException e) {
+                        throw new AssembleQueryException(e);
+                }
                 /** all the IFs should be revisited */
                 /*
@@ -141 +147 @@
                 /* ----- FORMAT ----- */
                 String formType = retrieveType != null ? retrieveType.getRecordDetail() : null;
-                ListNamesItem details = DiscoveryDictionaryDPWS.getRecordDetails(formType);
+                ListNamesItem details = null;
+                try {
+                        details = DiscoveryDictionaryDPWS.getRecordDetails(formType);
+                } catch (NdgExecutionException e) {
+                        throw new AssembleQueryException(e);
+                }
+                
                 if (details.getLabel().equals(DiscoveryDictionaryDPWS.RECORD_DETAIL_DOCUMENT_FULL)) {
                         String metaFormat = retrieveType == null ? null : retrieveType.getMetadataFormat();
@@ -149 +161 @@
 
         private void preapareFormatCondition(StringBuffer selectSQL, StringBuffer fromSQL, StringBuffer whereSQL,
-                        String format) {
-                ListNamesItem docFormat = DiscoveryDictionaryDPWS.getMetadataFormat(format);
+                        String format) throws AssembleQueryException {
+                ListNamesItem docFormat = null;
+                try {
+                        docFormat = DiscoveryDictionaryDPWS.getMetadataFormat(format);
+                } catch (NdgExecutionException e) {
+                        throw new AssembleQueryException(e);
+                }
+ 
 
                 checkFROMComma(selectSQL, false);
@@ -245 +263 @@
                 }
                 List<OriginalDocument> searchResult = executeSearch(conn, sqlQuery);
-                
-                ListNamesItem detail = DiscoveryDictionaryDPWS.getRecordDetails(type == null ? null : type
-                                .getRecordDetail());
+                                
+                ListNamesItem detail;
+                try {
+                        detail = DiscoveryDictionaryDPWS.getRecordDetails(type == null ? null : type
+                                        .getRecordDetail());
+                } catch (NdgExecutionException e) {
+                        throw new AssembleQueryException(e);
+                }
                 if (detail.getLabel().equals(DiscoveryDictionaryDPWS.RECORD_DETAIL_DOCUMENT_FULL)
                                 || detail.getLabel().equals(DiscoveryDictionaryDPWS.RECORD_DETAIL_DOCUMENT_SUMMARY)) {

mauRepo/revitalizationProject/branches/MEDIN/dpws/src/main/java/ndg/services/revitalization/ejb/discovery/SearchHelper.java

@@ -82 +82 @@
          */
         public List<OriginalDocument> doSearch() throws NdgException, ResourceNotAvailable {
-                DiscoveryDictionaryDPWS.refreshListNames(); 
-                
                 List<OriginalDocument> searchResult = null;
                 searchResult = searchDocuments(searchType);
@@ -140 +138 @@
                 try {
                         preapareTermSearch(fromSQL, whereSQL, criteria.getTermSearch());
+                        /* -- is a SpatialSearch? -- */
+                        preapareSpatialSearch(fromSQL, whereSQL, criteria.getSpatialSearch());
+
+                        /* -- is a TemporalSearch? -- */
+                        preapareTemporalSearch(fromSQL, whereSQL, criteria.getTemporalSearch());
+
+                        /* -- defines the ResourceLocator status? -- */ 
+                        Boolean rl = criteria.getResourceLocator() != null ? criteria.getResourceLocator().getValue() : null;
+                        preapareResourceLocatorSearch(fromSQL, whereSQL, rl);   
+
+                        /* -- has Scope request? -- */
+                        preapareScopeSearch(fromSQL, whereSQL, searchType.getScope());
+
+                        /* -- has an OriginalFormat request? -- */
+                        preapareOriginalFormatSearch(fromSQL, whereSQL, searchType.getOriginalFormat());
                 } catch (NdgExecutionException e) {
                         throw new AssembleQueryException(e);
-                }
-
-                /* -- is a SpatialSearch? -- */
-                preapareSpatialSearch(fromSQL, whereSQL, criteria.getSpatialSearch());
-
-                /* -- is a TemporalSearch? -- */
-                preapareTemporalSearch(fromSQL, whereSQL, criteria.getTemporalSearch());
-
-                /* -- defines the ResourceLocator status? -- */ 
-                Boolean rl = criteria.getResourceLocator() != null ? criteria.getResourceLocator().getValue() : null;
-                preapareResourceLocatorSearch(fromSQL, whereSQL, rl);   
-
-                /* -- has Scope request? -- */
-                preapareScopeSearch(fromSQL, whereSQL, searchType.getScope());
-
-                /* -- has an OriginalFormat request? -- */
-                preapareOriginalFormatSearch(fromSQL, whereSQL, searchType.getOriginalFormat());                
+                }               
         }
 
@@ -233 +230 @@
         
         private void preapareTermSearch(StringBuffer fromSQL, StringBuffer whereSQL, List<TermSearchType> oterms)
-                        throws AssembleQueryException, NdgExecutionException {
+                        throws AssembleQueryException {
                 if (oterms == null || oterms.size() == 0) {
                         return;
@@ -244 +241 @@
                 TermParser parser = new TermParser();
                 String[] phrases = null;
-                List<TermSearchType> terms = aggregateTermTarget(oterms);
+                List<TermSearchType> terms;
+                try {
+                        terms = aggregateTermTarget(oterms);
+                } catch (NdgExecutionException e) {
+                        throw new AssembleQueryException(e);
+                }
                 for (TermSearchType termType : terms) {
                         String term = termType.getTerm();
@@ -258 +260 @@
                         term = parser.parseTerm(term);  
 
-                        ListNamesItem listNamesItem = EJBBeanFactory.getDiscoveryService().getNamesListItemByLabel(termType.getTermTarget());
+                        ListNamesItem listNamesItem;
+                        try {
+                                listNamesItem = EJBBeanFactory.getDiscoveryService().getNamesListItemByLabel(termType.getTermTarget());
+                        } catch (NoResultException e) {
+                                throw new AssembleQueryException(e);
+                        } catch (NdgExecutionException e) {
+                                throw new AssembleQueryException(e);
+                        }
                         //logHelper.logMessage("Search term - TermTarget: " + term + " - " + termTarget, Level.DEBUG);
 
@@ -307 +316 @@
         }
 
-        private void preapareTemporalSearch(StringBuffer fromSQL, StringBuffer whereSQL, TemporalType temporalType) {
+        private void preapareTemporalSearch(StringBuffer fromSQL, StringBuffer whereSQL, TemporalType temporalType) throws NdgExecutionException {
                 if (temporalType == null || temporalType.getDateRange() == null
                                 || temporalType.getDateRange().getDate().size() == 0) {
@@ -408 +417 @@
         }       
         
-        private void preapareSpatialSearch(StringBuffer fromSQL, StringBuffer whereSQL, SpatialType spatialType) {
+        private void preapareSpatialSearch(StringBuffer fromSQL, StringBuffer whereSQL, SpatialType spatialType) throws NdgExecutionException {
                 if (spatialType == null) {
                         return;
@@ -466 +475 @@
         }
 
-        private void preapareScopeSearch(StringBuffer fromSQL, StringBuffer whereSQL, List<String> scopes) {
+        private void preapareScopeSearch(StringBuffer fromSQL, StringBuffer whereSQL, List<String> scopes) throws NdgExecutionException {
                 if (scopes == null || scopes.size() == 0) {
                         return;
@@ -504 +513 @@
         }
 
-        void preapareOriginalFormatSearch(StringBuffer fromSQL, StringBuffer whereSQL, String originalFormat) {
+        void preapareOriginalFormatSearch(StringBuffer fromSQL, StringBuffer whereSQL, String originalFormat) throws NdgExecutionException {
                 if (originalFormat == null) {
                         return;