Changeset 5590 for VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/service/impl/VirtualCollectionCMDICreatorImpl.java

Timestamp:

08/21/14 15:00:37 (10 years ago)

Author:

Twan Goosen

Message:

Updated profile schema, added creation of generatedby properties
Refs #582

File:

• VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/service/impl/VirtualCollectionCMDICreatorImpl.java (modified) (4 diffs)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/service/impl/VirtualCollectionCMDICreatorImpl.java

@@ -2 +2 @@
 
 import eu.clarin.cmdi.virtualcollectionregistry.model.Creator;
+import eu.clarin.cmdi.virtualcollectionregistry.model.GeneratedBy;
 import eu.clarin.cmdi.virtualcollectionregistry.model.Resource;
 import eu.clarin.cmdi.virtualcollectionregistry.model.VirtualCollection;
@@ -11 +12 @@
 import eu.clarin.cmdi.virtualcollectionregistry.model.cmdi.CMD.Components.VirtualCollection.Creator.Organisation;
 import eu.clarin.cmdi.virtualcollectionregistry.model.cmdi.CMD.Components.VirtualCollection.Description;
+import eu.clarin.cmdi.virtualcollectionregistry.model.cmdi.CMD.Components.VirtualCollection.GeneratedBy.QueryProfile;
+import eu.clarin.cmdi.virtualcollectionregistry.model.cmdi.CMD.Components.VirtualCollection.GeneratedBy.QueryValue;
 import eu.clarin.cmdi.virtualcollectionregistry.model.cmdi.CMD.Components.VirtualCollection.Name;
 import eu.clarin.cmdi.virtualcollectionregistry.model.cmdi.CMD.Components.VirtualCollection.ReproducabilityNotice;
@@ -169 +172 @@
         }
 
-        if (vc.getType() == VirtualCollection.Type.INTENSIONAL) {
-            final CMD.Components.VirtualCollection.GeneratedBy generatedBy = new CMD.Components.VirtualCollection.GeneratedBy();
-            //TODO: add 'generated by' values
-            virtualCollection.setGeneratedBy(generatedBy);
+        if (vc.getType() == VirtualCollection.Type.INTENSIONAL && vc.getGeneratedBy() != null) {
+            virtualCollection.setGeneratedBy(getGeneratedBy(vc.getGeneratedBy()));
         }
 
@@ -178 +179 @@
         components.setVirtualCollection(virtualCollection);
         return components;
+    }
+
+    private CMD.Components.VirtualCollection.GeneratedBy getGeneratedBy(GeneratedBy generatedBy) {
+        final CMD.Components.VirtualCollection.GeneratedBy component = new CMD.Components.VirtualCollection.GeneratedBy();
+
+        final String uri = generatedBy.getURI();
+        if (uri != null) {
+            component.setURI(uri);
+        }
+
+        final String description = generatedBy.getDescription();
+        if (description != null) {
+            final CMD.Components.VirtualCollection.GeneratedBy.Description descriptionElement = new CMD.Components.VirtualCollection.GeneratedBy.Description();
+            descriptionElement.setValue(description);
+            component.setDescription(descriptionElement);
+        }
+
+        if (generatedBy.getQuery() != null) {
+            final String profile = generatedBy.getQuery().getProfile();
+            if (profile != null) {
+                final QueryProfile profileElement = new QueryProfile();
+                profileElement.setValue(profile);
+                component.setQueryProfile(profileElement);
+            }
+
+            final String value = generatedBy.getQuery().getValue();
+            if (value != null) {
+                final QueryValue valueElement = new QueryValue();
+                valueElement.setValue(value);
+                component.setQueryValue(valueElement);
+            }
+        }
+
+        return component;
     }