Skip to content

Commit

Permalink
Merge pull request #4 from lap82/DS-1252-bte
Browse files Browse the repository at this point in the history 
Restyling lookup submission jsp, fix bug to fill data authors in dto, mo...
  • Loading branch information
Kostas Stamatis committed Oct 18, 2013
2 parents fcc6e0d + ed62182 commit 3bb9e3f
Show file tree
Hide file tree
Showing 9 changed files with 198 additions and 156 deletions.
4 changes: 2 additions & 2 deletions dspace-api/src/main/java/org/dspace/submit/lookup/DSpaceWorkspaceItemOutputGenerator.java
View file
Expand Up @@ -67,7 +67,7 @@ public List<String> generateOutput(RecordSet recordSet) {
//Printing debug message
String totalString = "";
for (Record record : recordSet.getRecords()){
totalString += SubmissionLookupService.getPrintableString(record)+"\n";
totalString += SubmissionLookupUtils.getPrintableString(record)+"\n";
}
log.debug("Records to output:\n"+totalString);

Expand Down Expand Up @@ -202,7 +202,7 @@ public void merge(String formName, Item item, Record record) {
Integer.parseInt(splitValue[2]));
}
} else {
String[] splitValue = splitValue(SubmissionLookupService.getFirstValue(pub, field));
String[] splitValue = splitValue(SubmissionLookupUtils.getFirstValue(pub, field));
item.addMetadata(providerName, md[1], md[2],
md[3], splitValue[0], splitValue[1],
Integer.parseInt(splitValue[2]));
Expand Down
4 changes: 2 additions & 2 deletions dspace-api/src/main/java/org/dspace/submit/lookup/MultipleSubmissionLookupDataLoader.java
View file
Expand Up @@ -72,7 +72,7 @@ public RecordSet getRecords() throws MalformedSourceException {
List<String> foundDOIs = new ArrayList<String>();

for (Record publication : recordSet.getRecords()) {
String providerName = SubmissionLookupService.getFirstValue(publication, SubmissionLookupService.PROVIDER_NAME_FIELD);
String providerName = SubmissionLookupUtils.getFirstValue(publication, SubmissionLookupService.PROVIDER_NAME_FIELD);

String doi = null;

Expand Down Expand Up @@ -137,7 +137,7 @@ public RecordSet getRecords() throws MalformedSourceException {
//Printing debug message
String totalString = "";
for (Record record : recordSet.getRecords()){
totalString += SubmissionLookupService.getPrintableString(record)+"\n";
totalString += SubmissionLookupUtils.getPrintableString(record)+"\n";
}
log.debug("Records loaded:\n"+totalString);

Expand Down
2 changes: 1 addition & 1 deletion dspace-api/src/main/java/org/dspace/submit/lookup/SubmissionItemDataLoader.java
View file
Expand Up @@ -51,7 +51,7 @@ public RecordSet getRecords() throws MalformedSourceException {
//Printing debug message
String totalString = "";
for (Record record : ret.getRecords()){
totalString += SubmissionLookupService.getPrintableString(record)+"\n";
totalString += SubmissionLookupUtils.getPrintableString(record)+"\n";
}
log.debug("Records loaded:\n"+totalString);

Expand Down
46 changes: 2 additions & 44 deletions dspace-api/src/main/java/org/dspace/submit/lookup/SubmissionLookupService.java
View file
Expand Up @@ -8,9 +8,7 @@
package org.dspace.submit.lookup;

import edu.emory.mathcs.backport.java.util.Arrays;

import gr.ekt.bte.core.Record;
import gr.ekt.bte.core.Value;

import java.util.ArrayList;
import java.util.HashMap;
Expand Down Expand Up @@ -144,51 +142,11 @@ public List<SubmissionLookupProvider> getProviders() {
return providers;
}

public static String getFirstValue(Record rec, String field) {
List<Value> values = rec.getValues(field);
String provider_name = null;
if (values != null && values.size() > 0) {
provider_name = values.get(0).getAsString();
}
return provider_name;
}

public static String getProviderName(Record rec) {
return getFirstValue(rec, SubmissionLookupService.PROVIDER_NAME_FIELD);
return SubmissionLookupUtils.getFirstValue(rec, SubmissionLookupService.PROVIDER_NAME_FIELD);
}

public static String getType(Record rec) {
return getFirstValue(rec, SubmissionLookupProvider.TYPE);
return SubmissionLookupUtils.getFirstValue(rec, SubmissionLookupProvider.TYPE);
}

public static List<String> getStringValuesFromValues(Record rec, String field) {
List<Value> values = rec.getValues(field);
if (values == null)
return null;

List<String> stringValues = new ArrayList<String>();
for (Value value : values){
stringValues.add(value.getAsString());
}

return stringValues;
}

public static String getPrintableString(Record record){
StringBuilder result = new StringBuilder();

result.append("\nPublication {\n");

for (String field: record.getFields()){
result.append("--"+field + ":\n");
List<Value> values = record.getValues(field);
for (Value value : values){
result.append("\t"+value.getAsString()+"\n");
}
}

result.append("}\n");

return result.toString();
}
}
42 changes: 42 additions & 0 deletions dspace-api/src/main/java/org/dspace/submit/lookup/SubmissionLookupUtils.java
View file
Expand Up @@ -7,6 +7,9 @@
*/
package org.dspace.submit.lookup;

import gr.ekt.bte.core.Record;
import gr.ekt.bte.core.Value;

import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
Expand All @@ -15,6 +18,7 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -109,4 +113,42 @@ public static String normalizeDOI(String doi) {
return null;

}

public static String getFirstValue(Record rec, String field) {
List<Value> values = rec.getValues(field);
String value = null;
if (values != null && values.size() > 0) {
value = values.get(0).getAsString();
}
return value;
}

public static List<String> getValues(Record rec, String field) {
List<String> result = new ArrayList<String>();
List<Value> values = rec.getValues(field);
if (values != null && values.size() > 0) {
for (Value value : values){
result.add( value.getAsString());
}
}
return result;
}

public static String getPrintableString(Record record){
StringBuilder result = new StringBuilder();

result.append("\nPublication {\n");

for (String field: record.getFields()){
result.append("--"+field + ":\n");
List<Value> values = record.getValues(field);
for (Value value : values){
result.append("\t"+value.getAsString()+"\n");
}
}

result.append("}\n");

return result.toString();
}
}
11 changes: 3 additions & 8 deletions dspace-api/src/main/resources/Messages.properties
View file
Expand Up @@ -1677,12 +1677,6 @@ jsp.layout.navbar-admin.contents = Content
jsp.layout.navbar-admin.items = Items
jsp.layout.navbar-admin.settings = General Settings

jsp.submit.start-lookup-submission.title = Nuova proposta di immissione
jsp.submit.start-lookup-submission.heading = Nuova proposta di immissione: recupera i dati da database bibliografici
jsp.submit.start-lookup-submission.tabs.search = Form di ricerca
jsp.submit.start-lookup-submission.tabs.result = Risultati
jsp.submit.start-lookup-submission.identifiers = Ricerca per identificativo

jsp.submit.start-lookup-submission.title = New submission
jsp.submit.start-lookup-submission.heading = New submission: get data from bibliographic external service
jsp.submit.start-lookup-submission.tabs.search = Search Form
Expand All @@ -1709,7 +1703,7 @@ 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.edit-metadata.affiliation.other = Other
jsp.submit.start-lookup-submission.no-collection = No collection founded
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.manual-submission = Default mode Submission
Expand All @@ -1721,4 +1715,5 @@ 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.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.js.titlepopupmessage = Publication details
jsp.submit.start-lookup-submission.no-collection.dialog.return = I understand
12 changes: 6 additions & 6 deletions dspace-jspui/src/main/java/org/dspace/app/webui/json/SubmissionLookupJSONRequest.java
View file
Expand Up @@ -8,7 +8,6 @@
package org.dspace.app.webui.json;

import flexjson.JSONSerializer;

import gr.ekt.bte.core.Record;
import gr.ekt.bte.core.TransformationEngine;
import gr.ekt.bte.core.TransformationSpec;
Expand Down Expand Up @@ -38,6 +37,7 @@
import org.dspace.submit.lookup.MultipleSubmissionLookupDataLoader;
import org.dspace.submit.lookup.SubmissionLookupOutputGenerator;
import org.dspace.submit.lookup.SubmissionLookupService;
import org.dspace.submit.lookup.SubmissionLookupUtils;
import org.dspace.submit.util.ItemSubmissionLookupDTO;
import org.dspace.submit.util.SubmissionLookupDTO;
import org.dspace.utils.DSpace;
Expand Down Expand Up @@ -206,11 +206,11 @@ private List<Map<String, Object>> getLightResultList(
Map<String, Object> data = new HashMap<String, Object>();
data.put("uuid", uuid);
data.put("providers", item.getProviders());
data.put("title", SubmissionLookupService.getFirstValue(pub, "title"));
List<String> authors = SubmissionLookupService.getStringValuesFromValues(pub, "authors");
data.put("authors",authors!=null?
StringUtils.join(authors.iterator(), ", "):"");
data.put("issued", SubmissionLookupService.getFirstValue(pub, "issued"));
data.put("title", SubmissionLookupUtils.getFirstValue(pub, "title"));
data.put("authors",pub.getValues("authors")!=null?
StringUtils.join(SubmissionLookupUtils.getValues(pub, "authors").iterator(), ", "):"");
data.put("issued", SubmissionLookupUtils.getFirstValue(pub, "issued"));

publications.add(data);
}
}
Expand Down
47 changes: 23 additions & 24 deletions dspace-jspui/src/main/webapp/static/js/submission-lookup.js
View file
Expand Up @@ -20,7 +20,7 @@ submissionLookupIdentifiers = function(identInputs){
contentType: "application/x-www-form-urlencoded;charset=UTF-8",
data: mydata,
error: function(info){
j('#loading-search-result').dialog("close");
j('#loading-search-result').modal("hide");
var message = j('#jserrormessage').text();
alert(message);
},
Expand All @@ -34,12 +34,12 @@ submissionLookupIdentifiers = function(identInputs){
{
submissionLookupShowResult(info);
}
j('#loading-search-result').dialog("close");
j('#loading-search-result').modal("hide");
j('#tabs').find('a[href="#tabs-result"]').click();
}
});
j('#loading-search-result').data('ajaxCall', ajaxCall);
j('#loading-search-result').dialog("open");
j('#loading-search-result').modal("show");
}

