hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 01:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge with ekt, add management of the file uploaded in submission

Browse Source
This commit is contained in:
Luigi Andrea Pascarelli
2013-10-21 18:32:02 +02:00
parent c9abc626a7 0553239760
commit f1409cf8a5
3 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dspace-api/src/main/resources/Messages.properties
View File

@@ -1684,7 +1684,7 @@ jsp.submit.start-lookup-submission.tabs.search = Search Form
jsp.submit.start-lookup-submission.tabs.result = Results
jsp.submit.start-lookup-submission.identifiers = Search for identifier
jsp.submit.start-lookup-submission.identifiers.hints = Insert publication identifiers - usually insert one identifier get accurate results, by the way is preferrable the DOI.
jsp.submit.start-lookup-submission.identifiers.hints = Fill in publication identifiers (DOI is preferable) and then press "Search". A list of all matching publications will be shown to you to select in order to proceed with the submission process.
jsp.submit.start-lookup-submission.identifier-doi = DOI (Digital Object Identifier)
jsp.submit.start-lookup-submission.identifier-doi.hint = e.g. 10.1392/dironix
jsp.submit.start-lookup-submission.identifier-pubmed = PubMed ID
@@ -1693,7 +1693,7 @@ jsp.submit.start-lookup-submission.identifier-arxiv = arXiv ID
jsp.submit.start-lookup-submission.identifier-arxiv.hint = e.g. arXiv:1302.1497
jsp.submit.start-lookup-submission.search = Free search
jsp.submit.start-lookup-submission.search.hints = Insert base info about publication: either <b>title or the couple author / year</b> is required.<br/>If you known an unique identifier about publication like <b>DOI, Pubmed, arXiv</b> you can switch on the <span id="link-ricerca-identificatore">identifier search mode</span>.
jsp.submit.start-lookup-submission.search.hints = Insert base info about publication: either <b>title</b> or <b>author/year</b> is required.<br/>If you know any unique identifier about publication like <b>DOI</b>, <b>Pubmed</b>, or <b>arXiv</b> you can switch on the <span id="link-ricerca-identificatore">identifier search mode</span>.
jsp.submit.start-lookup-submission.search.title = Title
jsp.submit.start-lookup-submission.search.year = Year
jsp.submit.start-lookup-submission.search.authors = Authors/Publishers
@@ -1701,29 +1701,29 @@ jsp.submit.start-lookup-submission.identifier.lookup = Search
jsp.submit.start-lookup-submission.search-go = Search
jsp.submit.start-lookup-submission.exit = Exit
jsp.submit.start-lookup-submission.search-loading.title = Loading...
jsp.submit.start-lookup-submission.search-loading.hint = Quering the external service to retrieve the publication if you desire. Waiting the complete request, if you close this windows the request abort.
jsp.submit.edit-metadata.affiliation.select = Multiple possible matches, please select
jsp.submit.start-lookup-submission.search-loading.hint = Quering the external service to retrieve the requested publications. Please, wait for the request to complete. if you close this window, the request will be aborted.
jsp.submit.edit-metadata.affiliation.select = Multiple possible matches, please select one to proceed!
jsp.submit.edit-metadata.affiliation.other = Other
jsp.submit.start-lookup-submission.no-collection = No collection selected
jsp.submit.start-lookup-submission.no-collection-warn.title = Warning, no collection
jsp.submit.start-lookup-submission.no-collection-warn.hint = The collection of the pubblication is required.
jsp.submit.start-lookup-submission.no-collection-warn.hint = The collection of the publication is required.
jsp.submit.start-lookup-submission.manual-submission = Default mode Submission
jsp.submit.start-lookup-submission.button.manual-submission = Manual submission
jsp.submit.start-lookup-submission.select.collection.label = Select collections:
jsp.submit.start-lookup-submission.select.collection.defaultoption = Select...
jsp.submit.start-lookup-submission.noresult = No results available!
jsp.submit.start-lookup-submission.js.errormessage = Sorry, an error is occurred. Try again. If this message will show again please, contact administrators and continue to insert the submission manually. Thank you.
jsp.submit.start-lookup-submission.js.errormessage = Sorry, an error occurred. Try again. If this message shows again, please, contact administrators and continue to insert the submission manually. Thank you!
jsp.submit.start-lookup-submission.js.detailsbuttonmessage = See details
jsp.submit.start-lookup-submission.js.filldataandstartbuttonmessage = Fill data and start submission
jsp.submit.start-lookup-submission.js.titlepopupmessage = Publication details
jsp.submit.start-lookup-submission.no-collection.dialog.return = I understand
jsp.submit.start-lookup-submission.byfile = Upload a file
jsp.submit.start-lookup-submission.byfile.hints = Choose a file to upload, if you want select one publication from the set filled into the file check out the preview mode otherwise choose an owner collection, in the last case all publications will be imported but the first will be open in submission. Check your MyDSpace for others publications.
jsp.submit.start-lookup-submission.byfile.chooseprovider = Select data provider
jsp.submit.start-lookup-submission.byfile.hints = Select a file to upload and its type from the drop-down menu. If "Preview Mode" is enabled, the list of the publications in the file will be shown to you to select the one for submission. If it is disabled, all publications will be imported in your MyDSpace page as "Unfinished Submissions" while the first one will go through the submission process.
jsp.submit.start-lookup-submission.byfile.chooseprovider = Select data type
jsp.submit.start-lookup-submission.byfile.file = File
jsp.submit.start-lookup-submission.byfile.filepreview = Check this if you want the preview mode
jsp.submit.start-lookup-submission.byfile.filepreview = Preview mode
jsp.submit.start-lookup-submission.byfile.filecollection = Collection
#Versioning

52
dspace-api/src/main/resources/spring/spring-dspace-addon-submissionlookup-services.xml
View File

@@ -420,13 +420,13 @@
<bean id="csvDataLoader" class="gr.ekt.bteio.loaders.CSVDataLoader">
<property name="fieldMap">
<map>
<entry key="1" value="Title"/>
<entry key="0" value="Author"/>
<entry key="2" value="Year"/>
<entry key="3" value="Journal"/>
<entry key="14" value="Abstract"/>
<entry key="31" value="ISSN"/>
<entry key="38" value="Type"/>
<entry key="1" value="title"/>
<entry key="0" value="authors"/>
<entry key="2" value="issued"/>
<entry key="3" value="journal"/>
<entry key="14" value="abstract"/>
<entry key="31" value="jissn"/>
<entry key="38" value="subtype"/>
</map>
</property>
<property name="skipLines" value="1"/>
@@ -435,13 +435,13 @@
<bean id="tsvDataLoader" class="gr.ekt.bteio.loaders.CSVDataLoader">
<property name="fieldMap">
<map>
<entry key="7" value="Title"/>
<entry key="1" value="Author"/>
<entry key="37" value="Year"/>
<entry key="8" value="Journal"/>
<entry key="19" value="Abstract"/>
<entry key="31" value="ISSN"/>
<entry key="0" value="Type"/>
<entry key="7" value="title"/>
<entry key="1" value="authors"/>
<entry key="37" value="issued"/>
<entry key="8" value="journal"/>
<entry key="19" value="abstract"/>
<entry key="31" value="jissn"/>
<entry key="0" value="subtype"/>
</map>
</property>
<!-- This makes the CSV data loader able to load TSV data -->
@@ -452,13 +452,13 @@
<bean id="risDataLoader" class="gr.ekt.bteio.loaders.RISDataLoader">
<property name="fieldMap">
<map>
<entry key="T1" value="Title"/>
<entry key="AU" value="Author"/>
<entry key="SO" value="Journal"/>
<entry key="PY" value="Year"/>
<entry key="SN" value="ISSN"/>
<entry key="PT" value="Type"/>
<entry key="AB" value="Abstract"/>
<entry key="T1" value="title"/>
<entry key="AU" value="authors"/>
<entry key="SO" value="journal"/>
<entry key="PY" value="issued"/>
<entry key="SN" value="jissn"/>
<entry key="PT" value="subtype"/>
<entry key="AB" value="abstract"/>
</map>
</property>
</bean>
@@ -466,11 +466,11 @@
<bean id="endnoteDataLoader" class="gr.ekt.bteio.loaders.EndnoteDataLoader">
<property name="fieldMap">
<map>
<entry key="TI" value="Title"/>
<entry key="AU" value="Author"/>
<entry key="AB" value="Abstract"/>
<entry key="PY" value="Date"/>
<entry key="SO" value="Source"/>
<entry key="TI" value="title"/>
<entry key="AU" value="authors"/>
<entry key="AB" value="abstract"/>
<entry key="PY" value="issued"/>
<entry key="SO" value="journal"/>
</map>
</property>
</bean>

4
dspace-jspui/src/main/java/org/dspace/app/webui/json/SubmissionLookupJSONRequest.java
View File

@@ -181,6 +181,7 @@ public class SubmissionLookupJSONRequest extends JSONRequest {
// Parse the request
List<FileItem> iter;
String filename = null;
try {
iter = upload.parseRequest(req);
for(FileItem item : iter) {
@@ -208,7 +209,6 @@ public class SubmissionLookupJSONRequest extends JSONRequest {
MultipleSubmissionLookupDataLoader dataLoader = (MultipleSubmissionLookupDataLoader) transformationEngine
.getDataLoader();
String tempDir = (ConfigurationManager.getProperty("upload.temp.dir") != null)
? ConfigurationManager.getProperty("upload.temp.dir") : System.getProperty("java.io.tmpdir");
File file = new File(tempDir + System.getProperty("file.separator") + "submissionlookup-loader.temp");
@@ -228,6 +228,8 @@ public class SubmissionLookupJSONRequest extends JSONRequest {
} catch (MalformedSourceException e1) {
e1.printStackTrace();
}
file.delete();
}
subDTO.setItems(result);
service.storeDTOs(req, suuid, subDTO);