From 64a2aade4ab7e062d61eb7cdc1fe48c2cc18bdcd Mon Sep 17 00:00:00 2001 From: briancaruso Date: Thu, 21 Jun 2012 21:58:44 +0000 Subject: [PATCH] Removing old N3 editing code. NIHVIVO-3807 --- .../PublicationHasAuthorValidatorOld.java | 65 ------------------- .../AddUserDefinedConceptGenerator.java | 39 ++--------- 2 files changed, 5 insertions(+), 99 deletions(-) delete mode 100644 src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PublicationHasAuthorValidatorOld.java diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PublicationHasAuthorValidatorOld.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PublicationHasAuthorValidatorOld.java deleted file mode 100644 index 8d0a7666..00000000 --- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PublicationHasAuthorValidatorOld.java +++ /dev/null @@ -1,65 +0,0 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ - -package edu.cornell.mannlib.vitro.webapp.edit.n3editing; - -import java.util.HashMap; -import java.util.Map; - -import com.hp.hpl.jena.rdf.model.Literal; - -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.EditConfiguration; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.N3Validator; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.processEdit.EditSubmission; - -public class PublicationHasAuthorValidatorOld implements N3Validator { - - private static String MISSING_FIRST_NAME_ERROR = "Must specify the author's first name."; - private static String MISSING_LAST_NAME_ERROR = "Must specify the author's last name."; - private static String MALFORMED_LAST_NAME_ERROR = "Last name may not contain a comma. Please enter first name in first name field."; -; - @Override - public Map validate(EditConfiguration editConfig, - EditSubmission editSub) { - Map urisFromForm = editSub.getUrisFromForm(); - Map literalsFromForm = editSub.getLiteralsFromForm(); - - Map errors = new HashMap(); - - String personUri = urisFromForm.get("personUri"); - if ("".equals(personUri)) { - personUri = null; - } - // If there's a personUri, then we're done. The firstName and lastName fields are - // disabled and so don't get submitted. - if (personUri != null) { - return null; - } - - Literal firstName = literalsFromForm.get("firstName"); - if( firstName != null && firstName.getLexicalForm() != null && "".equals(firstName.getLexicalForm()) ) - firstName = null; - - Literal lastName = literalsFromForm.get("lastName"); - String lastNameValue = ""; - if (lastName != null) { - lastNameValue = lastName.getLexicalForm(); - if( "".equals(lastNameValue) ) { - lastName = null; - } - } - - if (lastName == null) { - errors.put("lastName", MISSING_LAST_NAME_ERROR); - // Don't reject space in the last name: de Vries, etc. - } else if (lastNameValue.contains(",")) { - errors.put("lastName", MALFORMED_LAST_NAME_ERROR); - } - - if (firstName == null) { - errors.put("firstName", MISSING_FIRST_NAME_ERROR); - } - - return errors.size() != 0 ? errors : null; - } - -} diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddUserDefinedConceptGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddUserDefinedConceptGenerator.java index d2f1b554..2d119e77 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddUserDefinedConceptGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddUserDefinedConceptGenerator.java @@ -2,62 +2,33 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; -import java.util.Arrays; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Set; -import org.apache.commons.lang.StringUtils; + import javax.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.vivoweb.webapp.util.ModelUtils; - -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisionVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalValidationVTwo; - -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils; -import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils; import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.vocabulary.RDFS; -import com.hp.hpl.jena.vocabulary.RDF; import com.hp.hpl.jena.vocabulary.XSD; -import com.hp.hpl.jena.ontology.OntModel; -import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; + import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; -import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; -import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; -import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; +import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.Field; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.RoleToActivityPredicatePreprocessor; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.processEdit.RdfLiteralHash; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditN3GeneratorVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.SelectListGeneratorVTwo; -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.EditModeUtils; +import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation; /** * Generates the edit configuration for importing concepts from external * search services, e.g. UMLS etc. - * - * The N3 for this is set with the default settinf of - * */ public class AddUserDefinedConceptGenerator extends VivoBaseGenerator implements EditConfigurationGenerator {