Changeset 7992
- Timestamp:
- 21/11/11 13:09:36 (9 years ago)
- Location:
- RevitalizationWS/ws/DPWS/trunk
- Files:
-
- 5 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
RevitalizationWS/ws/DPWS/trunk/pom.xml
r7987 r7992 4 4 <groupId>ndg.services.dpws</groupId> 5 5 <artifactId>ejb</artifactId> 6 <version>2.1. 0</version>6 <version>2.1.1</version> 7 7 <packaging>ejb</packaging> 8 8 … … 41 41 <configuration> 42 42 <ejbVersion>3.0</ejbVersion> 43 <jarName>dpws-ejb </jarName>43 <jarName>dpws-ejb${version}</jarName> 44 44 <!-- 45 45 <archive> -
RevitalizationWS/ws/DPWS/trunk/src/main/java/ndg/services/discovery/basic/DiscoveryDictionaryDPWS.java
r7925 r7992 13 13 * @author Maurizio Nagni <maurizio.nagni@stcf.ac.uk> 14 14 * */ 15 public final class DiscoveryDictionary {15 public final class DiscoveryDictionaryDPWS { 16 16 17 17 public final static String SPATIAL_DATA_TABLE = "spatial_data"; … … 562 562 * if the label does not exist 563 563 * */ 564 public static DiscoveryDictionary .Scope getScope(String fieldName){564 public static DiscoveryDictionaryDPWS.Scope getScope(String fieldName){ 565 565 Scope ret = null; 566 566 for (Scope orderField : Scope.values()) { -
RevitalizationWS/ws/DPWS/trunk/src/main/java/ndg/services/revitalization/ejb/discovery/CommonMethods.java
r7982 r7992 14 14 import ndg.common.exception.ResourceNotAvailable; 15 15 import ndg.services.discovery.basic.DiscoveryBasicDPWS; 16 import ndg.services.discovery.basic.DiscoveryDictionary ;16 import ndg.services.discovery.basic.DiscoveryDictionaryDPWS; 17 17 import ndg.services.schemas.revitalization.discovery.OrderByType; 18 18 import ndg.services.schemas.revitalization.discovery.RetrieveCriteriaType; … … 36 36 for (OrderByType order : criteria.getOrderBy()) { 37 37 38 DiscoveryDictionary .OrderByField orderField = DiscoveryDictionary.getOrderByField(order38 DiscoveryDictionaryDPWS.OrderByField orderField = DiscoveryDictionaryDPWS.getOrderByField(order 39 39 .getOrderByField()); 40 40 if (orderField == null) … … 53 53 // name? 54 54 if (order.getOrderByDirection() != null) { 55 DiscoveryDictionary .OrderDirection direction = DiscoveryDictionary.getOrderDirection(order55 DiscoveryDictionaryDPWS.OrderDirection direction = DiscoveryDictionaryDPWS.getOrderDirection(order 56 56 .getOrderByDirection().toString()); 57 57 /* … … 125 125 StringBuffer selectSQL = new StringBuffer(); 126 126 selectSQL.append("SELECT distinct original_document_filename, "); 127 selectSQL.append(DiscoveryDictionary .ORIGINAL_DOCUMENT_TABLE);127 selectSQL.append(DiscoveryDictionaryDPWS.ORIGINAL_DOCUMENT_TABLE); 128 128 selectSQL.append(".original_document_id "); 129 129 … … 135 135 136 136 fromSQL.append(" FROM "); 137 fromSQL.append(DiscoveryDictionary .ORIGINAL_DOCUMENT_TABLE);138 fromSQL.append(", " + DiscoveryDictionary .TRANSFORMED_DOCUMENT_TABLE);137 fromSQL.append(DiscoveryDictionaryDPWS.ORIGINAL_DOCUMENT_TABLE); 138 fromSQL.append(", " + DiscoveryDictionaryDPWS.TRANSFORMED_DOCUMENT_TABLE); 139 139 140 140 assembleSearchQuery(selectSQL, fromSQL, whereSQL,criteria, retrieveType); -
RevitalizationWS/ws/DPWS/trunk/src/main/java/ndg/services/revitalization/ejb/discovery/PresentHelper.java
r7982 r7992 9 9 import java.sql.Timestamp; 10 10 import java.util.ArrayList; 11 import java.util.Calendar; 11 12 import java.util.GregorianCalendar; 12 13 import java.util.Iterator; … … 23 24 import ndg.common.exception.ResourceNotAvailable; 24 25 import ndg.services.discovery.basic.DiscoveryBasicDPWS; 25 import ndg.services.discovery.basic.DiscoveryDictionary ;26 import ndg.services.discovery.basic.DiscoveryDictionary .OriginalDocumentToTable;26 import ndg.services.discovery.basic.DiscoveryDictionaryDPWS; 27 import ndg.services.discovery.basic.DiscoveryDictionaryDPWS.OriginalDocumentToTable; 27 28 import ndg.services.jpa.OriginalDocument; 28 29 import ndg.services.schemas.revitalization.discovery.DateValueType; … … 100 101 101 102 String recDetail = retrieveType == null ? null : retrieveType.getRecordDetail(); 102 DiscoveryDictionary .RecordDetail detail = DiscoveryDictionary.getRecordDetails(recDetail);103 DiscoveryDictionaryDPWS.RecordDetail detail = DiscoveryDictionaryDPWS.getRecordDetails(recDetail); 103 104 /** all the IFs should be revisited */ 104 if (detail.equals(DiscoveryDictionary .RecordDetail.DocumentSimple)) {105 106 } 107 if (detail.equals(DiscoveryDictionary .RecordDetail.DocumentBrief)) {105 if (detail.equals(DiscoveryDictionaryDPWS.RecordDetail.DocumentSimple)) { 106 107 } 108 if (detail.equals(DiscoveryDictionaryDPWS.RecordDetail.DocumentBrief)) { 108 109 checkFROMComma(selectSQL, false); 109 110 selectSQL.append(" dataset_name, " + customInfo); 110 111 } 111 if (detail.equals(DiscoveryDictionary .RecordDetail.DocumentSummary)) {112 if (detail.equals(DiscoveryDictionaryDPWS.RecordDetail.DocumentSummary)) { 112 113 checkFROMComma(selectSQL, false); 113 114 selectSQL.append(" dataset_name, dataset_abstract, " + customInfo); 114 115 } 115 if (detail.equals(DiscoveryDictionary .RecordDetail.DocumentFull)) {116 if (detail.equals(DiscoveryDictionaryDPWS.RecordDetail.DocumentFull)) { 116 117 checkFROMComma(selectSQL, false); 117 118 selectSQL.append(" dataset_name, dataset_abstract, " + customInfo); … … 119 120 120 121 checkWHERE_AND(whereSQL, false); 121 whereSQL.append(DiscoveryDictionary .ORIGINAL_DOCUMENT_TABLE);122 whereSQL.append(DiscoveryDictionaryDPWS.ORIGINAL_DOCUMENT_TABLE); 122 123 whereSQL.append(".original_document_filename"); 123 124 whereSQL.append(" IN ("); … … 135 136 /* ----- FORMAT ----- */ 136 137 String formType = retrieveType != null ? retrieveType.getRecordDetail() : null; 137 DiscoveryDictionary .RecordDetail details = DiscoveryDictionary.getRecordDetails(formType);138 if (details.equals(DiscoveryDictionary .RecordDetail.DocumentFull)) {138 DiscoveryDictionaryDPWS.RecordDetail details = DiscoveryDictionaryDPWS.getRecordDetails(formType); 139 if (details.equals(DiscoveryDictionaryDPWS.RecordDetail.DocumentFull)) { 139 140 String metaFormat = retrieveType == null ? null : retrieveType.getMetadataFormat(); 140 141 preapareFormatCondition(selectSQL, fromSQL, whereSQL, metaFormat); … … 144 145 private void preapareFormatCondition(StringBuffer selectSQL, StringBuffer fromSQL, StringBuffer whereSQL, 145 146 String format) { 146 DiscoveryDictionary .MetadataFormat docFormat = DiscoveryDictionary.getMetadataFormat(format);147 DiscoveryDictionaryDPWS.MetadataFormat docFormat = DiscoveryDictionaryDPWS.getMetadataFormat(format); 147 148 148 149 checkFROMComma(selectSQL, false); 149 selectSQL.append(DiscoveryDictionary .TRANSFORMED_DOCUMENT_TABLE);150 selectSQL.append(DiscoveryDictionaryDPWS.TRANSFORMED_DOCUMENT_TABLE); 150 151 selectSQL.append(".transformed_document as "); 151 selectSQL.append(DiscoveryDictionary .FULL_DOCUMENT);152 selectSQL.append(DiscoveryDictionaryDPWS.FULL_DOCUMENT); 152 153 153 154 // checkFROMComma(fromSQL, false); … … 155 156 156 157 checkWHERE_AND(whereSQL, false); 157 whereSQL.append(DiscoveryDictionary .TRANSFORMED_DOCUMENT_TABLE);158 whereSQL.append(DiscoveryDictionaryDPWS.TRANSFORMED_DOCUMENT_TABLE); 158 159 whereSQL.append(".transformed_format = '"); 159 160 whereSQL.append(docFormat.fieldName()); 160 161 whereSQL.append("'"); 161 162 checkWHERE_AND(whereSQL, false); 162 whereSQL.append(DiscoveryDictionary .TRANSFORMED_DOCUMENT_TABLE);163 whereSQL.append(DiscoveryDictionaryDPWS.TRANSFORMED_DOCUMENT_TABLE); 163 164 whereSQL.append(".original_document_id = "); 164 whereSQL.append(DiscoveryDictionary .ORIGINAL_DOCUMENT_TABLE);165 whereSQL.append(DiscoveryDictionaryDPWS.ORIGINAL_DOCUMENT_TABLE); 165 166 whereSQL.append(".original_document_id"); 166 167 } … … 192 193 */ 193 194 NdgMessage msg = new NdgMessage("invocation.error", new Object[] { "Field.get(result)" }); 194 for (OriginalDocumentToTable order : DiscoveryDictionary .OriginalDocumentToTable.values()) {195 for (OriginalDocumentToTable order : DiscoveryDictionaryDPWS.OriginalDocumentToTable.values()) { 195 196 if (columnExist(rs, order.fieldName())) 196 197 try { 197 PropertyDescriptor field = DiscoveryDictionary .getOriginalDocumentProperty(order.getOdField());198 PropertyDescriptor field = DiscoveryDictionaryDPWS.getOriginalDocumentProperty(order.getOdField()); 198 199 Class<?> type = field.getPropertyType(); 199 200 if (String.class.isAssignableFrom(type)) { 200 DiscoveryDictionary .getOriginalDocumentProperty(order.getOdField()).getWriteMethod()201 DiscoveryDictionaryDPWS.getOriginalDocumentProperty(order.getOdField()).getWriteMethod() 201 202 .invoke(od, rs.getString(order.fieldName())); 202 203 } else if (java.sql.Timestamp.class.isAssignableFrom(type)) { 203 DiscoveryDictionary .getOriginalDocumentProperty(order.getOdField()).getWriteMethod()204 DiscoveryDictionaryDPWS.getOriginalDocumentProperty(order.getOdField()).getWriteMethod() 204 205 .invoke(od, rs.getTimestamp((order.fieldName()))); 205 206 } else if (Integer.class.isAssignableFrom(type)) { … … 216 217 } 217 218 } 218 if (columnExist(rs, DiscoveryDictionary .FULL_DOCUMENT))219 od.setOriginalDocument(rs.getString(DiscoveryDictionary .FULL_DOCUMENT));219 if (columnExist(rs, DiscoveryDictionaryDPWS.FULL_DOCUMENT)) 220 od.setOriginalDocument(rs.getString(DiscoveryDictionaryDPWS.FULL_DOCUMENT)); 220 221 return od; 221 222 } … … 238 239 List<OriginalDocument> searchResult = executeSearch(conn, sqlQuery); 239 240 240 DiscoveryDictionary .RecordDetail detail = DiscoveryDictionary.getRecordDetails(type == null ? null : type241 DiscoveryDictionaryDPWS.RecordDetail detail = DiscoveryDictionaryDPWS.getRecordDetails(type == null ? null : type 241 242 .getRecordDetail()); 242 if (detail.equals(DiscoveryDictionary .RecordDetail.DocumentFull)243 || detail.equals(DiscoveryDictionary .RecordDetail.DocumentSummary)) {243 if (detail.equals(DiscoveryDictionaryDPWS.RecordDetail.DocumentFull) 244 || detail.equals(DiscoveryDictionaryDPWS.RecordDetail.DocumentSummary)) { 244 245 fillSpatialTemporalData(searchResult); 245 246 } … … 295 296 start = rs.getTimestamp("start_time"); 296 297 if (start != null) { 298 calendar = new GregorianCalendar(); 297 299 calendar.setTimeInMillis(start.getTime()); 298 } else { 299 calendar = null; 300 } 300 } 301 301 302 try { 302 303 dt.setDateValue(DatatypeFactory.newInstance().newXMLGregorianCalendar(calendar)); -
RevitalizationWS/ws/DPWS/trunk/src/main/java/ndg/services/revitalization/ejb/discovery/SearchHelper.java
r7925 r7992 17 17 import ndg.common.exception.NdgSQLException; 18 18 import ndg.common.exception.ResourceNotAvailable; 19 import ndg.services.discovery.basic.DiscoveryDictionary ;20 import ndg.services.discovery.basic.DiscoveryDictionary .TemporalOperator;21 import ndg.services.discovery.basic.DiscoveryDictionary .TermTarget;19 import ndg.services.discovery.basic.DiscoveryDictionaryDPWS; 20 import ndg.services.discovery.basic.DiscoveryDictionaryDPWS.TemporalOperator; 21 import ndg.services.discovery.basic.DiscoveryDictionaryDPWS.TermTarget; 22 22 import ndg.services.jpa.OriginalDocument; 23 23 import ndg.services.schemas.revitalization.discovery.BoundingBoxType; … … 220 220 boolean firstTerm = true; 221 221 for (TermSearchType ts : termsType) { 222 if (tt.equals(DiscoveryDictionary .getTermType(ts.getTermTarget()))) {222 if (tt.equals(DiscoveryDictionaryDPWS.getTermType(ts.getTermTarget()))) { 223 223 if (newTS.getTerm() == null) { 224 224 newTS.setTerm(ts.getTerm()); … … 265 265 term = parser.parseTerm(term); 266 266 267 DiscoveryDictionary .TermTarget termTarget = DiscoveryDictionary.getTermType(termType.getTermTarget());267 DiscoveryDictionaryDPWS.TermTarget termTarget = DiscoveryDictionaryDPWS.getTermType(termType.getTermTarget()); 268 268 //logHelper.logMessage("Search term - TermTarget: " + term + " - " + termTarget, Level.DEBUG); 269 269 … … 303 303 } 304 304 305 private String composeVector(DiscoveryDictionary .TermTarget termTarget) {305 private String composeVector(DiscoveryDictionaryDPWS.TermTarget termTarget) { 306 306 StringBuffer bf = new StringBuffer(); 307 307 bf.append(termTarget.isVector() ? "" : "to_tsvector"); … … 318 318 319 319 DateRangeType dataRangeType = temporalType.getDateRange(); 320 DiscoveryDictionary .DateRangeTarget rangeTarget = DiscoveryDictionary.getDateRangeTarget(dataRangeType320 DiscoveryDictionaryDPWS.DateRangeTarget rangeTarget = DiscoveryDictionaryDPWS.getDateRangeTarget(dataRangeType 321 321 .getDateRangeTarget()); 322 322 List<DateValueType> dateValues = dataRangeType.getDate(); … … 324 324 325 325 TemporalOperator operator = null; 326 if (!rangeTarget.equals(DiscoveryDictionary .DateRangeTarget.TemporalCoverage)) {326 if (!rangeTarget.equals(DiscoveryDictionaryDPWS.DateRangeTarget.TemporalCoverage)) { 327 327 for (DateValueType dataValue : dateValues) { 328 328 checkWHERE_AND(whereSQL, secondPass); 329 operator = DiscoveryDictionary .getTemporalOperator(dataValue.getTemporalOperator());329 operator = DiscoveryDictionaryDPWS.getTemporalOperator(dataValue.getTemporalOperator()); 330 330 whereSQL.append(" " + rangeTarget.fieldName()); 331 331 whereSQL.append(" " + operator.fieldName()); … … 335 335 } else { 336 336 checkFROMComma(fromSQL, false); 337 fromSQL.append(DiscoveryDictionary .TEMPORAL_DATA_TABLE);337 fromSQL.append(DiscoveryDictionaryDPWS.TEMPORAL_DATA_TABLE); 338 338 339 339 checkWHERE_AND(whereSQL, false); 340 whereSQL.append(DiscoveryDictionary .ORIGINAL_DOCUMENT_TABLE);341 whereSQL.append(".original_document_id = " + DiscoveryDictionary .TEMPORAL_DATA_TABLE340 whereSQL.append(DiscoveryDictionaryDPWS.ORIGINAL_DOCUMENT_TABLE); 341 whereSQL.append(".original_document_id = " + DiscoveryDictionaryDPWS.TEMPORAL_DATA_TABLE 342 342 + ".original_document_id "); 343 343 … … 345 345 if (dataRangeType.isOverlap() && dateValues.size() == 2) { 346 346 checkWHERE_AND(whereSQL, secondPass); 347 whereSQL.append(" (" + DiscoveryDictionary .TEMPORAL_DATA_TABLE);347 whereSQL.append(" (" + DiscoveryDictionaryDPWS.TEMPORAL_DATA_TABLE); 348 348 whereSQL.append(".start_time, "); 349 whereSQL.append(" " + DiscoveryDictionary .TEMPORAL_DATA_TABLE);349 whereSQL.append(" " + DiscoveryDictionaryDPWS.TEMPORAL_DATA_TABLE); 350 350 whereSQL.append(".end_time) overlaps ("); 351 351 whereSQL.append(" DATE '" + dateValues.get(0).getDateValue() + "', "); … … 357 357 for (DateValueType dataValue : dateValues) { 358 358 checkWHERE_AND(whereSQL, secondPass); 359 operator = DiscoveryDictionary .getTemporalOperator(dataValue.getTemporalOperator());359 operator = DiscoveryDictionaryDPWS.getTemporalOperator(dataValue.getTemporalOperator()); 360 360 if (!secondPass) { 361 whereSQL.append(" " + DiscoveryDictionary .TEMPORAL_DATA_TABLE);361 whereSQL.append(" " + DiscoveryDictionaryDPWS.TEMPORAL_DATA_TABLE); 362 362 whereSQL.append(".start_time "); 363 363 whereSQL.append(" " + operator.fieldName()); 364 364 whereSQL.append(" '" + dataValue.getDateValue() + "' "); 365 365 } else { 366 whereSQL.append(" " + DiscoveryDictionary .TEMPORAL_DATA_TABLE);366 whereSQL.append(" " + DiscoveryDictionaryDPWS.TEMPORAL_DATA_TABLE); 367 367 whereSQL.append(".end_time "); 368 368 whereSQL.append(" " + operator.fieldName()); … … 378 378 return; 379 379 380 DiscoveryDictionary .SpatialOperator spatialOperator = DiscoveryDictionary.getSpatialOperator(null);381 DiscoveryDictionary .SpatialReferenceSystem spatialReferenceSystem = DiscoveryDictionary380 DiscoveryDictionaryDPWS.SpatialOperator spatialOperator = DiscoveryDictionaryDPWS.getSpatialOperator(null); 381 DiscoveryDictionaryDPWS.SpatialReferenceSystem spatialReferenceSystem = DiscoveryDictionaryDPWS 382 382 .getSpatialReferenceSystem(null); 383 383 384 384 if (spatialType.getSpatialOperator() != null) 385 spatialOperator = DiscoveryDictionary .getSpatialOperator(spatialType.getSpatialOperator());385 spatialOperator = DiscoveryDictionaryDPWS.getSpatialOperator(spatialType.getSpatialOperator()); 386 386 387 387 if (spatialType.getSpatialReferenceSystem() != null) 388 spatialReferenceSystem = DiscoveryDictionary .getSpatialReferenceSystem(spatialType388 spatialReferenceSystem = DiscoveryDictionaryDPWS.getSpatialReferenceSystem(spatialType 389 389 .getSpatialReferenceSystem()); 390 390 … … 394 394 395 395 checkFROMComma(fromSQL, false); 396 fromSQL.append(DiscoveryDictionary .SPATIAL_DATA_TABLE);396 fromSQL.append(DiscoveryDictionaryDPWS.SPATIAL_DATA_TABLE); 397 397 398 398 checkWHERE_AND(whereSQL, false); 399 String spatialPart = DiscoveryDictionary .SPATIAL_DATA_TABLE + ".geometry ";400 if (spatialOperator.equals(DiscoveryDictionary .SpatialOperator.OVERLAP)) {399 String spatialPart = DiscoveryDictionaryDPWS.SPATIAL_DATA_TABLE + ".geometry "; 400 if (spatialOperator.equals(DiscoveryDictionaryDPWS.SpatialOperator.OVERLAP)) { 401 401 whereSQL.append(spatialPart); 402 402 whereSQL.append(" && "); 403 } else if (spatialOperator.equals(DiscoveryDictionary .SpatialOperator.WITHIN)) {403 } else if (spatialOperator.equals(DiscoveryDictionaryDPWS.SpatialOperator.WITHIN)) { 404 404 whereSQL.append(spatialPart); 405 405 whereSQL.append(" @ "); 406 } else if (spatialOperator.equals(DiscoveryDictionary .SpatialOperator.DOESNOTOVERLAP)) {406 } else if (spatialOperator.equals(DiscoveryDictionaryDPWS.SpatialOperator.DOESNOTOVERLAP)) { 407 407 whereSQL.append(" NOT "); 408 408 whereSQL.append(spatialPart); … … 412 412 413 413 checkWHERE_AND(whereSQL, false); 414 whereSQL.append(DiscoveryDictionary .ORIGINAL_DOCUMENT_TABLE);414 whereSQL.append(DiscoveryDictionaryDPWS.ORIGINAL_DOCUMENT_TABLE); 415 415 whereSQL.append(".original_document_id = "); 416 whereSQL.append(DiscoveryDictionary .SPATIAL_DATA_TABLE);416 whereSQL.append(DiscoveryDictionaryDPWS.SPATIAL_DATA_TABLE); 417 417 whereSQL.append(".original_document_id "); 418 418 } … … 426 426 boolean secondPass = false; 427 427 for (String scopeLabel : scopes) { 428 DiscoveryDictionary .Scope scope = DiscoveryDictionary.getScope(scopeLabel);428 DiscoveryDictionaryDPWS.Scope scope = DiscoveryDictionaryDPWS.getScope(scopeLabel); 429 429 //logHelper.logMessage("Scope: " + scope, Level.DEBUG); 430 430 if (scope == null) … … 452 452 if (originalFormat == null) 453 453 return; 454 DiscoveryDictionary .OriginalFormat format = DiscoveryDictionary.getOriginalFormat(originalFormat);454 DiscoveryDictionaryDPWS.OriginalFormat format = DiscoveryDictionaryDPWS.getOriginalFormat(originalFormat); 455 455 checkWHERE_AND(whereSQL, false); 456 whereSQL.append(DiscoveryDictionary .ORIGINAL_DOCUMENT_TABLE);456 whereSQL.append(DiscoveryDictionaryDPWS.ORIGINAL_DOCUMENT_TABLE); 457 457 whereSQL.append(".original_format = '"); 458 458 whereSQL.append(format.fieldName()); -
RevitalizationWS/ws/DPWS/trunk/src/main/java/ndg/services/revitalization/executor/DiscoveryServiceExecutor.java
r7982 r7992 8 8 import ndg.common.exception.NdgException; 9 9 import ndg.services.discovery.basic.DiscoveryBasicDPWS; 10 import ndg.services.discovery.basic.DiscoveryDictionary ;11 import ndg.services.discovery.basic.DiscoveryDictionary .OrderByField;12 import ndg.services.discovery.basic.DiscoveryDictionary .RecordDetail;10 import ndg.services.discovery.basic.DiscoveryDictionaryDPWS; 11 import ndg.services.discovery.basic.DiscoveryDictionaryDPWS.OrderByField; 12 import ndg.services.discovery.basic.DiscoveryDictionaryDPWS.RecordDetail; 13 13 import ndg.services.jpa.OriginalDocument; 14 14 import ndg.services.revitalization.EJBBeanFactory; … … 46 46 response.getListNames().add(listNames); 47 47 /*--- Generated by WSDL2Code, DO NOT TOUCH ---*/ 48 for (DiscoveryDictionary .Names item : DiscoveryDictionary.Names.values()) {48 for (DiscoveryDictionaryDPWS.Names item : DiscoveryDictionaryDPWS.Names.values()) { 49 49 listNames.getListName().add(item.fieldLabel()); 50 50 } … … 78 78 79 79 RetrieveCriteriaType rct = doSearch.getRetrieveCriteria(); 80 DiscoveryDictionary .RecordDetail type = DiscoveryDictionary.getRecordDetails(null);80 DiscoveryDictionaryDPWS.RecordDetail type = DiscoveryDictionaryDPWS.getRecordDetails(null); 81 81 List<OrderByType> orderBy = null; 82 82 if (rct != null) { 83 type = DiscoveryDictionary .getRecordDetails(rct.getRecordDetail());83 type = DiscoveryDictionaryDPWS.getRecordDetails(rct.getRecordDetail()); 84 84 orderBy = rct.getOrderBy(); 85 85 } … … 142 142 List<OriginalDocument> result = EJBBeanFactory.getDiscoveryService().presentDocuments(doPresent); 143 143 String recDetail = retrieveType == null ? null : retrieveType.getRecordDetail(); 144 DiscoveryDictionary .RecordDetail detail = DiscoveryDictionary.getRecordDetails(recDetail);144 DiscoveryDictionaryDPWS.RecordDetail detail = DiscoveryDictionaryDPWS.getRecordDetails(recDetail); 145 145 if (response.getDocuments() == null) { 146 146 response.setDocuments(of.createDocuments()); … … 169 169 list.setName(name); 170 170 171 DiscoveryDictionary .Names listName = DiscoveryDictionary.getNames(name);171 DiscoveryDictionaryDPWS.Names listName = DiscoveryDictionaryDPWS.getNames(name); 172 172 173 173 if (listName == null) 174 174 return response; 175 175 176 if (listName.equals(DiscoveryDictionary .Names.TermTarget)) {177 for (DiscoveryDictionary .TermTarget item : DiscoveryDictionary.TermTarget.values()) {178 list.getListMember().add(item.fieldLabel()); 179 } 180 } else if (listName.equals(DiscoveryDictionary .Names.OrderByField)) {181 for (DiscoveryDictionary .OrderByField item : DiscoveryDictionary.OrderByField.values()) {182 list.getListMember().add(item.fieldLabel()); 183 } 184 } else if (listName.equals(DiscoveryDictionary .Names.Scope)) {185 for (DiscoveryDictionary .Scope item : DiscoveryDictionary.Scope.values()) {186 list.getListMember().add(item.fieldLabel()); 187 } 188 } else if (listName.equals(DiscoveryDictionary .Names.SpatialOperator)) {189 for (DiscoveryDictionary .SpatialOperator item : DiscoveryDictionary.SpatialOperator.values()) {190 list.getListMember().add(item.fieldLabel()); 191 } 192 } else if (listName.equals(DiscoveryDictionary .Names.SpatialReferenceSystem)) {193 for (DiscoveryDictionary .SpatialReferenceSystem item : DiscoveryDictionary.SpatialReferenceSystem.values()) {194 list.getListMember().add(item.fieldLabel()); 195 } 196 } else if (listName.equals(DiscoveryDictionary .Names.DateRangeTarget)) {197 for (DiscoveryDictionary .DateRangeTarget item : DiscoveryDictionary.DateRangeTarget.values()) {198 list.getListMember().add(item.fieldLabel()); 199 } 200 } else if (listName.equals(DiscoveryDictionary .Names.TemporalOperator)) {201 for (DiscoveryDictionary .TemporalOperator item : DiscoveryDictionary.TemporalOperator.values()) {202 list.getListMember().add(item.fieldLabel()); 203 } 204 } else if (listName.equals(DiscoveryDictionary .Names.MetadataFormat)) {205 for (DiscoveryDictionary .MetadataFormat item : DiscoveryDictionary.MetadataFormat.values()) {206 list.getListMember().add(item.fieldLabel()); 207 } 208 } else if (listName.equals(DiscoveryDictionary .Names.RecordDetail)) {209 for (DiscoveryDictionary .RecordDetail item : DiscoveryDictionary.RecordDetail.values()) {176 if (listName.equals(DiscoveryDictionaryDPWS.Names.TermTarget)) { 177 for (DiscoveryDictionaryDPWS.TermTarget item : DiscoveryDictionaryDPWS.TermTarget.values()) { 178 list.getListMember().add(item.fieldLabel()); 179 } 180 } else if (listName.equals(DiscoveryDictionaryDPWS.Names.OrderByField)) { 181 for (DiscoveryDictionaryDPWS.OrderByField item : DiscoveryDictionaryDPWS.OrderByField.values()) { 182 list.getListMember().add(item.fieldLabel()); 183 } 184 } else if (listName.equals(DiscoveryDictionaryDPWS.Names.Scope)) { 185 for (DiscoveryDictionaryDPWS.Scope item : DiscoveryDictionaryDPWS.Scope.values()) { 186 list.getListMember().add(item.fieldLabel()); 187 } 188 } else if (listName.equals(DiscoveryDictionaryDPWS.Names.SpatialOperator)) { 189 for (DiscoveryDictionaryDPWS.SpatialOperator item : DiscoveryDictionaryDPWS.SpatialOperator.values()) { 190 list.getListMember().add(item.fieldLabel()); 191 } 192 } else if (listName.equals(DiscoveryDictionaryDPWS.Names.SpatialReferenceSystem)) { 193 for (DiscoveryDictionaryDPWS.SpatialReferenceSystem item : DiscoveryDictionaryDPWS.SpatialReferenceSystem.values()) { 194 list.getListMember().add(item.fieldLabel()); 195 } 196 } else if (listName.equals(DiscoveryDictionaryDPWS.Names.DateRangeTarget)) { 197 for (DiscoveryDictionaryDPWS.DateRangeTarget item : DiscoveryDictionaryDPWS.DateRangeTarget.values()) { 198 list.getListMember().add(item.fieldLabel()); 199 } 200 } else if (listName.equals(DiscoveryDictionaryDPWS.Names.TemporalOperator)) { 201 for (DiscoveryDictionaryDPWS.TemporalOperator item : DiscoveryDictionaryDPWS.TemporalOperator.values()) { 202 list.getListMember().add(item.fieldLabel()); 203 } 204 } else if (listName.equals(DiscoveryDictionaryDPWS.Names.MetadataFormat)) { 205 for (DiscoveryDictionaryDPWS.MetadataFormat item : DiscoveryDictionaryDPWS.MetadataFormat.values()) { 206 list.getListMember().add(item.fieldLabel()); 207 } 208 } else if (listName.equals(DiscoveryDictionaryDPWS.Names.RecordDetail)) { 209 for (DiscoveryDictionaryDPWS.RecordDetail item : DiscoveryDictionaryDPWS.RecordDetail.values()) { 210 210 list.getListMember().add(item.fieldLabel()); 211 211 } … … 223 223 Object documentType = null; 224 224 for (OriginalDocument result : results) { 225 if (type.equals(DiscoveryDictionary .RecordDetail.DocumentSimple)) {225 if (type.equals(DiscoveryDictionaryDPWS.RecordDetail.DocumentSimple)) { 226 226 documentType = of.createReturnSimpleType(); 227 227 documents.getDocumentSimple().add((ReturnSimpleType)documentType); … … 234 234 * statement in order to execute the final 'fillOrderedField' -- 235 235 */ 236 if (type.equals(DiscoveryDictionary .RecordDetail.DocumentFull)) {236 if (type.equals(DiscoveryDictionaryDPWS.RecordDetail.DocumentFull)) { 237 237 documentType = of.createReturnFullType(); 238 238 documents.getDocumentFull().add((ReturnFullType)documentType); 239 239 fillDocument((ReturnFullType)documentType, result); 240 240 } 241 if (type.equals(DiscoveryDictionary .RecordDetail.DocumentSummary)) {241 if (type.equals(DiscoveryDictionaryDPWS.RecordDetail.DocumentSummary)) { 242 242 documentType = of.createReturnSummaryType(); 243 243 documents.getDocumentSummary().add((ReturnSummaryType)documentType); 244 244 fillDocument((ReturnSummaryType)documentType, result); 245 245 } 246 if (type.equals(DiscoveryDictionary .RecordDetail.DocumentBrief)) {246 if (type.equals(DiscoveryDictionaryDPWS.RecordDetail.DocumentBrief)) { 247 247 documentType = of.createReturnBriefType(); 248 248 documents.getDocumentBrief().add((ReturnBriefType)documentType); … … 262 262 private <T> void fillOrderedFieldArray(T documentType, List<OrderByType> orders, OriginalDocument result) { 263 263 for (OrderByType orderType : orders) { 264 OrderByField order = DiscoveryDictionary .getOrderByField(orderType.getOrderByField());264 OrderByField order = DiscoveryDictionaryDPWS.getOrderByField(orderType.getOrderByField()); 265 265 if (order == null) 266 266 continue; … … 272 272 NdgMessage msg = new NdgMessage("invocation.error", new Object[] { "Field.get(result)" }); 273 273 try { 274 PropertyDescriptor field = DiscoveryDictionary .getOriginalDocumentProperty(order.getOdField());274 PropertyDescriptor field = DiscoveryDictionaryDPWS.getOriginalDocumentProperty(order.getOdField()); 275 275 Object objValue = field.getReadMethod().invoke(result, new Object[0]); 276 276 value = (objValue != null ? objValue.toString() : "");
Note: See TracChangeset
for help on using the changeset viewer.