Skip to content

Commit

Permalink
added dcmi_terms crosswalk, used by SWORDv2
Browse files Browse the repository at this point in the history
  • Loading branch information
pdurbin committed Jul 18, 2013
1 parent 6daed5c commit deaddd6
Show file tree
Hide file tree
Showing 4 changed files with 167 additions and 58 deletions.
1 change: 1 addition & 0 deletions src/DVN-EJB/src/conf/buildupdate_v3_5_1_v3_6.sql
@@ -0,0 +1 @@
INSERT INTO harvestformattype (id, metadataprefix, name, stylesheetfilename) VALUES (4, 'dcmi_terms', 'DCMI_terms', 'dcmi_terms2ddi.xsl');
1 change: 1 addition & 0 deletions src/DVN-EJB/src/conf/referenceData.sql
Expand Up @@ -1164,6 +1164,7 @@ INSERT INTO harvestformattype (id, metadataprefix, name, stylesheetfilename) VAL
INSERT INTO harvestformattype (id, metadataprefix, name, stylesheetfilename) VALUES (1, 'oai_etdms', 'MIF', 'mif2ddi.xsl');
INSERT INTO harvestformattype (id, metadataprefix, name, stylesheetfilename) VALUES (2, 'oai_dc', 'DC', 'oai_dc2ddi.xsl');
INSERT INTO harvestformattype (id, metadataprefix, name, stylesheetfilename) VALUES (3, 'oai_fgdc', 'FGDC', 'fgdc2ddi.xsl');
INSERT INTO harvestformattype (id, metadataprefix, name, stylesheetfilename) VALUES (4, 'dcmi_terms', 'DCMI_terms', 'dcmi_terms2ddi.xsl');

create index datavariable_id_index on datavariable (id);
create index summarystatistic_id_index on summarystatistic (id);
Expand Down
Expand Up @@ -21,15 +21,10 @@

import edu.harvard.iq.dvn.core.admin.VDCUser;
import edu.harvard.iq.dvn.core.study.EditStudyService;
import edu.harvard.iq.dvn.core.study.Metadata;
import edu.harvard.iq.dvn.core.study.Study;
import edu.harvard.iq.dvn.core.study.StudyAbstract;
import edu.harvard.iq.dvn.core.study.StudyAuthor;
import edu.harvard.iq.dvn.core.study.StudyFileEditBean;
import edu.harvard.iq.dvn.core.study.StudyFileServiceLocal;
import edu.harvard.iq.dvn.core.study.StudyServiceLocal;
import edu.harvard.iq.dvn.core.study.StudyVersion;
import edu.harvard.iq.dvn.core.util.DateUtil;
import edu.harvard.iq.dvn.core.vdc.VDC;
import edu.harvard.iq.dvn.core.vdc.VDCServiceLocal;
import java.io.File;
Expand All @@ -39,10 +34,8 @@
import java.io.OutputStream;
import java.net.URI;
import java.net.URISyntaxException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.logging.Logger;
Expand All @@ -52,13 +45,13 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
import org.apache.abdera.i18n.iri.IRI;
import org.apache.commons.io.FileUtils;
import org.swordapp.server.AuthCredentials;
import org.swordapp.server.CollectionDepositManager;
import org.swordapp.server.Deposit;
import org.swordapp.server.DepositReceipt;
import org.swordapp.server.SwordAuthException;
import org.swordapp.server.SwordConfiguration;
import org.swordapp.server.SwordEntry;
import org.swordapp.server.SwordError;
import org.swordapp.server.SwordServerException;

