Merge pull request #1 from usnistgov/integration

Integration
usnistgov · Dec 13, 2016 · 728adc9 · 728adc9
2 parents cee1ecf + c81cc9c
commit 728adc9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/metadata/jq/pod2nerdm.jq b/metadata/jq/pod2nerdm.jq
@@ -146,6 +146,7 @@ def podds2resource:
 
         description: [ .description ],
         keyword,
+        theme,
 
         references,
         accessLevel,
@@ -159,6 +160,7 @@ def podds2resource:
     if .references then .references = (.references | map(cvtref)) else del(.references) end |
     if .components then .components = (.components | map(dist2comp)) else del(.components) end |
     if .doi then . else del(.doi) end |
+    if .theme then . else del(.theme) end |
     if .issued then . else del(.issued) end 
 ;
 

diff --git a/metadata/model/nerdm-schema.json b/metadata/model/nerdm-schema.json
@@ -686,7 +686,7 @@
                     }
                 },
 
-                "email": {
+                "hasEmail": {
                     "title": "Email",
                     "description": "The email address of the resource contact",
                     "type": "string",