Project

General

Profile

« Previous | Next » 

Revision 49434

major fix of friday

View differences:

modules/dnet-wds/trunk/src/main/resources/eu/dnetlib/bootstrap/profiles/TransformationRuleDSResources/TransformationRuleDSResourceType/Identity_Transform.xml
1
<RESOURCE_PROFILE>
2
    <HEADER>
3
        <RESOURCE_IDENTIFIER
4
                value="8d001476-5f09-4d6a-bf83-b65820661557_VHJhbnNmb3JtYXRpb25SdWxlRFNSZXNvdXJjZXMvVHJhbnNmb3JtYXRpb25SdWxlRFNSZXNvdXJjZVR5cGU="/>
5
        <RESOURCE_TYPE value="TransformationRuleDSResourceType"/>
6
        <RESOURCE_KIND value="TransformationRuleDSResources"/>
7
        <RESOURCE_URI value=""/>
8
        <DATE_OF_CREATION value="2014-07-17T10:41:08+02:00"/>
9
    </HEADER>
10
    <BODY>
11
        <CONFIGURATION>
12
            <IMPORTED/>
13
            <SCRIPT>
14
                <TITLE>WDS:Identity transformation</TITLE>
15
                <CODE><![CDATA[<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
16
                        <xsl:template match="@*|node()">
17
                            <xsl:copy>
18
                                <xsl:apply-templates select="@*|node()"/>
19
                            </xsl:copy>
20
                        </xsl:template>
21
                    </xsl:stylesheet>
22
                ]]></CODE>
23
            </SCRIPT>
24
        </CONFIGURATION>
25
        <STATUS/>
26
        <SECURITY_PARAMETERS/>
27
    </BODY>
