litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updates to freemarker conversion forms and replacing AddRoleUtils in Vivo with EditModeUtils in Vitro

Browse source
This commit is contained in:
hjkhjk54 2011-11-21 15:31:20 +00:00
parent ce5596e627
commit 62ace7e58b
7 changed files with 31 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAssociatedConceptGenerator.java
View file

@ -49,7 +49,7 @@ import edu.cornell.mannlib.vitro.webapp.web.MiscWebUtils;
import edu.cornell.mannlib.vitro.webapp.search.beans.ProhibitedFromSearch;
import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils;
import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils.EditMode;
import edu.cornell.mannlib.vitro.webapp.utils.generators.AddRoleUtils;
import edu.cornell.mannlib.vitro.webapp.utils.generators.EditModeUtils;
/**
* Generates the edit configuration for importing concepts from external
* search services, e.g. UMLS etc.

10
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddGrantRoleToPersonGenerator.java
View file

@ -32,7 +32,7 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditN3GeneratorVTwo;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.FieldVTwo;
import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils;
import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils.EditMode;
import edu.cornell.mannlib.vitro.webapp.utils.generators.AddRoleUtils;
import edu.cornell.mannlib.vitro.webapp.utils.generators.EditModeUtils;
/**
* Custom form for adding a grant to an person for the predicates hasCo-PrincipalInvestigatorRole
and hasPrincipalInvestigatorRole.
@ -616,19 +616,19 @@ public class AddGrantRoleToPersonGenerator implements EditConfigurationGenerator
*/
public EditMode getEditMode(VitroRequest vreq) {
List<String> roleToGrantPredicates = getPossibleRoleToGrantPredicates();
return AddRoleUtils.getEditMode(vreq, roleToGrantPredicates);
return EditModeUtils.getEditMode(vreq, roleToGrantPredicates);
}
private boolean isAddMode(VitroRequest vreq) {
return AddRoleUtils.isAddMode(getEditMode(vreq));
return EditModeUtils.isAddMode(getEditMode(vreq));
}
private boolean isEditMode(VitroRequest vreq) {
return AddRoleUtils.isEditMode(getEditMode(vreq));
return EditModeUtils.isEditMode(getEditMode(vreq));
}
private boolean isRepairMode(VitroRequest vreq) {
return AddRoleUtils.isRepairMode(getEditMode(vreq));
return EditModeUtils.isRepairMode(getEditMode(vreq));
}

10
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddRoleToPersonTwoStageGenerator.java
View file

@ -33,7 +33,7 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTw
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.FieldVTwo;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.RoleToActivityPredicatePreprocessor;
import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils.EditMode;
import edu.cornell.mannlib.vitro.webapp.utils.generators.AddRoleUtils;
import edu.cornell.mannlib.vitro.webapp.utils.generators.EditModeUtils;
/**
* Generates the edit configuration for adding a Role to a Person.
@ -828,19 +828,19 @@ public abstract class AddRoleToPersonTwoStageGenerator extends BaseEditConfigura
/* Methods that check edit mode */
public EditMode getEditMode(VitroRequest vreq) {
List<String> roleToGrantPredicates = getPossibleRoleToActivityPredicates();
return AddRoleUtils.getEditMode(vreq, roleToGrantPredicates);
return EditModeUtils.getEditMode(vreq, roleToGrantPredicates);
}
private boolean isAddMode(VitroRequest vreq) {
return AddRoleUtils.isAddMode(getEditMode(vreq));
return EditModeUtils.isAddMode(getEditMode(vreq));
}
private boolean isEditMode(VitroRequest vreq) {
return AddRoleUtils.isEditMode(getEditMode(vreq));
return EditModeUtils.isEditMode(getEditMode(vreq));
}
private boolean isRepairMode(VitroRequest vreq) {
return AddRoleUtils.isRepairMode(getEditMode(vreq));
return EditModeUtils.isRepairMode(getEditMode(vreq));
}
/* URIS for various predicates */

4
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEducationalTraining.java
View file

@ -18,7 +18,7 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisio
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.FieldVTwo;
import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils.EditMode;
import edu.cornell.mannlib.vitro.webapp.utils.generators.AddRoleUtils;
import edu.cornell.mannlib.vitro.webapp.utils.generators.EditModeUtils;
/**
Form for adding an educational attainment to an individual
@ -328,7 +328,7 @@ public class PersonHasEducationalTraining extends VivoBaseGenerator implements
public EditMode getEditMode(VitroRequest vreq) {
List<String> predicates = new ArrayList<String>();
predicates.add(trainingAtOrg);
return AddRoleUtils.getEditMode(vreq, predicates);
return EditModeUtils.getEditMode(vreq, predicates);
}
}

4
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPositionHistoryGenerator.java
View file

@ -19,7 +19,7 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisio
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.FieldVTwo;
import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils.EditMode;
import edu.cornell.mannlib.vitro.webapp.utils.generators.AddRoleUtils;
import edu.cornell.mannlib.vitro.webapp.utils.generators.EditModeUtils;
public class PersonHasPositionHistoryGenerator extends VivoBaseGenerator implements
EditConfigurationGenerator {
@ -287,7 +287,7 @@ public class PersonHasPositionHistoryGenerator extends VivoBaseGenerator impleme
public EditMode getEditMode(VitroRequest vreq) {
List<String> predicates = new ArrayList<String>();
predicates.add(positionInOrgPred);
return AddRoleUtils.getEditMode(vreq, predicates);
return EditModeUtils.getEditMode(vreq, predicates);
}
}

79
src/edu/cornell/mannlib/vitro/webapp/utils/generators/AddRoleUtils.java
View file

@ -1,79 +0,0 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.utils.generators;
import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils;
import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils.EditMode;
public class AddRoleUtils {
private static Log log = LogFactory.getLog(AddRoleUtils.class);
/* *************** Static utility methods used in role-based generators *********** */
public static EditMode getEditMode(VitroRequest vreq, List<String> possiblePredicates) {
//We're making some assumptions here: That there is only one role objec tot one activity object
//pairing, i.e. the same role object can't be related to a different activity object
//That said, there should only be one role to Activity predicate linking a role to an activity
//So if
Individual object = EditConfigurationUtils.getObjectIndividual(vreq);
boolean foundErrorMode = false;
int numberEditModes = 0;
int numberRepairModes = 0;
int numberPredicates = possiblePredicates.size();
for(String predicate:possiblePredicates) {
EditMode mode = FrontEndEditingUtils.getEditMode(vreq, object, predicate);
//Any error mode should result in error
if(mode == EditMode.ERROR) {
foundErrorMode = true;
break;
}
if(mode == EditMode.EDIT) {
numberEditModes++;
}
else if(mode == EditMode.REPAIR) {
numberRepairModes++;
}
}
//if found an error or if more than one edit mode returned, incorrect
if(foundErrorMode || numberEditModes > 1)
{
return EditMode.ERROR;
}
EditMode mode = EditMode.ADD;
//if exactly one edit mode found, then edit mode
if(numberEditModes == 1) {
mode = EditMode.EDIT;
}
//if all modes are repair, this means that all of them have zero statements returning
//which is incorrect
if(numberRepairModes == numberPredicates) {
mode = EditMode.REPAIR;
}
//otherwise all the modes are Add and Add will be returned
return mode;
}
public static boolean isAddMode(EditMode mode) {
return (mode == EditMode.ADD);
}
public static boolean isEditMode(EditMode mode) {
return (mode == EditMode.EDIT);
}
public static boolean isRepairMode(EditMode mode) {
return (mode == EditMode.REPAIR);
}
}