[med-svn] [SCM] aghermann branch, master, updated. 4b06a66467a52311d413e817136ece62c0e9c24a

[Andrei Zavada]

The following commit has been merged in the master branch:
commit ed0096f798ce7a0e8ecea1ec98e0f9de564f9806
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Tue Jul 16 00:50:44 2013 +0300

    ICM

diff --git a/src/libsigfile/edf.cc b/src/libsigfile/edf.cc
index 488d14a..4890dd4 100644
--- a/src/libsigfile/edf.cc
+++ b/src/libsigfile/edf.cc
@@ -500,11 +500,12 @@ _parse_header()
 			_subject.parse_recording_id_edf_style( _patient_id);
 
 	      // deal with episode and session
-		int parsed_status;
-		tie (_session, _episode, parsed_status) =
-			figure_session_and_episode();
-		if ( parsed_status )
-			_status |= (nosession | noepisode);
+		{
+			int parsed_status;
+			tie (_session, _episode, parsed_status) =
+				figure_session_and_episode();
+			_status |= parsed_status;
+		}
 
 	      // parse times
 		{
@@ -881,8 +882,8 @@ explain_status( const int status)
 		recv.emplace_back( "* Date field ill-formed");
 	if ( status & time_unparsable )
 		recv.emplace_back( "* Time field ill-formed");
-	if ( status & nosession )
-		recv.emplace_back( "* No session information in field RecordingID");
+	if ( status & (nosession|noepisode) )
+		recv.emplace_back( "* No session/episode information in RecordingID");
 	if ( status & non1020_channel )
 		recv.emplace_back( "* Channel designation not following the 10-20 system");
 	if ( status & nonconforming_patient_id )
diff --git a/src/libsigfile/source-base.cc b/src/libsigfile/source-base.cc
index 46c58c7..4b36926 100644
--- a/src/libsigfile/source-base.cc
+++ b/src/libsigfile/source-base.cc
@@ -297,7 +297,7 @@ figure_session_and_episode()
 	     sscanf( rec_id_isolated.c_str(), T " (" T ")", int_session, int_episode) == 2 )
 		;
 	else
-		status = 1;
+		status = (nosession|noepisode);
 #undef T
 
 	// (b) identified from file name

-- 
Sleep experiment manager