28
</RESOURCE_PROFILE>
modules/dnet-wds-domain/trunk/src/main/java/eu/dnetlib/wds/utils/WDSUtils.java
1 1
package eu.dnetlib.wds.utils;
2 2

  
3
import eu.dnetlib.data.transform.Ontologies;
4
import eu.dnetlib.data.transform.OntologyLoader;
3 5
import eu.dnetlib.enabling.locators.UniqueServiceLocator;
4 6
import eu.dnetlib.miscutils.collections.Pair;
5 7
import eu.dnetlib.miscutils.functional.xml.DnetXsltFunctions;
......
17 19

  
18 20
public class WDSUtils {
19 21

  
22
    public static Ontologies ontologies;
20 23

  
24

  
21 25
    public final static Map<String, Pair<String, String>> hostedByMap = new HashMap<>();
22 26
    public final static Map<String, Pair<String, String>> collectedFromMap = new HashMap<>();
23 27
    public static String HOSTED_BY_MAP_QUERY = "for $x in collection('/db/DRIVER/RepositoryServiceResources/RepositoryServiceResourceType') " +
......
30 34
            "$x//FIELD[./key/text()= 'NamespacePrefix' ]/value/string(), '<-->', $x//OFFICIAL_NAME)";
31 35

  
32 36
    private static WDSUtils instance;
37

  
38

  
33 39
    @Autowired
34 40
    private UniqueServiceLocator serviceLocator;
35 41

  
42
    public static String getInverse(final String relation) throws Exception {
43
        if (ontologies == null) {
44
            ontologies = OntologyLoader.loadOntologiesFromIS();
45
        }
46
        final String normalizedRelation = normalizeRelation(relation);
36 47

  
48

  
49
        try {
50
            return ontologies.getTerms(normalizedRelation).stream().findFirst().get().getInverseCode();
51
        } catch (Throwable e) {
52
            System.out.println("Relation not found = " + normalizedRelation);
53
            return "related";
54
        }
55
    }
56

  
57

  
58
    public static String normalizeRelation(final String relation) {
59
        if (relation == null || StringUtils.isEmpty(relation)) {
60
            return null;
61
        }
62
        return Character.toLowerCase(relation.charAt(0)) + relation.substring(1);
63

  
64
    }
65

  
66

  
37 67
    public static void generateDSMapFromQuery(final Map<String, Pair<String, String>> aMap, final String aQUERY) throws Exception {
38 68
        final ISLookUpService lookUpService = instance.getServiceLocator().getService(ISLookUpService.class);
39 69
        final List<String> hostedByList = lookUpService.quickSearchProfile(aQUERY);
modules/dnet-wds/trunk/test/java/eu/dnetlib/wds/resolver/ResolverTest.java
53 53

  
54 54
    @Test
55 55
    public void testOpenAireResolvePublication() throws Exception {
56
        final ResolvedObject openaire = openAireResolver.retrievePID("10.5281/zenodo.11082", "doi");
56
        final ResolvedObject openaire = openAireResolver.retrievePID("10.1126/science.1141038", "DOI");
57 57
        assertNotNull(openaire);
58
        final ResolvedObject doi_stored = store.getRecord("10.5281/zenodo.11082", "doi");
59
        assertNotNull(doi_stored);
60

  
61

  
62
        final Gson g = new GsonBuilder().setPrettyPrinting().create();
63
        System.out.println("g.toJson(openaire) = " + g.toJson(openaire));
58
        System.out.println(openaire.toJsonString());
59
        final ResolvedObject doi_stored = store.getRecord("10.1126/science.1141038", "doi");
60
        System.out.println(doi_stored.getType());
61
//        final Gson g = new GsonBuilder().setPrettyPrinting().create();
62
//        System.out.println("g.toJson(openaire) = " + g.toJson(openaire));
64 63
    }
65

  
66

  
67 64
}
modules/dnet-wds/trunk/test/java/eu/dnetlib/wds/parser/ParserTest.java
16 16
import static org.mockito.Mockito.mock;
17 17
import static org.mockito.Mockito.when;
18 18

  
19
import org.junit.Assert;
19 20
import org.junit.Before;
20 21
import org.junit.Test;
21 22
import org.junit.runner.RunWith;
......
101 102

  
102 103
        WDSResolvedObject resolvedObject = (WDSResolvedObject) parser.parseObject(dmf);
103 104

  
105
        Assert.assertNotNull(resolvedObject.getType());
106

  
104 107
        Gson g = new GsonBuilder().setPrettyPrinting().create();
105 108

  
106 109
        assertNotNull(resolvedObject);
modules/dnet-wds/trunk/test/resources/eu/dnetlib/wds/parser/openaire_input.xml
1 1
<result xmlns:dri="http://www.driver-repository.eu/namespace/dri">
2 2
    <header xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
3
        <dri:objIdentifier>od______2659::a6407680921286c4aae4ed028d9106bf</dri:objIdentifier>
4
        <dri:dateOfCollection>2017-07-28T23:17:41.965Z</dri:dateOfCollection>
5
        <dri:dateOfTransformation>2017-10-01T23:12:47.749Z</dri:dateOfTransformation>
3
        <dri:objIdentifier>copernicuspu::6787bb333c2859a32b7253837b8d5198</dri:objIdentifier>
4
        <dri:dateOfCollection>2017-03-21T13:10:17.801Z</dri:dateOfCollection>
5
        <dri:dateOfTransformation>2017-10-01T10:30:31.465Z</dri:dateOfTransformation>
6 6
        <counters>
7
            <counter_authorship value="1"/>
8
            <counter_outcome_collected value="1"/>
9
            <counter_outcome value="1"/>
7
            <counter_similarity_inferred value="4"/>
8
            <counter_authorship value="2"/>
9
            <counter_similarity value="4"/>
10 10
            <counter_doi value="1"/>
11
            <counter_authorship_inferred value="1"/>
11
            <counter_authorship_inferred value="2"/>
12 12
        </counters>
13 13
    </header>
14 14
    <metadata>
......
16 16
                    xmlns:oaf="http://namespace.openaire.eu/oaf"
17 17
                    xsi:schemaLocation="http://namespace.openaire.eu/oaf https://www.openaire.eu/schema/0.3/oaf-0.3.xsd">
18 18
            <oaf:result>
19
                <journal issn="1866-3516" eissn="1866-3516" lissn="" ep="" iss="" sp="" vol=""/>
20
                <dateofacceptance>2017-01-20</dateofacceptance>
21
                <description>Land surface reflectance is not isotropic. It varies with the
22
                    observation geometry that is defined by the sun, view zenith angles, and the
23
                    relative azimuth. In addition, the reflectance is linearly polarized. The
24
                    reflectance anisotropy is quantified by the bidirectional reflectance
25
                    distribution function (BRDF), while its polarization properties are defined by
26
                    the bidirectional polarization distribution function (BPDF). The POLDER
27
                    radiometer that flew onboard the PARASOL microsatellite remains the only space
28
                    instrument that measured numerous samples of the BRDF and BPDF of Earth targets.
29
                    &lt;br>&lt;br> Here, we describe a database of representative BRDFs and BPDFs
30
                    derived from the POLDER measurements. From the huge number of data acquired by
31
                    the spaceborne instrument over a period of 7 years, we selected a set of targets
32
                    with high-quality observations. The selection aimed for a large number of
33
                    observations, free of significant cloud or aerosol contamination, acquired in
34
                    diverse observation geometries with a focus on the backscatter direction that
35
                    shows the specific hot spot signature. The targets are sorted according to the
36
                    16-class International Geosphere-Biosphere Programme (IGBP) land cover
37
                    classification system, and the target selection aims at a spatial
38
                    representativeness within the class. The database thus provides a set of
39
                    high-quality BRDF and BPDF samples that can be used to assess the typical
40
                    variability of natural surface reflectances or to evaluate models. It is
41
                    available freely from the PANGAEA website (&lt;a
42
                    href="http://dx.doi.org/10.1594/PANGAEA.864090"
43
                    target="_blank">doi:10.1594/PANGAEA.864090&lt;/a>). &lt;br>&lt;br> In addition
44
                    to the database, we provide a visualization and analysis tool based on the
45
                    Interactive Data Language (IDL). It allows an interactive analysis of the
46
                    measurements and a comparison against various BRDF and BPDF analytical models.
47
                    The present paper describes the input data, the selection principles, the
48
                    database format, and the analysis tool</description>
49
                <resulttype classid="publication" classname="publication"
50
                            schemeid="dnet:result_typologies" schemename="dnet:result_typologies"/>
51
                <fulltext>file:///mnt/uploaded_dumps/copernicus/upload/essd-9-31-2017.pdf</fulltext>
52
                <source>eISSN: 1866-3516</source>
19 53
                <title classid="main title" classname="main title" schemeid="dnet:dataCite_title"
20
                       schemename="dnet:dataCite_title">ZENODO: A New Innovative Service for Sharing
21
                    All Research Outputs
22
                </title>
23
                <journal issn="" eissn="" lissn="" ep="" iss="" sp="" vol=""/>
24
                <language classid="und" classname="Undetermined" schemeid="dnet:languages"
54
                       schemename="dnet:dataCite_title">A BRDF–BPDF database for the analysis of Earth
55
                    target reflectances</title>
56
                <language classid="eng" classname="English" schemeid="dnet:languages"
25 57
                          schemename="dnet:languages"/>
26
                <embargoenddate/>
27
                <subject classid="keyword" classname="keyword" schemeid="dnet:result_subject"
28
                         schemename="dnet:result_subject">ZENODO
29
                </subject>
30
                <subject classid="keyword" classname="keyword" schemeid="dnet:result_subject"
31
                         schemename="dnet:result_subject">Data repositories
32
                </subject>
33
                <dateofacceptance>2014-06-20</dateofacceptance>
34
                <resulttype classid="publication" classname="publication"
35
                            schemeid="dnet:result_typologies" schemename="dnet:result_typologies"/>
36
                <description>&lt;p>Presentation on ZENODO at Library and Information Services in
37
                    Astronomy VII, 2014, Naples, Italy.&lt;/p>
38
                </description>
58
                <format>application/pdf</format>
39 59
                <country classid="" classname="" schemeid="" schemename=""/>
60
                <subject classid="" classname="" schemeid="" schemename=""/>
40 61
                <relevantdate classid="" classname="" schemeid="" schemename=""/>
41 62
                <publisher/>
42
                <source/>
43
                <fulltext/>
44
                <format/>
63
                <embargoenddate/>
45 64
                <contributor/>
46 65
                <storagedate/>
47 66
                <resourcetype classid="" classname="" schemeid="" schemename=""/>
......
50 69
                <version/>
51 70
                <lastmetadataupdate/>
52 71
                <metadataversionnumber/>
53
                <collectedfrom name="ZENODO" id="opendoar____::358aee4cc897452c00244351e4d91f69"/>
54
                <originalId>oai:zenodo.org:11082</originalId>
72
                <collectedfrom name="Copernicus Publications"
73
                               id="openaire____::5a38cb462ac487bf26bdb86009fe3e74"/>
55 74
                <pid classid="doi" classname="doi" schemeid="dnet:pid_types"
56
                     schemename="dnet:pid_types">10.5281/zenodo.11082
57
                </pid>
75
                     schemename="dnet:pid_types">10.5194/essd-9-31-2017</pid>
76
                <originalId>oai:publications.copernicus.org:essd54489</originalId>
58 77
                <bestlicense classid="OPEN" classname="Open Access" schemeid="dnet:access_modes"
59 78
                             schemename="dnet:access_modes"/>
60
                <context id="EC" label="European Commission" type="funding">
61
                    <category id="EC::FP7" label="SEVENTH FRAMEWORK PROGRAMME">
62
                        <concept id="EC::FP7::SP4" label="SP4-Capacities"/>
63
                        <concept id="EC::FP7::SP4::INFRA" label="Research Infrastructures"/>
64
                    </category>
65
                </context>
66 79
                <datainfo>
67 80
                    <inferred>false</inferred>
68 81
                    <deletedbyinference>false</deletedbyinference>
......
76 89
                    <rel inferred="true" trust="0.9" inferenceprovenance=""
77 90
                         provenanceaction="sysimport:crosswalk:repository">
78 91
                        <to class="hasAuthor" scheme="dnet:person_result_relations" type="person"
79
                        >dedup_wf_001::d51f8fc77ad11b563b18479d723afc51
80
                        </to>
81
                        <ranking>1</ranking>
82
                        <fullname>Nielsen, Lars Holm</fullname>
92
                        >dedup_wf_001::22a49ba3a9202ed679b9a057dae0b685</to>
93
                        <ranking>2</ranking>
94
                        <fullname>Maignan, Fabienne</fullname>
83 95
                    </rel>
84
                    <rel inferred="false" trust="0.9" inferenceprovenance=""
96
                    <rel inferred="true" trust="0.9"
97
                         inferenceprovenance="iis::document_similarities_standard"
98
                         provenanceaction="iis">
99
                        <to class="hasAmongTopNSimilarDocuments"
100
                            scheme="dnet:result_result_relations" type="result"
101
                        >dedup_wf_001::8c5c73fa2a9b47879c1f0bc924e42290</to>
102
                        <type>STANDARD</type>
103
                        <similarity>0.8317553</similarity>
104
                        <dateofacceptance>2013-07-01</dateofacceptance>
105
                        <publisher>HAL CCSD</publisher>
106
                        <resulttype classid="publication" classname="publication"
107
                                    schemeid="dnet:result_typologies" schemename="dnet:result_typologies"/>
108
                        <title classid="main title" classname="main title"
109
                               schemeid="dnet:dataCite_title" schemename="dnet:dataCite_title">BPDF:
110
                            Boolean Parametric Data Flow</title>
111
                    </rel>
112
                    <rel inferred="true" trust="0.9"
113
                         inferenceprovenance="iis::document_similarities_standard"
114
                         provenanceaction="iis">
115
                        <to class="isAmongTopNSimilarDocuments"
116
                            scheme="dnet:result_result_relations" type="result"
117
                        >dedup_wf_001::8c5c73fa2a9b47879c1f0bc924e42290</to>
118
                        <type>STANDARD</type>
119
                        <similarity>0.8317553</similarity>
120
                        <dateofacceptance>2013-07-01</dateofacceptance>
121
                        <publisher>HAL CCSD</publisher>
122
                        <resulttype classid="publication" classname="publication"
123
                                    schemeid="dnet:result_typologies" schemename="dnet:result_typologies"/>
124
                        <title classid="main title" classname="main title"
125
                               schemeid="dnet:dataCite_title" schemename="dnet:dataCite_title">BPDF:
126
                            Boolean Parametric Data Flow</title>
127
                    </rel>
128
                    <rel inferred="true" trust="0.9"
129
                         inferenceprovenance="iis::document_similarities_standard"
130
                         provenanceaction="iis">
131
                        <to class="hasAmongTopNSimilarDocuments"
132
                            scheme="dnet:result_result_relations" type="result"
133
                        >dedup_wf_001::8b2f8f1faa4d46c602f6f7b307430a11</to>
134
                        <type>STANDARD</type>
135
                        <similarity>0.9035098</similarity>
136
                        <dateofacceptance>2015-02-26</dateofacceptance>
137
                        <publisher>HAL CCSD</publisher>
138
                        <resulttype classid="publication" classname="publication"
139
                                    schemeid="dnet:result_typologies" schemename="dnet:result_typologies"/>
140
                        <title classid="main title" classname="main title"
141
                               schemeid="dnet:dataCite_title" schemename="dnet:dataCite_title">Modèles
142
                            de calculs flot de données avec paramètres entiers et booléens.
143
                            Modélisation - Analyses - Mise en oeuvre</title>
144
                    </rel>
145
                    <rel inferred="true" trust="0.9"
146
                         inferenceprovenance="iis::document_similarities_standard"
147
                         provenanceaction="iis">
148
                        <to class="isAmongTopNSimilarDocuments"
149
                            scheme="dnet:result_result_relations" type="result"
150
                        >dedup_wf_001::8b2f8f1faa4d46c602f6f7b307430a11</to>
151
                        <type>STANDARD</type>
152
                        <similarity>0.9035098</similarity>
153
                        <dateofacceptance>2015-02-26</dateofacceptance>
154
                        <publisher>HAL CCSD</publisher>
155
                        <resulttype classid="publication" classname="publication"
156
                                    schemeid="dnet:result_typologies" schemename="dnet:result_typologies"/>
157
                        <title classid="main title" classname="main title"
158
                               schemeid="dnet:dataCite_title" schemename="dnet:dataCite_title">Modèles
159
                            de calculs flot de données avec paramètres entiers et booléens.
160
                            Modélisation - Analyses - Mise en oeuvre</title>
161
                    </rel>
162
                    <rel inferred="true" trust="0.9" inferenceprovenance=""
85 163
                         provenanceaction="sysimport:crosswalk:repository">
86
                        <to class="isProducedBy" scheme="dnet:result_project_relations"
87
                            type="project">corda_______::fe4cbcc8f465c016c034a4f93965074c
88
                        </to>
89
                        <code>283595</code>
90
                        <title>2nd-Generation Open Access Infrastructure for Research in
91
                            Europe
92
                        </title>
93
                        <acronym>OPENAIREPLUS</acronym>
94
                        <contracttype classid="CP-CSA" classname="Combination of CP &amp; CSA"
95
                                      schemeid="ec:FP7contractTypes" schemename="ec:FP7contractTypes"/>
96
                        <funding>
97
                            <funder id="ec__________::EC" shortname="EC" name="European Commission"
98
                                    jurisdiction="EU"/>
99
                            <funding_level_0 name="FP7">ec__________::EC::FP7</funding_level_0>
100
                            <funding_level_1 name="SP4">ec__________::EC::FP7::SP4</funding_level_1>
101
                            <funding_level_2 name="INFRA"
102
                            >ec__________::EC::FP7::SP4::INFRA
103
                            </funding_level_2>
104
                        </funding>
164
                        <to class="hasAuthor" scheme="dnet:person_result_relations" type="person"
165
                        >dedup_wf_001::6eeb68b5ebe9ee3522c9b12982a6f85d</to>
166
                        <ranking>1</ranking>
167
                        <fullname>Breon, Francois-Marie</fullname>
105 168
                    </rel>
106 169
                </rels>
107 170
                <children>
108
                    <instance id="opendoar____::358aee4cc897452c00244351e4d91f69">
171
                    <instance id="copernicuspu::2b81d254a9b19941155ce59c64d3e4d0">
172
                        <hostedby name="Earth System Science Data (ESSD)"
173
                                  id="copernicuspu::2b81d254a9b19941155ce59c64d3e4d0"/>
174
                        <instancetype classid="0001" classname="Article"
175
                                      schemeid="dnet:publication_resource"
176
                                      schemename="dnet:publication_resource"/>
109 177
                        <licence classid="OPEN" classname="Open Access" schemeid="dnet:access_modes"
110 178
                                 schemename="dnet:access_modes"/>
111
                        <instancetype classid="0010" classname="Lecture"
112
                                      schemeid="dnet:publication_resource"
113
                                      schemename="dnet:publication_resource"/>
114
                        <hostedby name="ZENODO" id="opendoar____::358aee4cc897452c00244351e4d91f69"/>
115 179
                        <webresource>
116
                            <url>https://zenodo.org/record/11082</url>
180
                            <url>http://www.earth-syst-sci-data.net/9/31/2017/</url>
117 181
                        </webresource>
182

  
118 183
                    </instance>
184

  
119 185
                </children>
120 186
            </oaf:result>
187
            <extraInfo name="result citations" typology="citations"
188
                       provenance="iis::document_referencedDocuments" trust="0.9">
189
                <citations>
190
                    <citation position="1">
191
                        <rawText>Asrar, G., Fuchs, M., Kanemasu, E. T., and Hatfield, J. L.:
192
                            Estimating Absorbed Photosynthetic Radiation and Leaf-Area Index from
193
                            Spectral Reflectance in Wheat, Agron. J., 76, 300-306, 1984.</rawText>
194
                    </citation>
195
                    <citation position="2">
196
                        <rawText>Bacour, C. and Breon, F. M.: Variability of biome reflectance
197
                            directional signatures as seen by POLDER, Remote Sens. Environ., 98,
198
                            80-95, doi:10.1016/j.rse.2005.06.008, 2005.</rawText>
199
                    </citation>
200
                    <citation position="3">
201
                        <rawText>Bicheron, P. and Leroy, M.: Bidirectional reflectance distribution
202
                            function signatures of major biomes observed from space, J. Geophys.
203
                            Res.-Atmos., 105, 26669-26681, doi:10.1029/2000jd900380, 2000.</rawText>
204
                    </citation>
205
                    <citation position="4">
206
                        <rawText>Breon, F. M. and Doutriaux-Boucher, M.: A comparison of cloud
207
                            droplet radii measured from space, IEEE T. Geosci. Remote, 43,
208
                            1796-1805, doi:10.1109/Tgrs.2005.852838, 2005.</rawText>
209
                    </citation>
210
                    <citation position="5">
211
                        <rawText>Breon, F. M. and Vermote, E.: Correction of MODIS surface
212
                            reflectance time series for BRDF effects, Remote Sens. Environ., 125,
213
                            1-9, doi:10.1016/J.Rse.2012.06.025, 2012.</rawText>
214
                    </citation>
215
                    <citation position="6">
216
                        <rawText>Breon, F. M., Tanre, D., Lecomte, P., and Herman, M.: Polarized
217
                            Reflectance of Bare Soils and Vegetation - Measurements and Models, IEEE
218
                            T. Geosci. Remote, 33, 487-499, doi:10.1109/36.377949, 1995.</rawText>
219
                    </citation>
220
                    <citation position="7">
221
                        <rawText>Breon, F. M., Maignan, F., Leroy, M., and Grant, I.: Analysis of
222
                            hot spot directional signatures measured from space, J. Geophys.
223
                            Res.-Atmos., 107, 4282, doi:10.1029/2001jd001094, 2002.</rawText>
224
                    </citation>
225
                    <citation position="8">
226
                        <rawText>Carlson, T. N. and Ripley, D. A.: On the relation between NDVI,
227
                            fractional vegetation cover, and leaf area index, Remote Sens. Environ.,
228
                            62, 241-252, doi:10.1016/S0034-4257(97)00104-1, 1997.</rawText>
229
                    </citation>
230
                    <citation position="9">
231
                        <rawText>Cui, Y., Mitomi, Y., and Takamura, T.: An empirical anisotropy
232
                            correction model for estimating land surface albedo for radiation budget
233
                            studies, Remote Sens. Environ., 113, 24-39,
234
                            doi:10.1016/j.rse.2008.08.007, 2009.</rawText>
235
                    </citation>
236
                    <citation position="10">
237
                        <rawText>Deschamps, P. Y., Breon, F. M., Leroy, M., Podaire, A., Bricaud,
238
                            A., Buriez, J. C., and Seze, G.: The Polder Mission - Instrument
239
                            Characteristics and Scientific Objectives, IEEE T. Geosci. Remote, 32,
240
                            598-615, doi:10.1109/36.297978, 1994.</rawText>
241
                    </citation>
242
                    <citation position="11">
243
                        <rawText>Deuze, J. L., Breon, F. M., Devaux, C., Goloub, P., Herman, M.,
244
                            Lafrance, B., Maignan, F., Marchand, A., Nadal, F., Perry, G., and
245
                            Tanre, D.: Remote sensing of aerosols over land surfaces from
246
                            POLDER-ADEOS-1 polarized measurements, J. Geophys. Res.-Atmos., 106,
247
                            4913-4926, doi:10.1029/2000jd900364, 2001.</rawText>
248
                    </citation>
249
                    <citation position="12">
250
                        <rawText>Diner, D. J., Beckert, J. C., Reilly, T. H., Bruegge, C. J., Conel,
251
                            J. E., Kahn, R. A., Martonchik, J. V., Ackerman, T. P., Davies, R.,
252
                            Gerstl, S. A. W., Gordon, H. R., Muller, J. P., Myneni, R. B., Sellers,
253
                            P. J., Pinty, B., and Verstraete, M. M.: Multi-angle Imaging
254
                            SpectroRadiometer (MISR) - Instrument description and experiment
255
                            overview, IEEE T. Geosci. Remote, 36, 1072-1087, doi:10.1109/36.700992,
256
                            1998.</rawText>
257
                    </citation>
258
                    <citation position="13">
259
                        <rawText>Engelsen, O., Pinty, B., Verstraete, M. M., and Martonchik, J. V.:
260
                            Parametric surface bidirectional reflectance factor models for
261
                            atmospheric radiative transfer modeling, Igarss'98 - 1998 International
262
                            Geoscience and Remote Sensing Symposium, Volume 1-5, 713-715,
263
                            doi:10.1109/Igarss.1998.699559, 1998.</rawText>
264
                    </citation>
265
                    <citation position="14">
266
                        <rawText>Fougnie, B.: Improvement of the PARASOL Radiometric In-Flight
267
                            Calibration Based on Synergy Between Various Methods Using Natural
268
                            Targets, IEEE T. Geosci. Remote, 54, 2140-2152,
269
                            doi:10.1109/Tgrs.2015.2496322, 2016.</rawText>
270
                    </citation>
271
                    <citation position="15">
272
                        <rawText>Fougnie, B., Bracco, G., Lafrance, B., Ruffel, C., Hagolle, O., and
273
                            Tinell, C.: PARASOL in-flight calibration and performance, Appl. Optics,
274
                            46, 5435-5451, doi:10.1364/Ao.46.005435, 2007.</rawText>
275
                        <id value="dedup_wf_001::0e3d7d41fbb00c7694817cba5925ac85" type="openaire"
276
                            confidenceLevel="0.70327556"/>
277
                    </citation>
278
                    <citation position="16">
279
                        <rawText>Gatebe, C. K. and King, M. D.: Airborne spectral BRDF of various
280
                            surface types (ocean, vegetation, snow, desert, wetlands, cloud decks,
281
                            smoke layers) for remote sensing applications, Remote Sens. Environ.,
282
                            179, 131-148, doi:10.1016/j.rse.2016.03.029, 2016.</rawText>
283
                    </citation>
284
                    <citation position="17">
285
                        <rawText>Jiao, Z. T., Dong, Y. D., Zhang, H., and Li, X. W.: To Derive Brdf
286
                            Archetypes from Polder-3 Brdf Database, Int. Geosci. Remote Se.,
287
                            3586-3589, doi:10.1109/Igarss.2014.6947258, 2014.</rawText>
288
                    </citation>
289
                    <citation position="18">
290
                        <rawText>Kokhanovsky, A. A. and Breon, F. M.: Validation of an Analytical
291
                            Snow BRDF Model Using PARASOL Multi-Angular and Multispectral
292
                            Observations, IEEE Geosci. Remote S., 9, 928-932,
293
                            doi:10.1109/Lgrs.2012.2185775, 2012.</rawText>
294
                    </citation>
295
                    <citation position="19">
296
                        <rawText>Lallart, P., Kahn, R., and Tanre, D.: POLDER2/ADEOSII, MISR, and
297
                            MODIS/Terra reflectance comparisons, J. Geophys. Res.- Atmos., 113,
298
                            D14s02, doi:10.1029/2007jd009656, 2008.</rawText>
299
                    </citation>
300
                    <citation position="20">
301
                        <rawText>Liang, D., Zuo, Y., Huang, L. S., Zhao, J. L., Teng, L., and Yang,
302
                            F.: Evaluation of the Consistency of MODIS Land Cover Product (MCD12Q1)
303
                            Based on Chinese 30 m GlobeLand30 Datasets: A Case Study in Anhui
304
                            Province, China, ISPRS Int. J. Geo-Inf., 4, 2519-2541,
305
                            doi:10.3390/ijgi4042519, 2015.</rawText>
306
                    </citation>
307
                    <citation position="21">
308
                        <rawText>Litvinov, P., Hasekamp, O., and Cairns, B.: Models for surface
309
                            reflection of radiance and polarized radiance: Comparison with airborne
310
                            multi-angle photopolarimetric measurements and implications for modeling
311
                            top-of-atmosphere measurements, Remote Sens. Environ., 115, 781-792,
312
                            doi:10.1016/j.rse.2010.11.005, 2011.</rawText>
313
                    </citation>
314
                    <citation position="22">
315
                        <rawText>Litvinov, P., Hasekamp, O., Dubovik, O., and Cairns, B.: Model for
316
                            land surface reflectance treatment: Physical derivation, application for
317
                            bare soil and evaluation on airborne and satellite measurements, J.
318
                            Quant. Spectrosc. Ra., 113, 2023-2039, doi:10.1016/j.jqsrt.2012.06.027,
319
                            2012.</rawText>
320
                    </citation>
321
                    <citation position="23">
322
                        <rawText>Loveland, T. R., Zhu, Z. L., Ohlen, D. O., Brown, J. F., Reed, B.
323
                            C., and Yang, L. M.: An analysis of the IGBP global land-cover
324
                            characterization process, Photogramm. Eng. Rem. S., 65, 1021- 1032,
325
                            1999.</rawText>
326
                    </citation>
327
                    <citation position="24">
328
                        <rawText>Lunetta, R. S., Knight, J. F., Ediriwickrema, J., Lyon, J. G., and
329
                            Worthy, L. D.: Land-cover change detection using multitemporal MODIS
330
                            NDVI data, Remote Sens. Environ., 105, 142- 154,
331
                            doi:10.1016/j.rse.2006.06.018, 2006.</rawText>
332
                    </citation>
333
                    <citation position="25">
334
                        <rawText>Maignan, F., Breon, F. M., and Lacaze, R.: Bidirectional
335
                            reflectance of Earth targets: Evaluation of analytical models using a
336
                            large set of spaceborne measurements with emphasis on the Hot Spot,
337
                            Remote Sens. Environ., 90, 210-220, doi:10.1016/j.rse.2003.12.006,
338
                            2004.</rawText>
339
                    </citation>
340
                    <citation position="26">
341
                        <rawText>Maignan, F., Breon, F. M., Fedele, E., and Bouvier, M.: Polarized
342
                            reflectances of natural surfaces: Spaceborne measurements and analytical
343
                            modeling, Remote Sens. Environ., 113, 2642-2650,
344
                            doi:10.1016/j.rse.2009.07.022, 2009.</rawText>
345
                    </citation>
346
                    <citation position="27">
347
                        <rawText>Marbach, T., Riedi, J., Lacan, A., and Schlussel, P.: The 3MI
348
                            Mission: Multi-Viewing -Channel -Polarisation Imager of the EUMETSAT
349
                            Polar System: Second Generation (EPS-SG) dedicated to aerosol and cloud
350
                            monitoring, P. Soc. Photo-Opt. Ins., 9613, 961310,
351
                            doi:10.1117/12.2186978, 2015.</rawText>
352
                    </citation>
353
                    <citation position="28">
354
                        <rawText>Mishchenko, M. I., Cairns, B., Kopp, G., Schueler, C. F., Fafaul,
355
                            B. A., Hansen, J. E., Hooker, R. J., Itchkawich, T., Maring, H. B., and
356
                            Travis, L. D.: Accurate monitoring of terrestrial aerosols and total
357
                            solar irradiance - Introducing the glory mission, B. Am. Meteorol. Soc.,
358
                            88, 677-691, doi:10.1175/BAMS-88-5-677, 2007.</rawText>
359
                    </citation>
360
                    <citation position="29">
361
                        <rawText>Nadal, F. and Breon, F. M.: Parameterization of surface polarized
362
                            reflectance derived from POLDER spaceborne measurements, IEEE T. Geosci.
363
                            Remote, 37, 1709-1718, doi:10.1109/36.763292, 1999.</rawText>
364
                    </citation>
365
                    <citation position="30">
366
                        <rawText>Peltoniemi, J. I., Kaasalainen, S., Naranen, J., Matikainen, L.,
367
                            and Piironen, J.: Measurement of directional and spectral signatures of
368
                            light reflectance by snow, IEEE T. Geosci. Remote, 43, 2294- 2304,
369
                            doi:10.1109/Tgrs.2005.855131, 2005.</rawText>
370
                    </citation>
371
                    <citation position="31">
372
                        <rawText>Roujean, J. L., Leroy, M., and Deschamps, P. Y.: A Bidirectional
373
                            Reflectance Model of the Earths Surface for the Correction of
374
                            Remote-Sensing Data, J. Geophys. Res.-Atmos., 97, 20455- 20468,
375
                            1992.</rawText>
376
                    </citation>
377
                    <citation position="32">
378
                        <rawText>Schaaf, C. B., Gao, F., Strahler, A. H., Lucht, W., Li, X. W.,
379
                            Tsang, T., Strugnell, N. C., Zhang, X. Y., Jin, Y. F., Muller, J. P.,
380
                            Lewis, P., Barnsley, M., Hobson, P., Disney, M., Roberts, G.,
381
                            Dunderdale, M., Doll, C., d'Entremont, R. P., Hu, B. X., Liang, S. L.,
382
                            Privette, J. L., and Roy, D.: First operational BRDF, albedo nadir
383
                            reflectance products from MODIS, Remote Sens. Environ., 83, 135-148,
384
                            doi:10.1016/S0034-4257(02)00091-3, 2002.</rawText>
385
                    </citation>
386
                    <citation position="33">
387
                        <rawText>Schaepman-Strub, G., Schaepman, M. E., Painter, T. H., Dangel, S.,
388
                            and Martonchik, J. V.: Reflectance quantities in optical remote
389
                            sensing-definitions and case studies, Remote Sens. Environ., 103, 27-42,
390
                            doi:10.1016/j.rse.2006.03.002, 2006.</rawText>
391
                    </citation>
392
                    <citation position="34">
393
                        <rawText>Schutgens, N. A. J., Tilstra, L. G., Stammes, P., and Breon, F. M.:
394
                            On the relationship between Stokes parameters Q and U of atmospheric
395
                            ultraviolet/visible/near-infrared radiation, J. Geophys. Res.-Atmos.,
396
                            109, D09205, doi:10.1029/2003jd004081, 2004.</rawText>
397
                    </citation>
398
                    <citation position="35">
399
                        <rawText>Tanré, D., Bréon, F. M., Deuzé, J. L., Dubovik, O., Ducos, F.,
400
                            François, P., Goloub, P., Herman, M., Lifermann, A., and Waquet, F.:
401
                            Remote sensing of aerosols by using polarized, directional and spectral
402
                            measurements within the A-Train: the PARASOL mission, Atmos. Meas.
403
                            Tech., 4, 1383-1395, doi:10.5194/amt-4-1383-2011, 2011.</rawText>
404
                        <id value="doajarticles::33b0e0594de556367731f5f7bfacc513" type="openaire"
405
                            confidenceLevel="0.648629"/>
406
                    </citation>
407
                    <citation position="36">
408
                        <rawText>Verstraete, M. M., Pinty, B., and Dickinson, R. E.: A Physical
409
                            Model of the Bidirectional Reflectance of Vegetation Canopies - 1.
410
                            Theory, J. Geophys. Res.-Atmos., 95, 11755-11765,
411
                            doi:10.1029/JD095iD08p11755, 1990.</rawText>
412
                    </citation>
413
                    <citation position="37">
414
                        <rawText>Waquet, F., Leon, J. F., Cairns, B., Goloub, P., Deuze, J. L., and
415
                            Auriol, F.: Analysis of the spectral and angular response of the
416
                            vegetated surface polarization for the purpose of aerosol remote sensing
417
                            over land, Appl. Opt., 48, 1228-1236, doi:10.1364/Ao.48.001228,
418
                            2009a.</rawText>
419
                    </citation>
420
                    <citation position="38">
421
                        <rawText>Waquet, F., Riedi, J., Labonnote, L. C., Goloub, P., Cairns, B.,
422
                            Deuze, J. L., and Tanre, D.: Aerosol Remote Sensing over Clouds Using
423
                            A-Train Observations, J. Atmos. Sci., 66, 2468-2480,
424
                            doi:10.1175/2009jas3026.1, 2009b.</rawText>
425
                    </citation>
426
                </citations>
427
            </extraInfo>
121 428
        </oaf:entity>
122 429
    </metadata>
123 430
</result>
modules/dnet-wds/trunk/test/resources/eu/dnetlib/wds/parser/DMFinput.xml
1 1
<?xml version="1.0" encoding="UTF-8"?>
2
<oai:record xmlns:oai="http://www.openarchives.org/OAI/2.0/"
3
            xmlns:dri="http://www.driver-repository.eu/namespace/dri"
4
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
2
<oai:record xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3
            xmlns:oai="http://www.openarchives.org/OAI/2.0/"
4
            xmlns:dri="http://www.driver-repository.eu/namespace/dri">
5 5
    <oai:header>
6
        <dri:objIdentifier>r3d100010134::000083be706192d2d839915694ecfd47</dri:objIdentifier>
7
        <dri:recordIdentifier>oai:pangaea.de:doi:10.1594/PANGAEA.821876</dri:recordIdentifier>
8
        <dri:dateOfCollection>2017-09-15T17:20:08.251+02:00</dri:dateOfCollection>
9
        <dri:repositoryId>
10
            4376eb90-9912-4502-ae8a-6361180d44aa_UmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZXMvUmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZVR5cGU=
11
        </dri:repositoryId>
6
        <dri:objIdentifier>r3d100010134::099d95ccb576b6df655b5808520410b1</dri:objIdentifier>
7
        <dri:recordIdentifier>oai:pangaea.de:doi:10.1594/PANGAEA.864090</dri:recordIdentifier>
8
        <dri:dateOfCollection>2017-10-13T14:59:25.775+02:00</dri:dateOfCollection>
9
        <dri:repositoryId>d35a517d-341a-4ba2-85c5-31f43eb5e46b_UmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZXMvUmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZVR5cGU=</dri:repositoryId>
12 10
        <dri:datasourceprefix>r3d100010134</dri:datasourceprefix>
13
        <identifier xmlns="http://www.openarchives.org/OAI/2.0/">oai:pangaea.de:doi:10.1594/PANGAEA.821876</identifier>
14
        <datestamp xmlns="http://www.openarchives.org/OAI/2.0/">2017-08-09T23:37:48Z</datestamp>
11
        <identifier xmlns="http://www.openarchives.org/OAI/2.0/">oai:pangaea.de:doi:10.1594/PANGAEA.864090</identifier>
12
        <datestamp xmlns="http://www.openarchives.org/OAI/2.0/">2017-08-05T11:19:40Z</datestamp>
13
        <setSpec xmlns="http://www.openarchives.org/OAI/2.0/">citable</setSpec>
14
        <setSpec xmlns="http://www.openarchives.org/OAI/2.0/">citableWithChilds</setSpec>
15
        <setSpec xmlns="http://www.openarchives.org/OAI/2.0/">supplement</setSpec>
15 16
    </oai:header>
16 17
    <metadata xmlns="http://www.openarchives.org/OAI/2.0/">
17 18
        <resource xmlns="http://datacite.org/schema/kernel-3"
18 19
                  xsi:schemaLocation="http://datacite.org/schema/kernel-3 http://schema.datacite.org/meta/kernel-3/metadata.xsd">
19
            <identifier xmlns="" identifierType="DOI"/>
20
            <creators xmlns="">
20
            <identifier identifierType="DOI">10.1594/PANGAEA.864090</identifier>
21
            <creators>
21 22
                <creator>
22
                    <creatorName>Macke, Andreas</creatorName>
23
                    <creatorName>Bréon, François-Marie</creatorName>
24
                    <nameIdentifier schemeURI="http://orcid.org" nameIdentifierScheme="ORCID">0000-0003-2128-739X</nameIdentifier>
23 25
                </creator>
24
                <creator>
25
                    <creatorName>Kalisch, John</creatorName>
26
                </creator>
27 26
            </creators>
28
            <titles xmlns="">
29
                <title>Total Sky Imager observations during POLARSTERN cruise ANT-XXVI/4 on 2010-05-14 with links to
30
                    images
31
                </title>
27
            <titles>
28
                <title>A BRDF-BPDF database for the analysis of Earth targets reflectances, supplement to: Bréon, François-Marie; Maignan, Fabienne (2016): A BRDF-BPDF database for the analysis of Earth targets reflectances. Earth System Science Data, 9, 31-45</title>
32 29
            </titles>
33
            <publisher xmlns="">PANGAEA - Data Publisher for Earth &amp; Environmental Science</publisher>
34
            <publicationYear xmlns="">2013</publicationYear>
30
            <publisher>PANGAEA - Data Publisher for Earth &amp; Environmental Science</publisher>
31
            <publicationYear>2016</publicationYear>
35 32
            <subjects>
36
                <subject subjectScheme="Parameter">LATITUDE</subject>
37
                <subject subjectScheme="Parameter">LONGITUDE</subject>
38
                <subject subjectScheme="Parameter">Uniform resource locator/link to image</subject>
39
                <subject subjectScheme="Method">Total Sky Imager</subject>
40
                <subject subjectScheme="Campaign">ANT-XXVI/4</subject>
41
                <subject subjectScheme="Basis">Polarstern</subject>
33
                <subject subjectScheme="targetCatalogue">GetInfo</subject>
42 34
            </subjects>
43
            <descriptions>
44
                <description>This is a description</description>
45
                <description>This is another description</description>
46

  
47
            </descriptions>
48
            <dates xmlns="">
49
                <date dateType="Collected">2010-05-14T00:13:47/2010-05-14T23:55:47</date>
50
            </dates>
51
            <language xmlns="">eng</language>
52
            <resourceType xmlns="" resourceTypeGeneral="Dataset">Dataset</resourceType>
53
            <relatedIdentifiers xmlns="">
54
                <relatedIdentifier relatedIdentifierType="URL" relationType="IsPartOf">
55
                    https://doi.org/10.1594/PANGAEA.821878
56
                </relatedIdentifier>
57
                <relatedIdentifier relatedIdentifierType="URL" relationType="References">
58
                    http://hs.pangaea.de/Images/Airphoto/PS/PS75/2010-05-14/ANT-XXVI_4_2010-05-14_TSI-images-links.zip
59
                </relatedIdentifier>
60
                <relatedIdentifier relatedIdentifierType="URL" relationType="References">
61
                    https://doi.org/10.1051/epjconf/201009006
62
                </relatedIdentifier>
35
            <contributors>
36
                <contributor contributorType="HostingInstitution">
37
                    <contributorName>Laboratoire des sciences du climat et de l'environnement, Saclay</contributorName>
38
                </contributor>
39
            </contributors>
40
            <language>eng</language>
41
            <resourceType resourceTypeGeneral="Dataset">Supplementary Dataset</resourceType>
42
            <relatedIdentifiers>
43
                <relatedIdentifier xmlns="" xmlns:oaf="http://namespace.dnet.eu/oaf" relatedIdentifierType="DOI"
44
                                   relationType="isSupplementTo"
45
                                   inverseRelationType="isSupplementedBy">10.5194/essd-9-31-2017</relatedIdentifier>
46
                <relatedIdentifier xmlns="" xmlns:oaf="http://namespace.dnet.eu/oaf" relatedIdentifierType="URL"
47
                                   relationType="isDocumentedBy"
48
                                   inverseRelationType="documents">http://store.pangaea.de/Publications/Breon_2016/map_IGBP.PNG</relatedIdentifier>
49
                <relatedIdentifier xmlns="" xmlns:oaf="http://namespace.dnet.eu/oaf" relatedIdentifierType="URL"
50
                                   relationType="isDocumentedBy"
51
                                   inverseRelationType="documents">http://store.pangaea.de/Publications/Breon_2016/screenshot.png</relatedIdentifier>
63 52
            </relatedIdentifiers>
64
            <sizes xmlns="">
65
                <size>3495 data points</size>
53
            <sizes>
54
                <size>72.0 MBytes</size>
66 55
            </sizes>
67
            <formats xmlns="">
68
                <format>text/tab-separated-values</format>
56
            <formats>
57
                <format>application/zip</format>
69 58
            </formats>
70
            <rightsList xmlns="">
71
                <rights rightsURI="http://creativecommons.org/licenses/by-nc/3.0/">Creative Commons
72
                    Attribution-NonCommercial 3.0 Unported (CC-BY-NC)
73
                </rights>
59
            <rightsList>
60
                <rights rightsURI="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 Unported (CC-BY)</rights>
74 61
            </rightsList>
75
            <geoLocations xmlns="">
76
                <geoLocation>
77
                    <geoLocationBox>47.533 -7.333 49.7 -3.3</geoLocationBox>
78
                </geoLocation>
79
            </geoLocations>
62
            <descriptions>
63
                <description descriptionType="Abstract">A database of representative BRDF and BPDF derived from the POLDER measurements. From the huge amount of data acquired by the spaceborne instrument over a period of 7 years, we selected a set of targets with high quality observations. The selection aimed at a large number of observations, free of cloud or aerosol contamination, acquired in diverse observation geometry with a focus on the backscatter direction that shows the specific Hot-Spot signature. The targets are sorted according to the 16-classes IGBP land cover classification system and the target selection aims at a spatial representativeness within the class. The database thus provides a set of high quality BRDF and BPDF samples that can be used to assess the typical variability of natural surface reflectances or to evaluate models.</description>
64
            </descriptions>
80 65
        </resource>
81 66
    </metadata>
82 67
    <oai:about>
83 68
        <provenance xmlns="http://www.openarchives.org/OAI/2.0/provenance"
84 69
                    xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/provenance http://www.openarchives.org/OAI/2.0/provenance.xsd">
85
            <originDescription xmlns="" altered="true" harvestDate="2017-09-15T17:20:08.251+02:00">
70
            <originDescription harvestDate="2017-10-13T14:59:25.775+02:00" altered="true">
86 71
                <baseURL>http%3A%2F%2Fws.pangaea.de%2Foai%2Fprovider</baseURL>
87
                <identifier>oai:pangaea.de:doi:10.1594/PANGAEA.821876</identifier>
88
                <datestamp>2017-08-09T23:37:48Z</datestamp>
72
                <identifier>oai:pangaea.de:doi:10.1594/PANGAEA.864090</identifier>
73
                <datestamp>2017-08-05T11:19:40Z</datestamp>
89 74
                <metadataNamespace/>
90 75
            </originDescription>
91 76
        </provenance>
modules/dnet-wds/trunk/src/main/java/eu/dnetlib/resolver/mdstore/plugin/WDSRecordResolver.java
56 56
    }
