Fix minor issues before delivery to partners.

Precise message log in RecordElicitation.java.
Add "_elicit" to the recording filename of an elicitation.

We still cannot do a respeaking/translation of an elicitation.

Aikuma/src/org/lp20/aikuma/model/Recording.java

@@ -1147,7 +1147,7 @@ public class Recording extends FileModel {
 	/**
 	 * Name mutator.
 	 */
-	private void setName(String name) {
+	public void setName(String name) {
 		this.name = name;
 	}
 

Aikuma/src/org/lp20/aikuma/model/RecordingLig.java

@@ -148,7 +148,13 @@ public class RecordingLig extends Recording {
 			throws IOException {
 		File wavFile = new File(getNoSyncRecordingsPath(), wavUUIDExt);
 		Log.i(TAG, "importwav: " + wavFile.length());
-		File destFile = new File(getIndividualRecordingPath(), this.name + ext);
+		Log.i(TAG, "Elicitation mode? " + isElicit());
+		File destFile;
+		if (isElicit()) {
+			destFile = new File(getIndividualRecordingPath(), this.respeakingId + ext);
+		} else {
+			destFile = new File(getIndividualRecordingPath(), this.name + ext);
+		}
 		FileUtils.moveFile(wavFile, destFile);
 //		FileUtils.moveFile(wavFile, this.getFile(idExt));
 		Log.i(TAG, "src file " + wavFile.getAbsolutePath() + " moves to " + destFile.getAbsolutePath());
@@ -185,14 +191,12 @@ public class RecordingLig extends Recording {
 
 
 		// if the recording is original
-		if (isOriginal()) {
+		if (isOriginal() || isElicit()) {
 			// Import the sample wave file into the new recording directory
 			File wavFile = new File(getNoSyncRecordingsPath(), recordingUUID + SAMPLE_SUFFIX);
 			FileIO.delete(wavFile);
 			Log.d("file deleted", wavFile.getName());
-		}else {
-
-			
+		} else {
 			// Try and import the mapping file
 			importMapping(recordingUUID, getId());
 			
@@ -204,8 +208,12 @@ public class RecordingLig extends Recording {
 
 
 		// Write the json metadata.
-		File metadataFile = new File(getIndividualRecordingPath(),
-				this.name + METADATA_SUFFIX);
+		File metadataFile;
+		if (isElicit()) {
+			metadataFile = new File(getIndividualRecordingPath(), this.respeakingId + METADATA_SUFFIX);
+		} else {
+			metadataFile = new File(getIndividualRecordingPath(), this.name + METADATA_SUFFIX);
+		}
 		FileIO.writeJSONObject(metadataFile,encodedRecording);
 		Log.i(TAG, "Saved metadata file to " + metadataFile.getAbsolutePath());		
 	}
@@ -266,9 +274,30 @@ public class RecordingLig extends Recording {
 	public File getFile() {
 		String extension = (this.isMovie())? ".mp4" : ".wav";
 		return new File(getIndividualRecordingPath(), this.name + extension);
-//		return getFile(id + extension);
+//			return getFile(id + extension);
+		}
+	
+	public File getElicitFile() {
+		String extension = (this.isMovie())? ".mp4" : ".wav";
+		if (isElicit()) {
+			return new File(getIndividualRecordingPath(), this.getRespeakingId() + extension);
+		} else {
+			return new File(getIndividualRecordingPath(), this.name + extension);
+//			return getFile(id + extension);
+		}
 	}
 	
+	
+	/**
+	 * Returns true if the Recording is an elicitation;
+	 *
+	 * @return	True if the recording is an elicitation.
+	 */
+	public boolean isElicit() {
+		return this.name.contains("elicit") && !this.name.contains("_rspk") || !this.name.contains("_trsl");	
+	}
+	
+	
 	public File getRecordingsPath() {
 		File path = new File(
 				FileIO.getOwnerPath(), RECORDINGS);
@@ -283,14 +312,21 @@ public class RecordingLig extends Recording {
 	 */
 	public File getIndividualRecordingPath() {
 		File path;
+		String[] dir = this.getRespeakingId().split("_");
 		if (this.name.contains("rspk") || this.name.contains("trsl")) {
-			String[] dir = this.getRespeakingId().split("_");
 			Log.d("path -> ", "path -> "+this.getRespeakingId());
 			path = new File(getRecordingsPath(), 
 					dir[0] + "_" + dir[1] + "_" + dir[2] + "/");
-		} else { path = new File(getRecordingsPath(), this.name + "/"); }
+		} else if (isElicit()) {
+			Log.d("elicitation path -> ", "elicitation path -> "+this.getRespeakingId());
+			path = new File(getRecordingsPath(), 
+				dir[0] + "_" + dir[1] + "_" + dir[2] + "_" + dir[3] + "/");
+		} else { 
+			path = new File(getRecordingsPath(), this.name + "/"); 
+		}
 		path.mkdirs();
 		Log.d("destPath", path.toString());
 		return path;
 	}
+	
 }

Aikuma/src/org/lp20/aikuma/ui/ThumbRespeakActivityLig.java

@@ -189,7 +189,7 @@ public class ThumbRespeakActivityLig extends AikumaActivity {
 	 */
 	private void saveCurrentState() {
 		Log.d("saveCurrentSession", "true");
-		Toast.makeText(this, "save current not finished session", Toast.LENGTH_SHORT).show();
+		Toast.makeText(this, "The session has been saved.", Toast.LENGTH_SHORT).show();
 		duration = respeaker.getSimplePlayer().getCurrentMsec();
 		Date date = new Date();
 		DateFormat dateformat = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM);