Project

General

Profile

« Previous | Next » 

Revision 39164

Added by Marek Horst over 8 years ago

merging trunk changes with IIS-CDH-5.3.0 branch

View differences:

workflow.xml
190 190
					<name>active_import_concept</name>
191 191
					<value>true</value>
192 192
				</property>
193
				<!-- import project related -->
194
				<property>
195
					<name>database_service_location</name>
196
					<value>${database_service_location}</value>
197
				</property>
198
				<property>
199
					<name>database_dbname</name>
200
					<value>${database_dbname}</value>
201
				</property>
202
				<!-- import datacite related -->
203
				<property>
204
					<name>mdstore_service_location</name>
205
					<value>${mdstore_service_location}</value>
206
				</property>
207
				<property>
208
					<name>dataset_mdstore_ids_csv</name>
209
					<value>${dataset_mdstore_ids_csv}</value>
210
				</property>
211
				<!-- import content related -->
212
				<property>
213
					<name>objectstore_service_location</name>
214
					<value>${objectstore_service_location}</value>
215
				</property>
216
				<property>
217
					<name>approved_objectstores_csv</name>
218
					<value>${approved_objectstores_csv}</value>
219
				</property>
220
				<property>
221
					<name>mimetypes_pdf</name>
222
					<value>${mimetypes_pdf}</value>
223
				</property>
224
				<property>
225
					<name>mimetypes_text</name>
226
					<value>${mimetypes_text}</value>
227
				</property>
228
				<property>
229
					<name>mimetypes_html</name>
230
					<value>${mimetypes_html}</value>
231
				</property>
232
				<property>
233
					<name>mimetypes_xml_pmc</name>
234
					<value>${mimetypes_xml_pmc}</value>
235
				</property>
236
				<property>
237
					<name>mimetypes_wos</name>
238
					<value>${mimetypes_wos}</value>
239
				</property>
240
				<!-- import timeouts related -->
241
				<property>
242
					<name>resultset_client_read_timeout</name>
243
					<value>${resultset_client_read_timeout}</value>
244
				</property>
245
				<property>
246
					<name>content_connection_timeout</name>
247
					<value>${content_connection_timeout}</value>
248
				</property>
249
				<property>
250
					<name>content_read_timeout</name>
251
					<value>${content_read_timeout}</value>
252
				</property>
253
				<!-- metadata extraction related -->
254
				<property>
255
					<name>metadataextraction_excluded_checksums</name>
256
					<value>${metadataextraction_excluded_checksums}</value>
257
				</property>
258
				<property>
259
					<name>metadataextraction_max_file_size_mb</name>
260
					<value>${metadataextraction_max_file_size_mb}</value>
261
				</property>
262
				<property>
263
					<name>metadataextraction_default_cache_location</name>
264
					<value>${metadataextraction_default_cache_location}</value>
265
				</property>
266
				<!-- metadata import output subdirectory names -->
267
				<property>
268
					<name>metadataimport_output_name_project</name>
269
					<value>${metadataimport_output_name_project}</value>
270
				</property>
271
				<!-- project concept related -->
272
				<property>
273
					<name>islookup_service_location</name>
274
					<value>${islookup_service_location}</value>
275
				</property>
276
				<property>
277
					<name>project_concepts_context_ids_csv</name>
278
					<value>${project_concepts_context_ids_csv}</value>
279
				</property>
280
				<!-- output parameters -->
281
				<property>
282
					<name>output_extracted_document_metadata</name>
283
					<value>${output_extracted_document_metadata}</value>
284
				</property>
285
				<property>
286
					<name>output_metadataimport_root</name>
287
					<value>${output_metadataimport_root}</value>
288
				</property>
289
				<property>
290
					<name>output_dataset</name>
291
					<value>${output_dataset}</value>
292
				</property>
293
				<property>
294
					<name>output_dataset_to_mdstore</name>
295
					<value>${output_dataset_to_mdstore}</value>
296
				</property>
297
				<property>
298
					<name>output_citation_pmc</name>
299
					<value>${workingDir}/citation_pmc</value>
300
				</property>
301
				<property>
302
					<name>output_document_text</name>
303
					<value>${output_document_text}</value>
304
				</property>
305
				<property>
306
					<name>output_wos</name>
307
					<value>${output_wos}</value>
308
				</property>
309
				<property>
310
					<name>output_project_concept</name>
311
					<value>${output_project_concept}</value>
312
				</property>
313
				<property>
314
					<name>output_faults</name>
315
					<value>${output_faults}</value>
316
				</property>
193
				<!-- all the other properties autmatically propagated-->
317 194
			</configuration>
318 195
        </sub-workflow>
319 196
		<ok to="import_joining" />
......
329 206
                    <name>workingDir</name>
330 207
                    <value>${workingDir}/wos_url_import/working_dir</value>
331 208
                </property>
332
                <property>
333
					<name>objectstore_service_location</name>
334
					<value>${objectstore_service_location}</value>
335
				</property>
336 209
				<property>
337 210
					<name>approved_objectstores_csv</name>
338 211
					<value>${wos_plaintext_objectstores_csv}</value>
......
345 218
					<name>output_name_wos</name>
346 219
					<value>wos</value>
347 220
				</property>
348
				<property>
349
					<name>mimetypes_wos</name>
350
					<value>${mimetypes_wos}</value>
351
				</property>
352
				<property>
353
					<name>resultset_client_read_timeout</name>
354
					<value>${resultset_client_read_timeout}</value>
355
				</property>
221
				<!-- all the other properties autmatically propagated-->
356 222
			</configuration>
357 223
        </sub-workflow>
358 224
		<ok to="wos_import_plaintext" />
......
372 238
					<name>input</name>
373 239
					<value>${workingDir}/wos_url_import/imported/wos</value>
374 240
				</property>
375
				<property>
376
				    <name>content_connection_timeout</name>
377
				   <value>${content_connection_timeout}</value>
378
				</property>
379
				<property>
380
				    <name>content_read_timeout</name>
381
				   <value>${content_read_timeout}</value>
382
				</property>
383 241
            	<property>
384 242
					<name>output</name>
385 243
					<value>${output_wos_text}</value>
386 244
				</property>
245
				<!-- all the other properties are autmatically propagated-->
387 246
			</configuration>
388 247
        </sub-workflow>
389 248
		<ok to="import_joining" />

Also available in: Unified diff