Changeset 8170

Timestamp:

20/03/12 13:47:38 (8 years ago)

Author:

mnagni

Message:

implementation of the daa_custodian, data_distributor columns in DWS.originalDocument table

Location:

mauRepo/revitalizationProject/branches/MEDIN

Files:

• discoverySchema/src/main/resources/DiscoverySchema.xsd (modified) (1 diff)
• dpws/src/main/java/ndg/services/discovery/basic/DiscoveryDictionaryDPWS.java (modified) (1 diff)
• dpws/src/main/java/ndg/services/jpa/OriginalDocument.java (modified) (2 diffs)
• dpws/src/main/java/ndg/services/revitalization/executor/DiscoveryServiceExecutor.java (modified) (1 diff)

mauRepo/revitalizationProject/branches/MEDIN/discoverySchema/src/main/resources/DiscoverySchema.xsd

@@ -396 +396 @@
                         <xs:element name="DatasetUpdateDate" type="xs:string"/>
                         <xs:element name="ResourceLocator" type="xs:boolean"/>
+                        <xs:element name="DataCustodian" type="xs:string"/>
+                        <xs:element name="DataDistributor" type="xs:string"/>
                 </xs:sequence>
         </xs:complexType>

mauRepo/revitalizationProject/branches/MEDIN/dpws/src/main/java/ndg/services/discovery/basic/DiscoveryDictionaryDPWS.java

@@ -245 +245 @@
                 ResourceLocator("resource_locator", "resourceLocator"),
                 InspireThemes("inspire_themes", "inspireThemes"),
-                VerticalExtent("vertical_extent", "verticalExtent");
+                VerticalExtent("vertical_extent", "verticalExtent"),
+                DataCustodian("data_custodian", "dataCustodian"),
+                DataDistrubutor("data_distributor", "dataDistributor");
                 
                 private final String fieldName;

mauRepo/revitalizationProject/branches/MEDIN/dpws/src/main/java/ndg/services/jpa/OriginalDocument.java

@@ -98 +98 @@
         
         private Boolean resourceLocator;
+        
+        private String dataCustodian;
+
+        private Object dataCustodianTsVector;
+
+        private String dataDistributor;
+
+        private Object dataDistributorTsVector; 
 
         public OriginalDocument() {
@@ -454 +462 @@
                 this.resourceLocator = resourceLocator;
         }
+        
+        public String getDataCustodian() {
+                return dataCustodian;
+        }
+
+        public void setDataCustodian(String dataCustodian) {
+                this.dataCustodian = dataCustodian;
+        }
+
+        public Object getDataCustodianTsVector() {
+                return dataCustodianTsVector;
+        }
+
+        public void setDataCustodianTsVector(Object dataCustodianTsVector) {
+                this.dataCustodianTsVector = dataCustodianTsVector;
+        }
+
+        public String getDataDistributor() {
+                return dataDistributor;
+        }
+
+        public void setDataDistributor(String dataDistributor) {
+                this.dataDistributor = dataDistributor;
+        }
+
+        public Object getDataDistributorTsVector() {
+                return dataDistributorTsVector;
+        }
+
+        public void setDataDistributorTsVector(Object dataDistributorTsVector) {
+                this.dataDistributorTsVector = dataDistributorTsVector;
+        }       
 }

mauRepo/revitalizationProject/branches/MEDIN/dpws/src/main/java/ndg/services/revitalization/executor/DiscoveryServiceExecutor.java

@@ -305 +305 @@
                                 .toString() : "");
                 info.setResourceLocator(result.getResourceLocator() != null ? result.getResourceLocator() : false);
+                info.setDataCustodian(result.getDataCustodian() != null ? result.getDataCustodian() : null);
+                info.setDataDistributor(result.getDataDistributor() != null ? result.getDataDistributor() : null);              
         }