Changeset 5465

Timestamp:

07/09/14 09:39:50 (10 years ago)

Author:

Twan Goosen

Message:

Added support for keywords to the submission REST resource

Location:

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src

Files:

• main/java/eu/clarin/cmdi/virtualcollectionregistry/rest/VirtualCollectionFormSubmissionResource.java (modified) (4 diffs)
• test/resources/SubmitTest.html (modified) (1 diff)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/rest/VirtualCollectionFormSubmissionResource.java

@@ -52 +52 @@
             @FormParam("description") String description,
             //optional params
+            @FormParam("keyword") List<String> keyword,
             @FormParam("purpose") Purpose purpose,
             @FormParam("reproducibility") Reproducibility reproducibility,
@@ -73 +74 @@
             // construct a proto-VC from the form parameters
             final VirtualCollection vc = constructVirtualCollection(type, name,
-                    metadataUris, resourceUris, description, purpose,
+                    metadataUris, resourceUris, description, keyword, purpose,
                     reproducibility, reproducibilityNotice, creationDate,
                     intensionalDescription, intensionalUri, intensionalQueryProfile, intensionalQueryValue);
@@ -95 +96 @@
     private VirtualCollection constructVirtualCollection(Type type, String name,
             List<String> metadataUris, List<String> resourceUris, String description,
-            Purpose purpose, Reproducibility reproducibility, String reproducibilityNotice,
-            Date creationDate, String intensionalDescription, String intensionalUri,
-            String intensionalQueryProfile, String intensionalQueryValue) throws VirtualCollectionRegistryException {
+            List<String> keywords, Purpose purpose, Reproducibility reproducibility,
+            String reproducibilityNotice, Date creationDate, String intensionalDescription,
+            String intensionalUri, String intensionalQueryProfile, String intensionalQueryValue) throws VirtualCollectionRegistryException {
         final VirtualCollection vc = new VirtualCollection();
 
@@ -120 +121 @@
         }
         // set optional values
+        for (String keyword : keywords) {
+            final String trimmed = keyword.trim();
+            if (!trimmed.isEmpty()) {
+                vc.getKeywords().add(keyword);
+            }
+        }
         if (description != null) {
             vc.setDescription(description);

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/test/resources/SubmitTest.html

@@ -30 +30 @@
                 <li><label>Resource URI 1: <input type="text" name="resourceUri" value="http://res1" /></label></li>
                 <li><label>Resource URI 2: <input type="text" name="resourceUri" value="http://res2" /></label></li>
+                <li><label>Keyword: <input type="text" name="keyword" value="test" /></label></li>
+                <li><label>Keyword: <input type="text" name="keyword" value="form" /></label></li>
             </ul>
             <input type="submit" />