EDIT

cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v30_31/LanguageLabelUpdater.java -text

cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v30_31/TermUpdater_30_31.java -text

	private static final String termsVersion = "3.0.1.0.201012150000";

import org.apache.commons.lang.StringUtils;

	@Deprecated //to be used by RelationshipBase only

	@Transient

	/**

	 * Returns the boolean value indicating whether <i>this</i> names rank is Rank "unranked"

	 * (uuid = 'a965befb-70a9-4747-a18f-624456c65223') but most likely it is an infrageneric rank

	 * due to existing atomized data for the genus epithet and the infrageneric epithet but missing

	 * specific epithet.

	 * Returns false if <i>this</i> names rank is null.

	 *

	 * @see  #isSupraGeneric()

	 * @see  #isGenus()

	 * @see  #isSpeciesAggregate()

	 * @see  #isSpecies()

	 * @see  #isInfraSpecific()

	 */

	@Transient

	public boolean isInfragenericUnranked() {

		Rank rank = this.getRank();

		if (rank == null || ! rank.equals(Rank.UNRANKED())){

			return false;

		}

		if (StringUtils.isBlank(this.getSpecificEpithet()) && StringUtils.isBlank(this.getInfraSpecificEpithet()) ){

			return true;

		}else{

			return false;

		}

	}

