Projects >> oai4solr >>90e1f5370bf47bf20c883f37d4196f1a7cd6e785

Chunk
Conflicting content 
import org.apache.solr.handler.RequestHandlerBase;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
<<<<<<< HEAD
import org.apache.solr.search.*;
=======
import org.apache.solr.search.DocList;
import org.apache.solr.search.QParser;
import org.apache.solr.search.QParserPlugin;
import org.apache.solr.search.SyntaxError;
>>>>>>> 8423c44f6cd8bfdab4cc03145ff150be652e8671
import org.openarchives.oai2.*;

import javax.xml.bind.JAXBContext;
Solution content 
import org.apache.solr.handler.RequestHandlerBase;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.search.*;
import org.openarchives.oai2.*;

import javax.xml.bind.JAXBContext;
File
OAIRequestHandler.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
                solr_home = deriveSolrHome();

            Utils.clearParams();
<<<<<<< HEAD
            server = new EmbeddedServer(new CoreContainer(solr_home, new File(solr_home, "solr.xml")), CORE);
=======
            final CoreContainer coreContainer = new CoreContainer(solr_home);
            coreContainer.load();
            server = new EmbeddedServer(coreContainer, CORE);
>>>>>>> 8423c44f6cd8bfdab4cc03145ff150be652e8671

            deleteIndex();
Solution content 
                solr_home = deriveSolrHome();

            Utils.clearParams();
            server = new EmbeddedServer(new CoreContainer(solr_home, new File(solr_home, "solr.xml")), CORE);

            deleteIndex();
File
TestOAIRequestHandler.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Variable
Chunk
Conflicting content 
        oaiRequest.setMetadataPrefix("some_schema");
        assertTrue(Utils.isValidMetadataPrefix(response, oaiRequest));

<<<<<<< HEAD
        Utils.setParam("some_schema", null);
=======
        oaiRequest.setMetadataPrefix("some_other_schema");
>>>>>>> 8423c44f6cd8bfdab4cc03145ff150be652e8671
        assertFalse(Utils.isValidMetadataPrefix(response, oaiRequest));
        oai = (OAIPMHtype) response.getValues().get("oai");
        assertEquals(OAIPMHerrorcodeType.CANNOT_DISSEMINATE_FORMAT, oai.getError().get(0).getCode());
Solution content 
        oaiRequest.setMetadataPrefix("some_schema");
        assertTrue(Utils.isValidMetadataPrefix(response, oaiRequest));

        Utils.setParam("some_schema", null);
        assertFalse(Utils.isValidMetadataPrefix(response, oaiRequest));
        oai = (OAIPMHtype) response.getValues().get("oai");
        assertEquals(OAIPMHerrorcodeType.CANNOT_DISSEMINATE_FORMAT, oai.getError().get(0).getCode());
File
TestUtils.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
    public void testIsValidDatestampRange() {

<<<<<<< HEAD
=======
        OAIPMHtype oaiForIdentify = new OAIPMHtype();
        IdentifyType identify = new IdentifyType();
        oaiForIdentify.setIdentify(identify);
        Utils.setParam(VerbType.IDENTIFY, oaiForIdentify);

        identify.setGranularity(GranularityType.YYYY_MM_DD);
        assertTrue(Utils.isValidDatestamp("2012", "a range", response));
        assertTrue(Utils.isValidDatestamp("2012-01", "a range", response));
        assertTrue(Utils.isValidDatestamp("2012-02-03", "a range", response));
        assertFalse(Utils.isValidDatestamp("2012-02-03T04", "a range", response));
        assertFalse(Utils.isValidDatestamp("2012-02-03T04:05", "a range", response));
        assertFalse(Utils.isValidDatestamp("2012-02-03T04:05:06", "a range", response));
        assertFalse(Utils.isValidDatestamp("2012-02-03T04:05:06Z", "a range", response));

        identify.setGranularity(GranularityType.YYYY_MM_DD_THH_MM_SS_Z);
>>>>>>> 8423c44f6cd8bfdab4cc03145ff150be652e8671
        assertTrue(Utils.isValidDatestamp("2012", "a range", response));
        assertTrue(Utils.isValidDatestamp("2012-01", "a range", response));
        assertTrue(Utils.isValidDatestamp("2012-02-03", "a range", response));
Solution content 
    public void testIsValidDatestampRange() {

        assertTrue(Utils.isValidDatestamp("2012", "a range", response));
        assertTrue(Utils.isValidDatestamp("2012-01", "a range", response));
        assertTrue(Utils.isValidDatestamp("2012-02-03", "a range", response));
File
TestUtils.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable