X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2FContact.java;h=93bd809e49d185739dc496b706fe3fd6ed4a599f;hb=f06c81000632cfb5f525ca458f719338f55f9f66;hp=779b60a3c596ee6ee9bcbc20b09bcf66e3d4edfd;hpb=26d254a3ac6cddbd3583cbbcbf8d43aa15c6a32e;p=jvcard.git

diff --git a/src/be/nikiroo/jvcard/Contact.java b/src/be/nikiroo/jvcard/Contact.java
index 779b60a..93bd809 100644
--- a/src/be/nikiroo/jvcard/Contact.java
+++ b/src/be/nikiroo/jvcard/Contact.java
@@ -11,7 +11,7 @@ import java.util.UUID;
 
 import be.nikiroo.jvcard.parsers.Format;
 import be.nikiroo.jvcard.parsers.Parser;
-import be.nikiroo.jvcard.resources.StringUtils;
+import be.nikiroo.utils.StringUtils;
 
 /**
  * A contact is the information that represent a contact person or organisation.
@@ -36,23 +36,26 @@ public class Contact extends BaseClass<Data> {
 	}
 
 	/**
-	 * Return the preferred Data field with the given name, or NULL if none.
+	 * Return the preferred Data field with the given name, the first one if
+	 * none is preferred, or NULL if none at all.
 	 * 
 	 * @param name
 	 *            the name to look for
-	 * @return the Data field, or NULL
+	 * 
+	 * @return the {@link Data} field, or NULL
 	 */
 	public Data getPreferredData(String name) {
-		Data first = null;
+		Data pref = null;
+		int ipref = Integer.MAX_VALUE;
 		for (Data data : getData(name)) {
-			if (first == null)
-				first = data;
+			if (pref == null)
+				pref = data;
 
-			if (data.isPreferred())
-				return data;
+			if (data.getPreferred() < ipref)
+				pref = data;
 		}
 
-		return first;
+		return pref;
 	}
 
 	/**
@@ -88,34 +91,14 @@ public class Contact extends BaseClass<Data> {
 		return found;
 	}
 
-	/**
-	 * Return a {@link String} representation of this contact.
-	 * 
-	 * @param format
-	 *            the {@link Format} to use
-	 * @param startingBKey
-	 *            the starting BKey or -1 for no BKeys
-	 * @return the {@link String} representation
-	 */
-	public String toString(Format format, int startingBKey) {
-		updateBKeys(false);
-
-		StringBuilder builder = new StringBuilder();
-		for (String line : Parser.toStrings(this, format, startingBKey)) {
-			builder.append(line);
-			builder.append("\r\n");
-		}
-
-		return builder.toString();
-	}
-
 	/**
 	 * Return a {@link String} representation of this contact formated
 	 * accordingly to the given format.
 	 * 
 	 * <p>
 	 * The format is basically a list of field names separated by a pipe and
-	 * optionally parametrised. The parameters allows you to:
+	 * optionally parametrised with the 'at' (@) symbol. The parameters allows
+	 * you to:
 	 * <ul>
 	 * <li>@x: show only a present/not present info</li>
 	 * <li>@n: limit the size to a fixed value 'n'</li>
@@ -124,6 +107,15 @@ public class Contact extends BaseClass<Data> {
 	 * </p>
 	 * 
 	 * <p>
+	 * In case of lists or multiple-fields values, you can select a specific
+	 * list or field with:
+	 * <ul>
+	 * <li>FIELD@(0): select the first value in a list</li>
+	 * <li>FIELD@[1]: select the second field in a multiple-fields value</li>
+	 * </ul>
+	 * </p>
+	 * 
+	 * <p>
 	 * You can also add a fixed text if it starts with a simple-quote (').
 	 * </p>
 	 * 
@@ -157,6 +149,15 @@ public class Contact extends BaseClass<Data> {
 	 * </p>
 	 * 
 	 * <p>
+	 * In case of lists or multiple-fields values, you can select a specific
+	 * list or field with:
+	 * <ul>
+	 * <li>FIELD@(0): select the first value in a list</li>
+	 * <li>FIELD@[1]: select the second field in a multiple-fields value</li>
+	 * </ul>
+	 * </p>
+	 * 
+	 * <p>
 	 * You can also add a fixed text if it starts with a simple-quote (').
 	 * </p>
 	 * 
@@ -205,6 +206,15 @@ public class Contact extends BaseClass<Data> {
 	 * </p>
 	 * 
 	 * <p>
+	 * In case of lists or multiple-fields values, you can select a specific
+	 * list or field with:
+	 * <ul>
+	 * <li>FIELD@(0): select the first value in a list</li>
+	 * <li>FIELD@[1]: select the second field in a multiple-fields value</li>
+	 * </ul>
+	 * </p>
+	 * 
+	 * <p>
 	 * You can also add a fixed text if it starts with a simple-quote (').
 	 * </p>
 	 * 
@@ -273,6 +283,15 @@ public class Contact extends BaseClass<Data> {
 	 * </p>
 	 * 
 	 * <p>
+	 * In case of lists or multiple-fields values, you can select a specific
+	 * list or field with:
+	 * <ul>
+	 * <li>FIELD@(0): select the first value in a list</li>
+	 * <li>FIELD@[1]: select the second field in a multiple-fields value</li>
+	 * </ul>
+	 * </p>
+	 * 
+	 * <p>
 	 * You can also add a fixed text if it starts with a simple-quote (').
 	 * </p>
 	 * 
@@ -313,6 +332,8 @@ public class Contact extends BaseClass<Data> {
 			int size = -1;
 			boolean binary = false;
 			boolean expand = false;
+			int fieldNum = -1;
+			int valueNum = -1;
 
 			if (field.length() > 0 && field.charAt(0) != '\''
 					&& field.contains("@")) {
@@ -326,10 +347,22 @@ public class Contact extends BaseClass<Data> {
 					} else if (opt.equals("+")) {
 						expand = true;
 						numOfFieldsToExpand++;
+					} else if (opt.length() > 0 && opt.charAt(0) == '(') {
+						try {
+							opt = opt.substring(1, opt.length() - 1);
+							valueNum = Integer.parseInt(opt);
+						} catch (Exception e) {
+						}
+					} else if (opt.length() > 0 && opt.charAt(0) == '[') {
+						try {
+							opt = opt.substring(1, opt.length() - 1);
+							fieldNum = Integer.parseInt(opt);
+						} catch (Exception e) {
+						}
 					} else {
 						try {
 							size = Integer.parseInt(opt);
-						} catch (Exception e) {
+						} catch (NumberFormatException e) {
 						}
 					}
 				}
@@ -338,8 +371,22 @@ public class Contact extends BaseClass<Data> {
 			String value = null;
 			if (field.length() > 0 && field.charAt(0) == '\'') {
 				value = field.substring(1);
+			} else if (valueNum >= 0) {
+				List<String> vv = getPreferredData(field).getValues();
+				if (valueNum < vv.size()) {
+					value = vv.get(valueNum);
+				}
+			} else if (fieldNum >= 0) {
+				List<String> ff = getPreferredData(field).getFields();
+				if (fieldNum < ff.size()) {
+					value = ff.get(fieldNum);
+				}
 			} else {
-				value = getPreferredDataValue(field);
+				// we don't need the *data* in binary mode...
+				if (binary)
+					value = getData(field).size() > 0 ? "x" : null;
+				else
+					value = getPreferredDataValue(field);
 			}
 
 			if (value == null) {
@@ -466,7 +513,7 @@ public class Contact extends BaseClass<Data> {
 	 */
 	@Override
 	public String toString() {
-		return toString(Format.VCard21, -1);
+		return "[Contact: " + getPreferredDataValue("FN") + "]";
 	}
 
 	/**