Commit 63f60878 authored by Steinberg, Jan's avatar Steinberg, Jan
Browse files

adding setSpec

parent 807bc1a0

kill8080.sh

0 → 100755
+1 −0
Original line number Diff line number Diff line 
TSKILL $(netstat -aon | gawk '$2~/:8080/ {  print $5 }' | head -n1 | sed 's/\r$//')

src/main/java/org/gesis/dda/filter/impl/Fqs2SsoarBundleFilter.java

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ public class Fqs2SsoarBundleFilter implements BundleFilter { 
                    result = true;

                }

                else {

                    LOG.info("filtering away bundle.reference={}", bundle.getReference() );

                    LOG.info("Fqs2SsoarBundleFilter - filtering away bundle.reference={}", bundle.getReference() );

                    result = false;

                }

            }

src/main/java/org/gesis/dda/filter/impl/Wzb2SsoarBundleFilter.java

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ import org.slf4j.LoggerFactory; 


public class Wzb2SsoarBundleFilter implements BundleFilter {

    

    private final static Logger LOG = LoggerFactory.getLogger(Fqs2SsoarBundleFilter.class);

    private final static Logger LOG = LoggerFactory.getLogger(Wzb2SsoarBundleFilter.class);

    

    /**

     * SSOAR already has everything up to and including dc.date.issued=2015
@@ -32,7 +32,7 @@ public class Wzb2SsoarBundleFilter implements BundleFilter { 
                    result = true;

                }

                else {

                    LOG.info("filtering away bundle.reference={}", bundle.getReference() );

                    LOG.info("WzbSsoarBundleFilter - filtering away bundle.reference={} , wrong year issued", bundle.getReference() );

                    result = false;

                }

            }

src/main/java/org/gesis/dda/publishing/domain/BundlesStreamSourceFactory.java

+6 −2
Original line number Diff line number Diff line
@@ -56,13 +56,14 @@ public class BundlesStreamSourceFactory { 


    private String constructLoggingString(KmhopbssDto dtoDeserialized) {

        Object[] params = new Object[]{dtoDeserialized.getOaiPmhEndpoint(),

                dtoDeserialized.getSetSpec(),

                dtoDeserialized.isSecondGranularity(),

                dtoDeserialized.getDayFrom(),

                dtoDeserialized.getDayUntil(),

                dtoDeserialized.getSecondFrom(),

                dtoDeserialized.getSecondUntil()};

        

        String msg = MessageFormat.format("endpoint={0}, isSecondGranularity={1}, dayFrom={2}, dayUntil={3}, secondFrom={4}, secondUntil={5}", params);

        String msg = MessageFormat.format("endpoint={0}, setSpec={1}, isSecondGranularity={2}, dayFrom={3}, dayUntil={4}, secondFrom={5}, secondUntil={6} ", params);

        return msg;

    }
@@ -75,6 +76,7 @@ public class BundlesStreamSourceFactory { 
                log.debug("constructing an instant-based bss with {}", constructLoggingString(dtoDeserialized) );

                bundlesStreamSource = new KnownMetadataPrefixesOaiPmhBundlesStreamSource(

                        dtoDeserialized.getOaiPmhEndpoint(),

                        dtoDeserialized.getSetSpec(),

                        dtoDeserialized.getSecondFrom(),

                        dtoDeserialized.getSecondUntil()

                        );
@@ -83,6 +85,7 @@ public class BundlesStreamSourceFactory { 
                log.debug("constructing an localDate-based bss with {}", constructLoggingString(dtoDeserialized) );

                bundlesStreamSource = new KnownMetadataPrefixesOaiPmhBundlesStreamSource(

                        dtoDeserialized.getOaiPmhEndpoint(),

                        dtoDeserialized.getSetSpec(),

                        dtoDeserialized.getDayFrom(),

                        dtoDeserialized.getDayUntil()

                        );
@@ -117,8 +120,9 @@ public class BundlesStreamSourceFactory { 
        else if (BundlesSourceType.XSLT_OAI_PMH == bundlesSourceType) {

            XsltOaiPmhDto dto = PersistableHelper.instantiate(data, XsltOaiPmhDto.class);

            String url = dto.getOaiPmhEndpoint();

            String setSpec = dto.getSetSpec();

            Map<String, String> map = dto.getMetadataPrefix2XsltMap();

            result = new XsltTransformerOaiPmhBundlesStreamSource(url, map, dto.getFrom(), dto.getUntil());

            result = new XsltTransformerOaiPmhBundlesStreamSource(url, setSpec, map, dto.getFrom(), dto.getUntil());

        }

        else if (BundlesSourceType.XML_XSLT_SOURCE == bundlesSourceType) {

            XmlXsltDto dto = PersistableHelper.instantiate(data, XmlXsltDto.class);

src/main/java/org/gesis/dda/publishing/domain/impl/KmhopbssDto.java

+23 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ import java.time.LocalDate; 
public class KmhopbssDto {

    

    private String oaiPmhEndpoint;

    private String setSpec;

    private Instant secondFrom;

    private Instant secondUntil;

    private LocalDate dayFrom;
@@ -19,6 +20,7 @@ public class KmhopbssDto { 
    

    public KmhopbssDto(String oaiPmhEndpoint, Instant secondFrom, Instant secondUntil) {

        this.oaiPmhEndpoint = oaiPmhEndpoint;

        this.setSpec = "";

        this.secondFrom = secondFrom;

        this.secondUntil = secondUntil;

        this.isSecondGranularity = true;
@@ -26,6 +28,23 @@ public class KmhopbssDto { 
    

    public KmhopbssDto(String oaiPmhEndpoint, LocalDate dayFrom, LocalDate dayUntil) {

        this.oaiPmhEndpoint = oaiPmhEndpoint;

        this.setSpec = "";

        this.dayFrom = dayFrom;

        this.dayUntil = dayUntil;

        this.isSecondGranularity = false;

    }

    

    public KmhopbssDto(String oaiPmhEndpoint, String setSpec, Instant secondFrom, Instant secondUntil) {

        this.oaiPmhEndpoint = oaiPmhEndpoint;

        this.setSpec = setSpec;

        this.secondFrom = secondFrom;

        this.secondUntil = secondUntil;

        this.isSecondGranularity = true;

    }

    

    public KmhopbssDto(String oaiPmhEndpoint, String setSpec, LocalDate dayFrom, LocalDate dayUntil) {

        this.oaiPmhEndpoint = oaiPmhEndpoint;

        this.setSpec = setSpec;

        this.dayFrom = dayFrom;

        this.dayUntil = dayUntil;

        this.isSecondGranularity = false;
@@ -35,6 +54,10 @@ public class KmhopbssDto { 
        return oaiPmhEndpoint;

    }

    

    public String getSetSpec() {

        return setSpec;

    }

    

    public Instant getSecondFrom() {

        return secondFrom;

    }