Changeset 8173
- Timestamp:
- 21/03/12 12:46:22 (9 years ago)
- Location:
- mauRepo/revitalizationProject/branches/MEDIN/dpws/src/main/java/ndg/services
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
mauRepo/revitalizationProject/branches/MEDIN/dpws/src/main/java/ndg/services/discovery/basic/DiscoveryDictionaryDPWS.java
r8171 r8173 153 153 * */ 154 154 public static ListNamesItem getRecordDetails(String label) throws NdgExecutionException{ 155 return getListNameItem("RecordDetail sList", label);155 return getListNameItem("RecordDetailList", label); 156 156 } 157 157 -
mauRepo/revitalizationProject/branches/MEDIN/dpws/src/main/java/ndg/services/jpa/ListNames.java
r8126 r8173 81 81 this.listNamesItems = listNamesItems; 82 82 } 83 84 @Override 85 public String toString() { 86 return "ListNames [name=" + name + ", label=" + label + "]"; 87 } 83 88 } -
mauRepo/revitalizationProject/branches/MEDIN/dpws/src/main/java/ndg/services/revitalization/ejb/discovery/DiscoveryService.java
r8172 r8173 31 31 import javax.sql.DataSource; 32 32 33 import ndg.common.exception.AssembleQueryException;34 33 import ndg.common.exception.NdgException; 35 34 import ndg.common.exception.NdgExecutionException; 36 35 import ndg.common.exception.NdgSQLException; 37 import ndg.common.exception.ResourceNotAvailable;38 36 import ndg.services.jpa.ListNames; 39 37 import ndg.services.jpa.ListNamesItem; … … 100 98 Query query = em.createNamedQuery("findListNamesByLabel"); 101 99 query.setParameter("label", label); 102 return ListNames.class.cast(query.getSingleResult());100 return executeSingleResult(query, ListNames.class); 103 101 } 104 102 105 103 @Override 106 public ListNames getNamesListByName(String name) throws NoResultException{104 public ListNames getNamesListByName(String name) { 107 105 Query query = em.createNamedQuery("findListNamesByName"); 108 106 query.setParameter("name", name); 109 return ListNames.class.cast(query.getSingleResult());107 return executeSingleResult(query, ListNames.class); 110 108 } 111 109 … … 114 112 Query query = em.createNamedQuery("findListNamesItemByLabel"); 115 113 query.setParameter("label", label); 116 return ListNamesItem.class.cast(query.getSingleResult());114 return executeSingleResult(query, ListNamesItem.class); 117 115 } 118 116 … … 121 119 Query query = em.createNamedQuery("findLisNamesItemtByName"); 122 120 query.setParameter("name", name); 123 return ListNamesItem.class.cast(query.getSingleResult());121 return executeSingleResult(query, ListNamesItem.class); 124 122 } 125 123 … … 129 127 query.setParameter("listName", listName); 130 128 query.setParameter("itemName", itemName); 131 return ListNamesItem.class.cast(query.getSingleResult());129 return executeSingleResult(query, ListNamesItem.class); 132 130 } 133 131 -
mauRepo/revitalizationProject/branches/MEDIN/dpws/src/main/java/ndg/services/revitalization/ejb/discovery/SearchHelper.java
r8172 r8173 8 8 import java.util.Comparator; 9 9 import java.util.List; 10 11 import javax.persistence.NoResultException;12 10 13 11 import ndg.common.TermParser; … … 107 105 private List<OriginalDocument> searchDocuments(DoSearchType doSearchType) throws NdgExecutionException, AssembleQueryException, NdgSQLException, ResourceNotAvailable { 108 106 List<OriginalDocument> res = new ArrayList<OriginalDocument>(); 109 107 List<String> toFilter = executeSearch(conn, assembleSearch(doSearchType)); 110 108 111 109 /* -- sets the number of hits -- */ … … 194 192 TermSearchType newTS = null; 195 193 ObjectFactory of = new ObjectFactory(); 196 ListNames listNames = null; 197 try { 198 listNames = EJBBeanFactory.getDiscoveryService().getNamesListByName(DiscoveryDictionaryDPWS.TERM_TARGET); 199 } catch (NoResultException ex) { 200 return retList; 194 ListNames listNames = EJBBeanFactory.getDiscoveryService().getNamesListByName(DiscoveryDictionaryDPWS.TERM_TARGET); 195 196 if (listNames == null) { 197 throw new NdgExecutionException("No TermTargetsList exists"); 201 198 } 202 199 … … 263 260 try { 264 261 listNamesItem = EJBBeanFactory.getDiscoveryService().getNamesListItemByLabel(termType.getTermTarget()); 265 } catch (NoResultException e) {266 throw new AssembleQueryException(e);267 262 } catch (NdgExecutionException e) { 268 263 throw new AssembleQueryException(e); 264 } 265 266 if (listNamesItem == null) { 267 throw new AssembleQueryException("Required TermTarget does not exist"); 269 268 } 270 269 //logHelper.logMessage("Search term - TermTarget: " + term + " - " + termTarget, Level.DEBUG); -
mauRepo/revitalizationProject/branches/MEDIN/dpws/src/main/java/ndg/services/revitalization/ejb/interfaces/DiscoveryServiceLocal.java
r8126 r8173 53 53 54 54 public List<ListNames> getAllNamesList(); 55 public ListNames getNamesListByLabel(String label) throws NoResultException;56 public ListNames getNamesListByName(String name) throws NoResultException;57 public ListNamesItem getNamesListItemByLabel(String label) throws NoResultException;58 public ListNamesItem getNamesListItemByName(String name) throws NoResultException;59 public ListNamesItem getListNamesItemByParentAndName(String listName, String itemName) throws NoResultException;55 public ListNames getNamesListByLabel(String label); 56 public ListNames getNamesListByName(String name); 57 public ListNamesItem getNamesListItemByLabel(String label); 58 public ListNamesItem getNamesListItemByName(String name); 59 public ListNamesItem getListNamesItemByParentAndName(String listName, String itemName); 60 60 } -
mauRepo/revitalizationProject/branches/MEDIN/dpws/src/main/java/ndg/services/revitalization/ejb/interfaces/DiscoveryServiceRemote.java
r8126 r8173 53 53 54 54 public List<ListNames> getAllNamesList(); 55 public ListNames getNamesListByLabel(String label) throws NoResultException;56 public ListNames getNamesListByName(String name) throws NoResultException;57 public ListNamesItem getNamesListItemByLabel(String label) throws NoResultException;58 public ListNamesItem getNamesListItemByName(String name) throws NoResultException;59 public ListNamesItem getListNamesItemByParentAndName(String listName, String itemName) throws NoResultException;55 public ListNames getNamesListByLabel(String label); 56 public ListNames getNamesListByName(String name); 57 public ListNamesItem getNamesListItemByLabel(String label); 58 public ListNamesItem getNamesListItemByName(String name); 59 public ListNamesItem getListNamesItemByParentAndName(String listName, String itemName); 60 60 } -
mauRepo/revitalizationProject/branches/MEDIN/dpws/src/main/java/ndg/services/revitalization/executor/DiscoveryServiceExecutor.java
r8170 r8173 5 5 import java.util.ArrayList; 6 6 import java.util.List; 7 8 import javax.persistence.NoResultException; 7 9 8 10 import ndg.common.MessageFormatter; … … 191 193 try { 192 194 listNames = EJBBeanFactory.getDiscoveryService().getNamesListByLabel(name); 193 status = true;194 195 } catch (NdgExecutionException e) { 195 196 statusMsg = "Generic Error"; 196 197 } 197 for (ListNamesItem item : listNames.getListNamesItems()) { 198 response.getList().getListMember().add(ListNamesItem.class.cast(item).getLabel()); 199 } 200 198 199 if (listNames != null) { 200 for (ListNamesItem item : listNames.getListNamesItems()) { 201 response.getList().getListMember().add(ListNamesItem.class.cast(item).getLabel()); 202 } 203 status = true; 204 } else { 205 statusMsg = "No results"; 206 } 207 201 208 response.setStatus(status); 202 209 response.setStatusMessage(statusMsg);
Note: See TracChangeset
for help on using the changeset viewer.