Merge pull request #19 from TNSGlobal/development

windows-31j & empty file fixes
fbiagi · Apr 10, 2017 · 6632645 · 6632645
2 parents c11ff44 + 10d7f00
commit 6632645
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 17 deletions.
diff --git a/SpssLib/FileParser/Records/CharacterEncodingRecord.cs b/SpssLib/FileParser/Records/CharacterEncodingRecord.cs
@@ -86,6 +86,12 @@ private Encoding GetEncoding(string strEncoding)
                 if (info != null)
                     return info.GetEncoding();
             }
+
+            if (strEncoding.Equals("windows-31j", StringComparison.InvariantCultureIgnoreCase))
+            {
+                // 932 - Japanese (Shift-JIS)
+                return Encoding.GetEncoding(932); 
+            }
 
             throw new SpssFileFormatException("Encoding not recognized: " + strEncoding);
         }

diff --git a/SpssLib/FileParser/SavFileParser.cs b/SpssLib/FileParser/SavFileParser.cs
@@ -35,28 +35,50 @@ public void ParseMetaData()
             IList<IRecord> records = new List<IRecord>(1000);
 
             MetaData = new MetaData();
-            
+
             RecordType readRecordType;
+            IRecord record;
+            IRecordParser recordParser;
+
+            // Read the header record and validate this file
+            try
+            {
+                readRecordType = _reader.ReadRecordType();
+                if (readRecordType != RecordType.HeaderRecord)
+                {
+                    throw new SpssFileFormatException("No header record is present. A header record is required. Is this a valid SPSS file?");
+                }
+                recordParser = parsers.GetParser(readRecordType);
+                record = recordParser.ParseRecord(_reader);
+                record.RegisterMetadata(MetaData);
+                records.Add(record);
+            }
+            catch (EndOfStreamException)
+            {
+                throw new SpssFileFormatException("No header record is present. A header record is required. Is your file empty?");
+            }
+
+            // Read the rest of the records
             do
             {
                 readRecordType = _reader.ReadRecordType();
-                var recordParser = parsers.GetParser(readRecordType);
-                var record = recordParser.ParseRecord(_reader);
+                recordParser = parsers.GetParser(readRecordType);
+                record = recordParser.ParseRecord(_reader);
                 record.RegisterMetadata(MetaData);
                 records.Add(record);
             } while (readRecordType != RecordType.End);
-            
+
 
             try
-	        {
-				_dataStartPosition = Stream.Position;
-	        }
-	        catch (NotSupportedException)
-	        {
-				// Some stream types don't support the Position property (CryptoStream...)
-				_dataStartPosition = 0;
-	        }
-            
+            {
+                _dataStartPosition = Stream.Position;
+            }
+            catch (NotSupportedException)
+            {
+                // Some stream types don't support the Position property (CryptoStream...)
+                _dataStartPosition = 0;
+            }
+
             SetDataRecordStream();
             MetaDataParsed = true;
         }

diff --git a/SpssLib/Properties/AssemblyInfo.cs b/SpssLib/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.4")]
+[assembly: AssemblyVersion("1.1.5")]
diff --git a/SpssLib/SpssLib.nuspec b/SpssLib/SpssLib.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>$id$</id>
-    <version>1.1.4</version>
+    <version>1.1.5</version>
     <title>$title$</title>
     <authors>Roeland Nieuwenhuis, Francisco Biagi</authors>
     <owners>$author$</owners>

diff --git a/Test.SpssLib/TestSpssReader.cs b/Test.SpssLib/TestSpssReader.cs
@@ -4,6 +4,7 @@
 using System.IO;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using SpssLib.DataReader;
+using SpssLib.FileParser;
 using SpssLib.SpssDataset;
 
 namespace Test.SpssLib
@@ -64,7 +65,14 @@ public void TestReadFile()
             Assert.AreEqual(rowCount, 3, "Rows count does not match");
         }
 
-
+        [TestMethod]
+        [ExpectedException(typeof(SpssFileFormatException))]
+        public void TestEmptyStream()
+        {
+            int varCount;
+            int rowCount;
+            ReadData(new MemoryStream(new byte[0]), out varCount, out rowCount);
+        }
 
         [TestMethod]
         [DeploymentItem(@"TestFiles\MissingValues.sav")]
@@ -118,7 +126,7 @@ public void TestReadMissingValuesAsNull()
             }
         }
 
-        internal static void ReadData(FileStream fileStream, out int varCount, out int rowCount, 
+        internal static void ReadData(Stream fileStream, out int varCount, out int rowCount, 
             IDictionary<int, Action<int, Variable>> variableValidators = null, IDictionary<int, Action<int, int, Variable, object>> valueValidators = null)
         {
             SpssReader spssDataset = new SpssReader(fileStream);