Project

General

Profile

« Previous | Next » 

Revision 46790

fixed EFG Download plugin and decreased the number of threads for generation of thumbnails

View differences:

modules/dnet-efg/trunk/src/main/java/eu/dnetlib/efg/download/plugin/EFGDownloadPlugin.java
20 20
		if (baseURL == null)
21 21
			return null;
22 22
		for (String s : suffix) {
23
			if (baseURL.endsWith(s))
23
			if (baseURL.trim().endsWith(s))
24 24
				return baseURL;
25 25
		}
26 26
		return null;
modules/dnet-efg/trunk/src/main/java/eu/dnetlib/efg/workflows/nodes/thumbnail/GenerateThumbnailJobNode.java
62 62

  
63 63
		final List<Future<Boolean>> responses = new ArrayList<>();
64 64

  
65
        for (int i = 0; i < 10; i++) {
66
            responses.add(executor.submit(new WorkerMap(objectStore, objectStore250, objectStore96, queue)));
65
		for (int i = 0; i < 4; i++) {
66
			responses.add(executor.submit(new WorkerMap(objectStore, objectStore250, objectStore96, queue)));
67 67
        }
68 68

  
69 69
		this.counter = 0;
modules/dnet-efg/trunk/src/main/resources/eu/dnetlib/efg/lightui/xslt/efg_2_document.xslt
76 76
								<strong>Synopsis</strong>
77 77
							</td>
78 78
							<td>
79
								<xsl:for-each select="//efg:description[@type='synopsis']">
79
                                <xsl:for-each select="//efg:description[@type='Synopsis']">
80 80
									<xsl:value-of select="."/>
81 81
									<br/>
82 82
								</xsl:for-each>
modules/dnet-efg/trunk/src/main/resources/eu/dnetlib/efg/workflows/repo-hi/efg_aggregation_wf.xml.st
106 106
                        <PARAM name="wfTemplateParams">
107 107
                            <MAP>
108 108
                                <ENTRY key="dsId"           value="$dsId$" />
109
                                <ENTRY key="cleanMdstoreId" ref="cleanMdstoreId" />
109
                                <ENTRY key="efgMdstoreId" ref="cleanMdstoreId" />
110 110
                                <ENTRY key="edmMdstoreId"   ref="edmMdstoreId" />
111 111
                                <ENTRY key="ruleId"         ref="edmRuleId" />
112 112
                            </MAP>
modules/dnet-efg/trunk/src/main/resources/eu/dnetlib/bootstrap/profiles/repository/fdc.xml
1
<RESOURCE_PROFILE>
2
    <HEADER>
3
        <RESOURCE_IDENTIFIER
4
                value="400e506f-3609-4391-8d63-b8760469bd2e_UmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZXMvUmVwb3NpdG9yeVNlcnZpY2VSZXNvdXJjZVR5cGU="/>
5
        <RESOURCE_TYPE value="RepositoryServiceResourceType"/>
6
        <RESOURCE_KIND value="RepositoryServiceResources"/>
7
        <RESOURCE_URI value=""/>
8
        <DATE_OF_CREATION value="2016-03-24T12:40:17+01:00"/>
9
        <PROTOCOL/>
10
    </HEADER>
11
    <BODY>
12
        <CONFIGURATION>
13
            <DATASOURCE_TYPE>efg:contentprovider</DATASOURCE_TYPE>
14
            <DATASOURCE_ORIGINAL_ID provenance="EFG">fdc</DATASOURCE_ORIGINAL_ID>
15
            <DATASOURCE_AGGREGATED>false</DATASOURCE_AGGREGATED>
16
            <ENVIRONMENTS>
17
                <ENVIRONMENT>EFG</ENVIRONMENT>
18
            </ENVIRONMENTS>
19
            <TYPOLOGY/>
20
            <MAX_SIZE_OF_DATASTRUCTURE>0</MAX_SIZE_OF_DATASTRUCTURE>
21
            <AVAILABLE_DISKSPACE>0</AVAILABLE_DISKSPACE>
22
            <MAX_NUMBER_OF_DATASTRUCTURE>0</MAX_NUMBER_OF_DATASTRUCTURE>
23
            <OFFICIAL_NAME>Filmoteca de Catalunya</OFFICIAL_NAME>
24
            <ENGLISH_NAME>Filmoteca de Catalunya</ENGLISH_NAME>
25
            <ICON_URI>http://www.filmoteca.cat/web/</ICON_URI>
26
            <COUNTRY/>
27
            <LOCATION>
28
                <LONGITUDE>2.35</LONGITUDE>
29
                <LATITUDE>48.85</LATITUDE>
30
                <TIMEZONE>1.0</TIMEZONE>
31
            </LOCATION>
32
            <REPOSITORY_WEBPAGE>http://www.filmoteca.cat/web/</REPOSITORY_WEBPAGE>
33
            <REPOSITORY_INSTITUTION/>
34
            <ADMIN_INFO>sandro.labruzzo@isti.cnr.it</ADMIN_INFO>
35
            <INTERFACES>
36
                <INTERFACE active="false" compliance="efg" contentDescription="metadata" id="api_________::fdc::0"
37
                           label="content provider" removable="false" typology="efg:contentprovider">
38
                    <ACCESS_PROTOCOL extensions="efg">filesystem</ACCESS_PROTOCOL>
39
                    <BASE_URL>file:///var/lib/efg-import/FDC</BASE_URL>
40
                    <INTERFACE_EXTRA_FIELD name="metadata_identifier_path">
41
                        //*[local-name()='header']/*[local-name()='identifier']
42
                    </INTERFACE_EXTRA_FIELD>
43
                </INTERFACE>
44
            </INTERFACES>
45
            <EXTRA_FIELDS>
46
                <FIELD>
47
                    <key>DataSourceId</key>
48
                    <value>fdc</value>
49
                </FIELD>
50
                <FIELD>
51
                    <key>NamespacePrefix</key>
52
                    <value>fdc</value>
53
                </FIELD>
54
                <FIELD>
55
                    <key>VERIFIED</key>
56
                    <value>NO</value>
57
                </FIELD>
58
            </EXTRA_FIELDS>
59
            <REGISTERED_BY>sandro.labruzzo@isti.cnr.it</REGISTERED_BY>
60
        </CONFIGURATION>
61
        <STATUS>
62
            <NUMBER_OF_OBJECTS>0</NUMBER_OF_OBJECTS>
63
        </STATUS>
64
        <QOS>
65
            <AVAILABILITY>0</AVAILABILITY>
66
            <CAPACITY/>
67
            <THROUGHPUT>0.0</THROUGHPUT>
68
        </QOS>
69
        <SECURITY_PARAMETERS/>
70
        <BLACKBOARD/>
71
    </BODY>
72
</RESOURCE_PROFILE>
modules/dnet-efg/trunk/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/efg_post_feed_oai.xml
96 96
						<ARC to="success"/>
97 97
					</ARCS>
98 98
				</NODE>
99
			</WORKFLOW>
99

  
100

  
101
                <NODE name="setEFGFormat" type="SetFormatInfo" isStart="true">
102
                    <DESCRIPTION>Set Format Info</DESCRIPTION>
103
                    <PARAMETERS>
104
                        <PARAM name="format" value="efg"/>
105
                        <PARAM name="layout" value="store"/>
106
                        <PARAM name="interpretation" value="cleaned"/>
107
                        <PARAM name="formatParam" value="oai_efg_format"/>
108
                        <PARAM name="layoutParam" value="oai_efg_layout"/>
109
                        <PARAM name="interpretationParam" value="oai_efg_interpretation"/>
110
                    </PARAMETERS>
111
                    <ARCS>
112
                        <ARC to="prepareEFGOAI"/>
113
                    </ARCS>
114
                </NODE>
115

  
116
                <NODE name="prepareEFGOAI" type="PrepareOaiJob">
117
                    <DESCRIPTION>Prepare oai feeding</DESCRIPTION>
118
                    <PARAMETERS>
119
                        <PARAM name="oaiFormat" value="efg"/>
120
                        <PARAM name="oaiLayout" value="store"/>
121
                        <PARAM name="oaiInterpretation" value="cleaned"/>
122
                        <PARAM name="oaiDbName" value="oaistore_efg"/>
123
                    </PARAMETERS>
124
                    <ARCS>
125
                        <ARC to="CompoundIndexesEFG"/>
126
                    </ARCS>
127
                </NODE>
128

  
129
                <NODE name="CompoundIndexesEFG" type="OAICreateIndex">
130
                    <DESCRIPTION>Create composite indexes for the OAI store</DESCRIPTION>
131
                    <PARAMETERS>
132
                        <PARAM name="oaiFormat" value="efg"/>
133
                        <PARAM name="oaiLayout" value="store"/>
134
                        <PARAM name="oaiInterpretation" value="cleaned"/>
135
                        <PARAM name="oaiDbName" value="oaistore_efg"/>
136
                        <PARAM name="fieldNames" value="set,datestamp;entitytype"/>
137
                    </PARAMETERS>
138
                    <ARCS>
139
                        <ARC to="ConfigIndexesEFG"/>
140
                    </ARCS>
141
                </NODE>
142

  
143
                <NODE name="ConfigIndexesEFG" type="OAIEnsureIndexes">
144
                    <DESCRIPTION>Ensure an index exists on fields as specified in the configuration profile
145
                    </DESCRIPTION>
146
                    <PARAMETERS>
147
                        <PARAM name="oaiFormat" value="efg"/>
148
                        <PARAM name="oaiLayout" value="store"/>
149
                        <PARAM name="oaiInterpretation" value="cleaned"/>
150
                        <PARAM name="oaiDbName" value="oaistore_efg"/>
151
                    </PARAMETERS>
152
                    <ARCS>
153
                        <ARC to="SetsCountEFG"/>
154
                    </ARCS>
155
                </NODE>
156

  
157
                <NODE name="SetsCountEFG" type="OAISetsCountUpdate">
158
                    <DESCRIPTION>Count records in each OAI set, for each exported metadata format linked to the given
159
                        oai collection
160
                    </DESCRIPTION>
161
                    <PARAMETERS>
162
                        <PARAM name="oaiFormat" value="efg"/>
163
                        <PARAM name="oaiLayout" value="store"/>
164
                        <PARAM name="oaiInterpretation" value="cleaned"/>
165
                        <PARAM name="oaiDbName" value="oaistore_efg"/>
166
                        <PARAM name="configuredOnly" value="false"/>
167
                    </PARAMETERS>
168
                    <ARCS>
169
                        <ARC to="ConfigSetsEFG"/>
170
                    </ARCS>
171
                </NODE>
172

  
173
                <NODE name="ConfigSetsEFG" type="OAIRefreshConfiguration">
174
                    <DESCRIPTION>Reads the current OAI configuration and upsert OAI sets accordingly (counts are updated
175
                        as well)
176
                    </DESCRIPTION>
177
                    <PARAMETERS>
178
                        <PARAM name="oaiFormat" value="efg"/>
179
                        <PARAM name="oaiLayout" value="store"/>
180
                        <PARAM name="oaiInterpretation" value="cleaned"/>
181
                        <PARAM name="oaiDbName" value="oaistore_efg"/>
182
                    </PARAMETERS>
183
                    <ARCS>
184
                        <ARC to="success"/>
185
                    </ARCS>
186
                </NODE>
187

  
188

  
189
            </WORKFLOW>
100 190
		</CONFIGURATION>
101 191
	</BODY>
102 192
</RESOURCE_PROFILE>
modules/dnet-efg/trunk/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/efg_feed_oai.xml
65 65
					<DESCRIPTION>Drop oai Store records</DESCRIPTION>
66 66
					<PARAMETERS>
67 67
						<PARAM name="setSpec" env="datasource_namespacePrefix"/>
68
						<PARAM name="oaiFormat" value="oai_efg"/>
68
                        <PARAM name="oaiFormat" value="edm"/>
69 69
						<PARAM name="oaiLayout" value="store"/>
70 70
						<PARAM name="oaiInterpretation" value="cleaned"/>
71 71
						<PARAM name="oaiDbName" value="oaistore_efg"/>
......
93 93
						<PARAM name="oaiLayout" value="store"/>
94 94
						<PARAM name="oaiInterpretation" value="cleaned"/>
95 95
						<PARAM name="oaiDbName" value="oaistore_efg"/>
96
					</PARAMETERS>
97
					<ARCS>
98
						<ARC to="success"/>
99
					</ARCS>
100
				</NODE>
96
                        <PARAM name="alwaysNewRecord" value="true"/>
97
                    </PARAMETERS>
98
                    <ARCS>
99
                        <ARC to="obtainDatasourceEFGParam"/>
100
                    </ARCS>
101
                </NODE>
102

  
103
                <NODE name="obtainDatasourceEFGParam" type="ObtainDataSourceParams">
104
                    <DESCRIPTION>Obtain datasource Params</DESCRIPTION>
105
                    <PARAMETERS>
106
                        <PARAM name="providerId" ref="dsId"/>
107
                        <PARAM name="OAIformat" value="efg"/>
108
                        <PARAM name="OAILayout" value="store"/>
109
                        <PARAM name="OAIInterpretation" value="cleaned"/>
110
                    </PARAMETERS>
111
                    <ARCS>
112
                        <ARC to="dropOAIEFGStore"/>
113
                    </ARCS>
114
                </NODE>
115
                <NODE name="dropOAIEFGStore" type="OAIDropStore">
116
                    <DESCRIPTION>Drop oai Store records</DESCRIPTION>
117
                    <PARAMETERS>
118
                        <PARAM name="setSpec" env="datasource_namespacePrefix"/>
119
                        <PARAM name="oaiFormat" value="efg"/>
120
                        <PARAM name="oaiLayout" value="store"/>
121
                        <PARAM name="oaiInterpretation" value="cleaned"/>
122
                        <PARAM name="oaiDbName" value="oaistore_efg"/>
123
                    </PARAMETERS>
124
                    <ARCS>
125
                        <ARC to="fetchEFGRecord"/>
126
                    </ARCS>
127
                </NODE>
128
                <NODE name="fetchEFGRecord" type="FetchMDStoreRecords">
129
                    <DESCRIPTION>Fetch records from MDStore</DESCRIPTION>
130
                    <PARAMETERS>
131
                        <PARAM name="mdId" ref="cleanMdstoreId"/>
132
                        <PARAM name="mdFormat" value="oai_efg"/>
133
                        <PARAM name="eprParam" value="orig_epr"/>
134
                    </PARAMETERS>
135
                    <ARCS>
136
                        <ARC to="storeOaiEFGRecords"/>
137
                    </ARCS>
138
                </NODE>
139
                <NODE name="storeOaiEFGRecords" type="SyncOAIStores">
140
                    <DESCRIPTION>Clean original records</DESCRIPTION>
141
                    <PARAMETERS>
142
                        <PARAM name="eprParam" value="orig_epr"/>
143
                        <PARAM name="oaiFormat" value="efg"/>
144
                        <PARAM name="oaiLayout" value="store"/>
145
                        <PARAM name="oaiInterpretation" value="cleaned"/>
146
                        <PARAM name="oaiDbName" value="oaistore_efg"/>
147
                        <PARAM name="alwaysNewRecord" value="true"/>
148
                    </PARAMETERS>
149
                    <ARCS>
150
                        <ARC to="success"/>
151
                    </ARCS>
152
                </NODE>
101 153
			</WORKFLOW>
102 154
		</CONFIGURATION>
103 155
	</BODY>

Also available in: Unified diff