submissionLookupSearch = function(){
Expand All @@ -56,7 +56,7 @@ submissionLookupSearch = function(){
contentType: "application/x-www-form-urlencoded;charset=UTF-8",
data: mydata,
error: function(info){
j('#loading-search-result').dialog("close");
j('#loading-search-result').modal('hide');
var message = j('#jserrormessage').text();
alert(message);
},
Expand All @@ -70,12 +70,12 @@ submissionLookupSearch = function(){
{
submissionLookupShowResult(info);
}
j('#loading-search-result').dialog("close");
j('#loading-search-result').modal('hide');
j('#tabs').find('a[href="#tabs-result"]').click();
}
});
j('#loading-search-result').data('ajaxCall', ajaxCall);
j('#loading-search-result').dialog("open");
j('#loading-search-result').modal('show');
}

submissionLookupDetails = function(button){
Expand Down Expand Up @@ -113,7 +113,7 @@ submissionLookupShowResult = function(info){
j('#result-list').html(" ");
for (var i=0;i<info.result.length;i++)
{
var bt = j('<button type="button">').append(j('#jsseedetailsbuttonmessage').text());
var bt = j('<button class="btn btn-info" type="button">').append(j('#jsseedetailsbuttonmessage').text());
var par = j('<p class="sl-result">');
var divImg = j('<div class="submission-lookup-providers">');
par.append(divImg);
Expand All @@ -137,18 +137,20 @@ submissionLookupShowResult = function(info){
}

submissionLookupShowDetails = function(info){
var popup = j('<div title="'+j('#jstitlepopupmessage').text()+'">');

var modalbody = j('#loading-details .modal-body');
var divImg = j('<div class="submission-lookup-providers">');
popup.append(divImg);

for (var k=0;k<info.providers.length;k++)
{
var prov = info.providers[k];
divImg.append(j('<img src="'+dspaceContextPath+'/image/submission-lookup-small-'+prov+'.jpg">'));
divImg.append(j('<img class="img-thumbnail" src="'+dspaceContextPath+'/image/submission-lookup-small-'+prov+'.jpg">'));
}
modalbody.append(divImg);
var detailsDiv = j('<div class="submission-lookup-details">');
var details = j('<table>');
var details = j('<table class="table">');
detailsDiv.append(details);
popup.append(detailsDiv);

for (var i=0;i<info.fieldsLabels.length;i++)
{
var fieldName = info.fieldsLabels[i][0];
Expand All @@ -168,23 +170,20 @@ submissionLookupShowDetails = function(info){
}
details.append(tr);
}
popup.append(j('#select-collection-div'));
j('#select-collection').val(info.collection);
var start = j('<button type="button">');
modalbody.append(detailsDiv);

modalbody.append(j('#select-collection-div'));
j('#select-collection').val(info.collection);

var modalfooter = j('#loading-details .modal-footer');
var start = j('<button class="btn btn-success" type="button">');
start.append(j('#jsfilldatabuttonmessage').text());
start.button();
start.click(function(){
j('#collectionid').val(j('#select-collection').val());
j('#iuuid').val(info.uuid);
j('#form-submission').submit();
});
popup.append(start);

j('body').append(popup);
popup.dialog({modal: true,width:800,height:600,
close: function( event, ui ) {
j('#hidden-area').append(j('#select-collection-div'));
j(this).dialog('destroy').remove();
}
});
modalfooter.append(start);
j('#loading-details').modal('show');
}

0 comments on commit 3bb9e3f

Please sign in to comment.