57 57

  
58 58
    protected Map<String, ObjectType> tryToResolveRelation(final PID currentPid) {
59
        if (currentPid.getId() != null && currentPid.getId().contains("dli_resolver")) {
59
        if (currentPid.getId() != null && currentPid.getId().contains("wds_resolver")) {
60 60
            return null;
61 61
        }
62 62
        log.debug("tryToResolveRelation " + currentPid);
modules/dnet-wds/trunk/src/main/java/eu/dnetlib/wds/resolver/OpenAireParser.java
36 36
            ap.declareXPathNameSpace("oaf", "http://namespace.openaire.eu/oaf");
37 37

  
38 38
            final List<VtdUtilityParser.Node> subjectNodes =
39
                    VtdUtilityParser.getTextValuesWithAttributes(ap, vn, "//oaf:result//subject", Arrays.asList("classname", "schemename"));
39
                    VtdUtilityParser.getTextValuesWithAttributes(ap, vn, "//*[local-name()='result']//*[local-name()='subject']", Arrays.asList("classname", "schemename"));
40 40

  
41 41
            //Setting subjects
42 42
            if (subjectNodes != null && subjectNodes.size() > 0) {
......
49 49
            }
50 50

  
51 51
            //Setting Titles
52
            final List<String> titles = VtdUtilityParser.getTextValue(ap, vn, "//oaf:result/title");
52
            final List<String> titles = VtdUtilityParser.getTextValue(ap, vn, "//*[local-name()='result']/*[local-name()='title']");
53 53

  
54 54
            if (titles != null && titles.size() > 0) {
55 55
                currentObject.setTitles(titles);
56 56
            }
57 57

  
58 58
            //Setting authors
59
            final List<String> authorNodes = VtdUtilityParser.getTextValue(ap, vn, "//oaf:result//fullname");
59
            final List<String> authorNodes = VtdUtilityParser.getTextValue(ap, vn, "//*[local-name()='result']//*[local-name()='fullname']");
60 60
            if (authorNodes != null && authorNodes.size() > 0) {
61 61
                currentObject.setAuthors(authorNodes);
62 62
            }
63 63

  
64 64
            //Setting descriptions
65
            final List<String> descriptions = VtdUtilityParser.getTextValue(ap, vn, "//oaf:result//description");
65
            final List<String> descriptions = VtdUtilityParser.getTextValue(ap, vn, "//*[local-name()='result']//*[local-name()='description']");
66 66
            if (descriptions != null && descriptions.size() > 0) {
67 67
                descriptions.forEach(d -> currentObject.addDescription(new Pair<>("unknown", d)));
68 68
            }
69 69

  
70 70
            //resulttype classid
71
            final List<VtdUtilityParser.Node> resutlTypes = VtdUtilityParser.getTextValuesWithAttributes(ap, vn, "//oaf:result/resulttype", Arrays.asList("classid"));
71
            final List<VtdUtilityParser.Node> resutlTypes = VtdUtilityParser.getTextValuesWithAttributes(ap, vn, "//*[local-name()='result']/*[local-name()='resulttype']", Arrays.asList("classid"));
72 72
            if (resutlTypes != null && resutlTypes.size() > 0) {
73 73
                final String type = resutlTypes.get(0).getAttributes().get("classid");
74 74
                setType(currentObject, type);
75 75
            }
76 76

  
77
            ap.selectXPath("//rel[./to/@type='project']");
77
            ap.selectXPath("//*[local-name()='rel'][./to/@type='project']");
78 78
            while (ap.evalXPath() != -1) {
79 79
                final List<String> projectTitles = VtdUtilityParser.getTextValue(ap, vn, "./title");
80 80
                final List<String> projectAcronym = VtdUtilityParser.getTextValue(ap, vn, "./acronym");
......
94 94
                        .setGrantID(projectCodes.get(0))
95 95
                        .setName(projectTitles.get(0)));
96 96
            }
97
            return currentObject;
97
                return currentObject;
98 98
        } catch (Throwable e) {
99 99
            log.error("Error on parsing object ", e);
100 100
            return null;
modules/dnet-wds/trunk/src/main/resources/eu/dnetlib/bootstrap/profiles/TransformationRuleDSResources/TransformationRuleDSResourceType/datacite_dmf.xml
1
<RESOURCE_PROFILE>
2
    <HEADER>
3
        <RESOURCE_IDENTIFIER
4
                value="0ef0ac75-0eba-4291-956e-afb762c351b6_VHJhbnNmb3JtYXRpb25SdWxlRFNSZXNvdXJjZXMvVHJhbnNmb3JtYXRpb25SdWxlRFNSZXNvdXJjZVR5cGU="/>
5
        <RESOURCE_TYPE value="TransformationRuleDSResourceType"/>
6
        <RESOURCE_KIND value="TransformationRuleDSResources"/>
7
        <RESOURCE_URI value=""/>
8
        <DATE_OF_CREATION value="2014-11-19T11:05:55+01:00"/>
9
    </HEADER>
10
    <BODY>
11
        <CONFIGURATION>
12
            <IMPORTED/>
13
            <SCRIPT>
14
                <TITLE>WDS: OAI_Datacite to DMF transform</TITLE>
15
                <CODE><![CDATA[
16
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
17
	xmlns:dnet="eu.dnetlib.wds.utils.WDSUtils"
18
	xmlns:dri="http://www.driver-repository.eu/namespace/dri"
19
    xmlns:oaf="http://namespace.dnet.eu/oaf" version="2.0" exclude-result-prefixes="xsl dnet">
20
    <xsl:template match="/">
21
        <xsl:choose>
22
            <xsl:when test="not(//*[lower-case(local-name()) = 'metadata'])">
23
                <record/>
24
            </xsl:when>
25
            <xsl:otherwise>
26
                <xsl:apply-templates mode="wds"></xsl:apply-templates>
27
            </xsl:otherwise>
28
        </xsl:choose>
29
    </xsl:template>
30

  
31
    <xsl:template match="@*|node()" mode="wds">
32
        <xsl:copy>
33
            <xsl:apply-templates select="@*|node()" mode="wds"/>
34
        </xsl:copy>
35
    </xsl:template>
36

  
37
    <xsl:template match="*[local-name()='relatedIdentifier']" mode="wds">
38
         <xsl:choose>
39
            <xsl:when test="string-length(normalize-space(./@relatedIdentifierType)) &gt; 0 and string-length(normalize-space(./@relationType)) &gt; 0 and string-length(normalize-space(.)) &gt; 0">
40
                <relatedIdentifier>
41
                    <xsl:attribute name="relatedIdentifierType"><xsl:value-of select="./@relatedIdentifierType"/></xsl:attribute>
42
                    <xsl:attribute name="relationType"><xsl:value-of select="dnet:normalizeRelation(./@relationType)"/></xsl:attribute>
43
                    <xsl:attribute name="inverseRelationType"><xsl:value-of select="dnet:getInverse(./@relationType)"/></xsl:attribute>
44
                    <xsl:value-of select="."/>
45
                </relatedIdentifier>
46
            </xsl:when>
47
        </xsl:choose>
48
    </xsl:template>
49

  
50
</xsl:stylesheet>
51
]]>
52
                </CODE>
53
            </SCRIPT>
54
        </CONFIGURATION>
55
        <STATUS/>
56
        <SECURITY_PARAMETERS/>
57
    </BODY>
58
</RESOURCE_PROFILE>
modules/dnet-graph/trunk/dnet-graph.iml
1 1
<?xml version="1.0" encoding="UTF-8"?>
2 2
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3
  <component name="FacetManager">
4
    <facet type="Spring" name="Spring">
5
      <configuration />
6
    </facet>
7
  </component>
3 8
  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
4 9
    <output url="file://$MODULE_DIR$/target/classes" />
5 10
    <output-test url="file://$MODULE_DIR$/target/test-classes" />
6 11
    <content url="file://$MODULE_DIR$">
7 12
      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
8 13
      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
14
      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
9 15
      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
10
      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
11 16
      <excludeFolder url="file://$MODULE_DIR$/target" />
12 17
    </content>
13 18
    <orderEntry type="inheritedJdk" />
14 19
    <orderEntry type="sourceFolder" forTests="false" />
15
    <orderEntry type="module" module-name="dnet-msro-service" />
16
    <orderEntry type="module" module-name="dnet-core-services" />
17
    <orderEntry type="module" module-name="dnet-core-components" />
20
    <orderEntry type="library" name="Maven: eu.dnetlib:dnet-msro-service:5.0.0-SNAPSHOT" level="project" />
21
    <orderEntry type="library" name="Maven: eu.dnetlib:dnet-core-services:1.0.0-SNAPSHOT" level="project" />
22
    <orderEntry type="library" name="Maven: eu.dnetlib:dnet-core-components:1.0.0-SNAPSHOT" level="project" />
18 23
    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.2.5.RELEASE" level="project" />
19 24
    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.2.5.RELEASE" level="project" />
20 25
    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.2.5.RELEASE" level="project" />
modules/dnet-pid-resolver/trunk/src/main/java/eu/dnetlib/pid/resolver/store/ResolverStore.java
39 39
			"pid",
40 40
			"pid_type",
41 41
			"resolver",
42
			"dnet_identifier"
43

  
42
			"dnet_identifier",
43
			"typology"
44 44
	));
45 45
	private final UpdateOptions upsert = new UpdateOptions().upsert(true);
46 46

  
......
91 91
                .add("pid_type", resolvedObject.getPidType().toLowerCase())
92 92
                .add("dnet_identifier", generateDNetIdentifier(resolvedObject))
93 93
				.add("resolver", resolver)
94
				.add("typology", resolvedObject.getType().toString())
94 95
				.add("body", resolvedObject.toJsonString())
95 96
				.get();
96 97
		final Bson dnet_identifier = (Bson) BasicDBObjectBuilder.start().add("dnet_identifier", ns_header + resolvedObject.getIdentifier()).get();

Also available in: Unified diff