X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2Fremote%2FServer.java;h=e90e42d6ff1e76c5a1caec0d91d2e5c2a80ec808;hb=cf77cb3542f2aefbebdb9aa00b358dbeb4489a73;hp=2ead82b19a90d6bf3a84b25c9c44d9394fd0d171;hpb=ebead449cce5df1849d54796fd2515a9e0556fee;p=jvcard.git

diff --git a/src/be/nikiroo/jvcard/remote/Server.java b/src/be/nikiroo/jvcard/remote/Server.java
index 2ead82b..e90e42d 100644
--- a/src/be/nikiroo/jvcard/remote/Server.java
+++ b/src/be/nikiroo/jvcard/remote/Server.java
@@ -195,8 +195,7 @@ public class Server implements Runnable {
 					break;
 				case POST:
 					synchronized (cardsLock) {
-						doPostCard(cmd.getParam(), s.receiveBlock());
-						s.sendBlock();
+						s.sendLine(doPostCard(cmd.getParam(), s.receiveBlock()));
 						break;
 					}
 				case LIST:
@@ -259,11 +258,7 @@ public class Server implements Runnable {
 
 				// timestamp:
 				lines.add(StringUtils.fromTime(card.getLastModified()));
-
-				// TODO: !!! fix this !!!
-				for (String line : card.toString(Format.VCard21).split("\r\n")) {
-					lines.add(line);
-				}
+				lines.addAll(Parser.toStrings(card, Format.VCard21));
 			}
 		}
 
@@ -278,16 +273,23 @@ public class Server implements Runnable {
 	 * @param data
 	 *            the data to save
 	 * 
+	 * @return the date of last modification
+	 * 
 	 * @throws IOException
 	 *             in case of error
 	 */
-	private void doPostCard(String name, List<String> data) throws IOException {
+	private String doPostCard(String name, List<String> data)
+			throws IOException {
 		if (name != null && name.length() > 0) {
 			File vcf = new File(dataDir.getAbsolutePath() + File.separator
 					+ name);
 
 			Card card = new Card(Parser.parse(data, Format.VCard21));
 			card.saveAs(vcf, Format.VCard21);
+
+			return StringUtils.fromTime(vcf.lastModified());
 		}
+
+		return "";
 	}
 }