Expand Down Expand Up @@ -124,67 +117,46 @@ public DepositReceipt createNew(String collectionUri, Deposit deposit, AuthCrede
logger.info("metadata relevant: " + deposit.isMetadataRelevant());

if (deposit.isEntryOnly()) {
SwordEntry swordEntry = deposit.getSwordEntry();
Map<String, List<String>> dublinCore = swordEntry.getDublinCore();
for (Map.Entry<String, List<String>> entry : dublinCore.entrySet()) {
logger.info(entry.getKey() + "/" + entry.getValue());
}

EditStudyService editStudyService;
Context ctx;
try {
ctx = new InitialContext();
editStudyService = (EditStudyService) ctx.lookup("java:comp/env/editStudy");
} catch (NamingException ex) {
throw new SwordServerException("problem looking up editStudyService");
}
editStudyService.newStudy(dv.getId(), vdcUser.getId(), dv.getDefaultTemplate().getId());
StudyVersion studyVersion = editStudyService.getStudyVersion();
Study study = studyVersion.getStudy();
String studyId = studyService.generateStudyIdSequence(study.getProtocol(), study.getAuthority());
study.setStudyId(studyId);
Metadata metadata = study.getLatestVersion().getMetadata();
if (dublinCore.get("title").get(0) != null) {
metadata.setTitle(dublinCore.get("title").get(0));
} else {
// require title *and* exercise the SWORD jar a bit
Map<String, List<String>> dublinCore = deposit.getSwordEntry().getDublinCore();
if (dublinCore.get("title") == null || dublinCore.get("title").get(0) == null) {
throw new SwordError("title field is required");
}
List<StudyAbstract> studyAbstractList = new ArrayList<StudyAbstract>();
StudyAbstract studyAbstract = new StudyAbstract();
studyAbstract.setText(dublinCore.get("description").get(0));
studyAbstract.setMetadata(metadata);
studyAbstractList.add(studyAbstract);
metadata.setStudyAbstracts(studyAbstractList);

if (dublinCore.get("date") != null) {
String dateProvided = dublinCore.get("date").get(0);
if (DateUtil.validateDate(dateProvided)) {
metadata.setProductionDate(dateProvided);
} else {
throw new SwordError("Invalid Date Format: (" + dateProvided + "). Valid formats are YYYY-MM-DD, YYYY-MM, or YYYY. Optionally, 'BC' can be appended to the year. (By default, AD is assumed.)");
// instead of writing a tmp file, maybe importStudy() could accept an InputStream?
String tmpDirectory = config.getTempDirectory();
String uploadDirPath = tmpDirectory + File.separator + "import" + File.separator + dv.getId();
File uploadDir = new File(uploadDirPath);
if (!uploadDir.exists()) {
if (!uploadDir.mkdirs()) {
throw new SwordServerException("couldn't create directory: " + uploadDir.getAbsolutePath());
}
}
// always set the depositDate
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
Date now = new Date();
String depositDate = simpleDateFormat.format(now);
metadata.setDateOfDeposit(depositDate);

List<StudyAuthor> studyAuthors = new ArrayList<StudyAuthor>();
for (String creator : dublinCore.get("creator")) {
StudyAuthor studyAuthor = new StudyAuthor();
studyAuthor.setName(creator);
studyAuthor.setMetadata(metadata);
studyAuthors.add(studyAuthor);
String tmpFilePath = uploadDirPath + File.separator + "newStudyViaSwordv2.xml";
File tmpFile = new File(tmpFilePath);
try {
FileUtils.writeStringToFile(tmpFile, deposit.getSwordEntry().getEntry().toString());
} catch (IOException ex) {
throw new SwordServerException("Could write temporary file");
} finally {
uploadDir.delete();
}
metadata.setStudyAuthors(studyAuthors);
editStudyService.save(dv.getId(), vdcUser.getId());

Long dcmiTermsFormatId = new Long(4);
Study study;
try {
study = studyService.importStudy(tmpFile, dcmiTermsFormatId, dv.getId(), vdcUser.getId());
} catch (Exception ex) {
throw new SwordError("Couldn't import study: " + ex.getMessage());
} finally {
tmpFile.delete();
uploadDir.delete();
}
DepositReceipt fakeDepositReceipt = new DepositReceipt();
IRI fakeIri = new IRI("fakeIriFromMetadataDeposit/" + study.getGlobalId());
fakeDepositReceipt.setLocation(fakeIri);
fakeDepositReceipt.setEditIRI(fakeIri);
fakeDepositReceipt.setVerboseDescription("Title: " + metadata.getTitle());
fakeDepositReceipt.setVerboseDescription("Title: " + study.getLatestVersion().getMetadata().getTitle());
return fakeDepositReceipt;
} else if (deposit.isBinaryOnly()) {
/**
Expand Down
135 changes: 135 additions & 0 deletions working_directory/dcmi_terms2ddi.xsl
@@ -0,0 +1,135 @@
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:dc="http://purl.org/dc/terms/"
exclude-result-prefixes="dc"
>
<xsl:output method="xml" version="1.0" encoding="UTF-8"
indent="yes" />
<xsl:template match="/">
<codeBook
xmlns="http://www.icpsr.umich.edu/DDI"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.icpsr.umich.edu/DDI
http://www.icpsr.umich.edu/DDI/Version2-0.xsd">
<stdyDscr>
<citation>
<titlStmt>
<titl>
<xsl:for-each select="//dc:title">
<xsl:value-of select="."/>
</xsl:for-each>
</titl>
<xsl:for-each select="//dc:identifier">
<IDNo>
<xsl:attribute name="agency">
<xsl:choose>
<xsl:when test='starts-with(.,"hdl:")'>handle</xsl:when>
<xsl:when test='starts-with(.,"http://hdl.handle.net/")'>handle</xsl:when>
</xsl:choose>
</xsl:attribute>
<xsl:choose>
<xsl:when test='starts-with(.,"http://hdl.handle.net/")'>hdl:<xsl:value-of select='substring(.,23)'/></xsl:when>
<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
</xsl:choose>
</IDNo>
</xsl:for-each>
</titlStmt>
<rspStmt>
<xsl:for-each select="//dc:creator">
<AuthEnty><xsl:value-of select="."/></AuthEnty>
</xsl:for-each>
</rspStmt>

<prodStmt>
<xsl:for-each select="//dc:publisher">
<xsl:if test="normalize-space(.)!=''">
<producer>
<xsl:value-of select="."/>
</producer>
</xsl:if>
</xsl:for-each>

<xsl:for-each select="//dc:date">
<xsl:if test="normalize-space(.)!=''">
<prodDate>
<xsl:value-of select="normalize-space(.)"/>
</prodDate>
</xsl:if>
</xsl:for-each>
</prodStmt>

</citation>
<stdyInfo>
<subject>
<xsl:for-each select="//dc:subject">
<keyword><xsl:value-of select="."/></keyword>
</xsl:for-each>
</subject>
<xsl:for-each select="//dc:description">
<abstract>
<xsl:value-of select="."/>
</abstract>
</xsl:for-each>
<sumDscr>
<xsl:for-each select="//dc:coverage">
<xsl:if test="normalize-space(.)!=''">
<geogCover>
<xsl:value-of select="."/>
</geogCover>
</xsl:if>
</xsl:for-each>
<xsl:for-each select="//dc:type">
<xsl:if test="normalize-space(.)!=''">
<dataKind>
<xsl:value-of select="."/>
</dataKind>
</xsl:if>
</xsl:for-each>
</sumDscr>
</stdyInfo>

<xsl:if test="normalize-space(//dc:source)!=''">
<method>
<dataColl>
<sources>
<xsl:for-each select="//dc:source">
<xsl:if test="normalize-space(.)!=''">
<dataSrc>
<xsl:value-of select="normalize-space(.)"/>
</dataSrc>
</xsl:if>
</xsl:for-each>
</sources>
</dataColl>
</method>
</xsl:if>


<xsl:for-each select="//dc:rights">
<xsl:if test="normalize-space(.)!=''">
<dataAccs>
<useStmt>
<restrctn>
<xsl:value-of select="normalize-space(.)"/>
</restrctn>
</useStmt>
</dataAccs>
</xsl:if>
</xsl:for-each>
<xsl:if test="normalize-space(//dc:relation)!=''">
<othrStdyMat>
<xsl:for-each select="//dc:relation">
<xsl:if test="normalize-space(.)!=''">
<relMat>
<xsl:value-of select="normalize-space(.)"/>
</relMat>
</xsl:if>
</xsl:for-each>
</othrStdyMat>
</xsl:if>
</stdyDscr>
</codeBook>
</xsl:template>
</xsl:stylesheet>


0 comments on commit deaddd6

Please sign in to comment.