import org.apache.commons.lang.StringUtils;

	private static final UUID uuidUnranked = UUID.fromString("a965befb-70a9-4747-a18f-624456c65223");

	public static final Rank UNRANKED(){

		return getTermByUuid(uuidUnranked);

	}

		}else if (nonViralName.isInfragenericUnranked()){

			result = getUnrankedInfragenericNameCache(nonViralName);

//	

//

//	/**

//	 * @param nonViralName

//	 * @return

//	 */

//	private boolean isInfragenericUnranked(T nonViralName) {

//		Rank rank = nonViralName.getRank();

//		if (rank == null || ! rank.equals(Rank.UNRANKED())){

//			return false;

//		}

//		if (StringUtils.isBlank(nonViralName.getSpecificEpithet()) && StringUtils.isBlank(nonViralName.getInfraSpecificEpithet()) ){

//			return true;

//		}else{

//			return false;

//		}

//	}

	private String getUnrankedInfragenericNameCache(T nonViralName) {

		String result;

		Rank rank = nonViralName.getRank();

		if (rank.isSpeciesAggregate()){

			return getSpeciesAggregateCache(nonViralName);

		}

		String infraGenericMarker = rank.getAbbreviation();

		result = CdmUtils.Nz(nonViralName.getGenusOrUninomial()).trim();

		result += " " + infraGenericMarker + " " + (CdmUtils.Nz(nonViralName.getInfraGenericEpithet())).trim().replace("null", "");

		result = addAppendedPhrase(result, nonViralName).trim();

		return result; 

	}

"5c4d6755-2cf6-44ca-9220-cccf8881700b",,"Unknown Rank","Unknown Rank","unknown"

"a965befb-70a9-4747-a18f-624456c65223",,"Unranked Rank: The name on purpose has no rank","Unranked","[unranked]"

		//unranked taxa

		String unrankedCache;

		BotanicalName unrankedName = BotanicalName.NewInstance(Rank.UNRANKED());

		unrankedName.setGenusOrUninomial("Genus");

		NonViralNameDefaultCacheStrategy<BotanicalName> strategy = NonViralNameDefaultCacheStrategy.NewInstance();

			//infraspecific

		unrankedName.setInfraSpecificEpithet("infraspecific");

		unrankedName.setSpecificEpithet("species");

		unrankedCache = strategy.getNameCache(unrankedName);

		Assert.assertEquals("Correct unranked cache expected", "Genus species [unranked] infraspecific", unrankedCache);

			//infrageneric

		unrankedName.setInfraSpecificEpithet(null);

		unrankedName.setSpecificEpithet(null);

		unrankedName.setInfraGenericEpithet("Infrageneric");

		unrankedCache = strategy.getNameCache(unrankedName);

		Assert.assertEquals("Correct unranked cache expected", "Genus [unranked] Infrageneric", unrankedCache);

		Reference ref = ReferenceFactory.newGeneric();

		Reference book = ReferenceFactory.newBook();

	public void testGetInfraGenericNames(){

import eu.etaxonomy.cdm.database.update.v30_31.TermUpdater_30_31;

		return TermUpdater_30_31.NewInstance();

		String sqlInsertRepresentation = " INSERT INTO Representation (id, created, uuid, text, label, abbreviatedlabel, language_id) " +

import eu.etaxonomy.cdm.database.update.v30_31.TermUpdater_30_31;

		return TermUpdater_30_31.NewInstance();

// $Id$

/**

* Copyright (C) 2009 EDIT

* European Distributed Institute of Taxonomy 

* http://www.e-taxonomy.eu

* 

* The contents of this file are subject to the Mozilla Public License Version 1.1

* See LICENSE.TXT at the top of this package for the full license terms.

*/

package eu.etaxonomy.cdm.database.update.v30_31;

import java.sql.SQLException;

import org.apache.log4j.Logger;

import eu.etaxonomy.cdm.common.IProgressMonitor;

import eu.etaxonomy.cdm.database.ICdmDataSource;

import eu.etaxonomy.cdm.database.update.ITermUpdaterStep;

import eu.etaxonomy.cdm.database.update.SchemaUpdaterStepBase;

/**

 * @author a.mueller

 * @date 15.12.2010

 */

public class LanguageLabelUpdater extends SchemaUpdaterStepBase implements ITermUpdaterStep{

	@SuppressWarnings("unused")

	private static final Logger logger = Logger.getLogger(LanguageLabelUpdater.class);

	private static final String stepName = "Update language labels by full language name";

// **************************** STATIC METHODS ********************************/

	public static final LanguageLabelUpdater NewInstance(){

		return new LanguageLabelUpdater(stepName);	

	}

	protected LanguageLabelUpdater(String stepName) {

		super(stepName);

	}

	@Override

	public Integer invoke(ICdmDataSource datasource, IProgressMonitor monitor) throws SQLException {

		//update representation label

		String sql;

		sql = " UPDATE Representation " + 

			" SET label = text " +

			" WHERE id IN ( SELECT MN.representations_id " +

				" FROM DefinedTermBase lang " +

				" INNER JOIN DefinedTermBase_Representation MN ON lang.id = MN.DefinedTermBase_id " +

				" WHERE lang.DTYPE = 'Language' " +

				" )";

		datasource.executeUpdate(sql);

		//update term titleCache

		//FIXME only for English representations

		sql = " UPDATE DefinedTermBase dtb " + 

			  " SET titleCache = " +  

					" ( " +

					" SELECT rep.label  " +

					" FROM DefinedTermBase_Representation MN " + 

					" INNER JOIN Representation rep ON MN.representations_id = rep.id " +

					" WHERE dtb.id = MN.DefinedTermBase_id) " + 

				" WHERE dtb.DTYPE = 'Language'";

		datasource.executeUpdate(sql);

		return 0;

	}

}

// $Id$

/**

* Copyright (C) 2009 EDIT

* European Distributed Institute of Taxonomy 

* http://www.e-taxonomy.eu

* 

* The contents of this file are subject to the Mozilla Public License Version 1.1

* See LICENSE.TXT at the top of this package for the full license terms.

*/

package eu.etaxonomy.cdm.database.update.v30_31;

import java.util.ArrayList;

import java.util.List;

import java.util.UUID;

import org.apache.log4j.Logger;

import eu.etaxonomy.cdm.database.update.ITermUpdater;

import eu.etaxonomy.cdm.database.update.ITermUpdaterStep;

import eu.etaxonomy.cdm.database.update.SingleTermUpdater;

import eu.etaxonomy.cdm.database.update.TermUpdaterBase;

import eu.etaxonomy.cdm.database.update.v25_30.TermUpdater_25_30;

import eu.etaxonomy.cdm.model.common.Language;

import eu.etaxonomy.cdm.model.name.Rank;

/**

 * @author a.mueller

 * @date 10.09.2010

 *

 */

public class TermUpdater_30_31 extends TermUpdaterBase implements ITermUpdater {

	@SuppressWarnings("unused")

	private static final Logger logger = Logger.getLogger(TermUpdater_30_31.class);

	public static final String startTermVersion = "3.0.0.0.201011170000";

	private static final String endTermVersion = "3.0.1.0.201012150000";

// *************************** FACTORY **************************************/

	public static TermUpdater_30_31 NewInstance(){

		return new TermUpdater_30_31(startTermVersion, endTermVersion);

	}

// *************************** CONSTRUCTOR ***********************************/	

	protected TermUpdater_30_31(String startTermVersion, String endTermVersion) {

		super(startTermVersion, endTermVersion);

	}

// 

	/* (non-Javadoc)

	 * @see eu.etaxonomy.cdm.database.update.ICdmUpdater#invoke()

	 */

	@Override

	protected List<ITermUpdaterStep> getUpdaterList() {

		List<ITermUpdaterStep> list = new ArrayList<ITermUpdaterStep>();

		// [unranked]

		UUID uuidTerm = UUID.fromString("a965befb-70a9-4747-a18f-624456c65223");

		String description = "Unranked Rank: The name on purpose has no rank";

		String label = "Unranked";

		String abbrev = "[unranked]";

		String dtype = Rank.class.getSimpleName();

		boolean isOrdered = true;

		UUID uuidVocabulary = UUID.fromString("ef0d1ce1-26e3-4e83-b47b-ca74eed40b1b");

		UUID uuidAfterTerm = UUID.fromString("5c4d6755-2cf6-44ca-9220-cccf8881700b");

		UUID uuidLang = Language.uuidEnglish;

		list.add( SingleTermUpdater.NewInstance("Add 'unranked' rank to ranks", uuidTerm, description, label, abbrev, dtype, uuidVocabulary, uuidLang, isOrdered, uuidAfterTerm));

		//language labels

		LanguageLabelUpdater langLabelUpdater = LanguageLabelUpdater.NewInstance();

		list.add(langLabelUpdater);

		return list;

	}

	/* (non-Javadoc)

	 * @see eu.etaxonomy.cdm.database.update.ICdmUpdater#getNextUpdater()

	 */

	@Override

	public ITermUpdater getNextUpdater() {

		return null;

	}

	/* (non-Javadoc)

	 * @see eu.etaxonomy.cdm.database.update.ICdmUpdater#getPreviousUpdater()

	 */

	@Override

	public ITermUpdater getPreviousUpdater() {

		return TermUpdater_25_30.NewInstance();

	}

}