/ - Diff - EDIT - EDIT Project Management

« Previous | Next »

Revision be23f38b

Added by Andreas Müller over 12 years ago

ID be23f38becb68000fe24c147120787c23f99083a
Parent c96bda99
Child 67849ed5

bugfix for Coordinate Parser with whitespaces, Dateparsing, etc.

     package eu.etaxonomy.cdm.model.common;
     import java.io.Serializable;
     import java.text.DateFormat;
     import java.text.ParsePosition;
     import java.util.Calendar;
     import java.util.Date;
     import java.util.regex.Matcher;
     import java.util.regex.Pattern;
-...
     import javax.xml.bind.annotation.XmlType;
     import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
     import org.apache.commons.lang.time.DateUtils;
     import org.apache.log4j.Logger;
     import org.hibernate.annotations.Type;
     import org.hibernate.search.annotations.Field;
-...
     		periodString = periodString.trim();
     		result.setFreeText(null);
     		Date date;
     		//case "1806"[1807];
     		if (uncorrectYearPatter.matcher(periodString).matches()){
-...
     			parseDotDatePattern(periodString, result);
     		}else if (standardPattern.matcher(periodString).matches()){
     			parseStandardPattern(periodString, result);
     //TODO first check ambiguity of parser results e.g. for 7/12/11
     //		}else if (isDateString(periodString)){
     //			String[] startEnd = makeStartEnd(periodString);
     //			String start = startEnd[0];
     //			DateTime startDateTime = dateStringParse(start, true);
     //			result.setStart(startDateTime);
     //			if (startEnd.length > 1){
     //				DateTime endDateTime = dateStringParse(startEnd[1], true);
     //				;
     //				result.setEnd(endDateTime.toLocalDate());
     //			}
     		}else{
     			result.setFreeText(periodString);
+    		}
     		return result;
+    	}
     	private static boolean isDateString(String periodString) {
     		String[] startEnd = makeStartEnd(periodString);
     		String start = startEnd[0];
     		DateTime startDateTime = dateStringParse(start, true);
     		if (startDateTime == null){
     			return false;
+    		}
     		if (startEnd.length > 1){
     			DateTime endDateTime = dateStringParse(startEnd[1], true);
     			if (endDateTime != null){
     				return true;
+    			}
+    		}
     		return false;
+    	}
     	/**
     	 * @param periodString
     	 * @return
     	 */
     	private static String[] makeStartEnd(String periodString) {
     		String[] startEnd = new String[]{periodString};
     		if (periodString.contains("-") && periodString.matches("^-{2,}-^-{2,}")){
     			startEnd = periodString.split("-");
+    		}
     		return startEnd;
+    	}
     	private static DateTime dateStringParse(String string, boolean strict) {
     		DateFormat dateFormat = DateFormat.getDateInstance();
     		ParsePosition pos = new ParsePosition(0);
     		Date a = dateFormat.parse(string, pos);
     		if (a == null || pos.getIndex() != string.length()){
     			return null;
+    		}
     		Calendar cal = Calendar.getInstance();
     		cal.setTime(a);
     		DateTime result = new DateTime(cal);
     		return result;
+    	}
     	/**
     	 * @param periodString
     	 * @param result

     		return result;
+    	}
     	/* (non-Javadoc)
     	 * @see java.lang.Object#toString()
     	 */
     	@Override
     	public String toString(){
     		String result = "";
     		boolean includeEmptySeconds = true;
     		result += getLatitudeSexagesimal() == null ? "" : getLatitudeSexagesimal().toString(includeEmptySeconds);
     		result = CdmUtils.concat(", ", result, getLongitudeSexagesimal() == null ? "" : getLongitudeSexagesimal().toString(includeEmptySeconds));
     		return result;
+    	}
     //*********** CLONE **********************************/

         //removes whitespace characters
         private String removeWhiteSpace(String str){
             str = str.replaceFirst("\\s*", "");
             str = str.replaceFirst("\\s+", "");
             return str;
+        }
-...
         public ConversionResults tryConvert(String str){
             //some local variables
             //some local variables
             int sign; //sign of the coordinate
             String[] decimalBit, ddmmss, ddmm; //arrays for splitting
             double dd = 0, mm = 0, ss = 0, mmm = 0, sss = 0, dec = 0; //parts of the coordinates

Also available in: Unified diff

Project

General

Profile

EDIT

Revision be23f38b

Added by Andreas Müller over 12 years ago