OpenFireSource · kvn-stgl · Oct 29, 2015
diff --git a/AlarmSources/Fax/Fax.csproj b/AlarmSources/Fax/Fax.csproj
@@ -48,10 +48,6 @@
     <Reference Include="AlarmWorkflow.BackendService.SettingsContracts">
       <HintPath>..\..\Build\AlarmWorkflow.BackendService.SettingsContracts.dll</HintPath>
     </Reference>
-    <Reference Include="Ghostscript.NET, Version=1.2.0.0, Culture=neutral, PublicKeyToken=f85051de34525b59, processorArchitecture=MSIL">
-      <HintPath>..\packages\Ghostscript.NET.1.2.0\lib\net40\Ghostscript.NET.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
@@ -82,9 +78,6 @@
   <ItemGroup>
     <EmbeddedResource Include="settings.info.xml" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/AlarmSources/Fax/FaxAlarmSource.cs b/AlarmSources/Fax/FaxAlarmSource.cs
@@ -27,7 +27,8 @@
 using AlarmWorkflow.Shared.Diagnostics;
 using AlarmWorkflow.Shared.Extensibility;
 using AlarmWorkflow.Shared.Specialized;
-using Ghostscript.NET;
+using AlarmWorkflow.Shared.Specialized.Pdf;
+using AlarmWorkflow.Shared.Specialized.Tiff;
 
 namespace AlarmWorkflow.AlarmSource.Fax
 {
@@ -56,6 +57,7 @@ sealed class FaxAlarmSource : IAlarmSource
         private DirectoryInfo _faxPath;
         private DirectoryInfo _archivePath;
         private DirectoryInfo _analysisPath;
+        private bool _convertToPdf;
 
         private IOcrSoftware _ocrSoftware;
         private IParser _parser;
@@ -140,20 +142,11 @@ private void ProcessNewPdf(FileInfo file)
 
             try
             {
-                GhostscriptImageDevice dev = new GhostscriptImageDevice();
-                dev.Device = "tiffgray";
-                dev.GraphicsAlphaBits = GhostscriptImageDeviceAlphaBits.V_4;
-                dev.TextAlphaBits = GhostscriptImageDeviceAlphaBits.V_4;
-                dev.Resolution = 300;
-                dev.InputFiles.Add(file.FullName);
-                dev.OutputPath = tiffFilePath;
-                dev.Process();
-
+                PdfHelper.ConvertToTiff(file.FullName, tiffFilePath);
                 ProcessNewImage(new FileInfo(tiffFilePath));
-
                 file.Delete();
             }
-            catch (GhostscriptException ex)
+            catch (PdfConvertException ex)
             {
                 Logger.Instance.LogFormat(LogType.Error, this, Properties.Resources.GhostscriptConvertError);
                 Logger.Instance.LogException(this, ex);
@@ -232,9 +225,20 @@ private void ProcessNewImage(FileInfo file)
                 }
 
                 IDictionary<string, object> ctxParameters = new Dictionary<string, object>();
-                ctxParameters[ContextParameterKeys.ArchivedFilePath] = archivedFilePath;
-                ctxParameters[ContextParameterKeys.ImagePath] = file.FullName;
 
+                if(_convertToPdf)
+                {
+                    Logger.Instance.LogFormat(LogType.Trace, this, Properties.Resources.ConvertImageToPdf, archivedFilePath);
+                    string pdfPath = TiffHelper.ConvertToPdf(archivedFilePath);
+                    ctxParameters[ContextParameterKeys.ArchivedFilePath] = pdfPath;
+                    File.Delete(archivedFilePath);
+                }
+                else
+                {
+                    ctxParameters[ContextParameterKeys.ArchivedFilePath] = archivedFilePath;
+                    ctxParameters[ContextParameterKeys.ImagePath] = file.FullName;
+                }
+
                 AlarmSourceEventArgs args = new AlarmSourceEventArgs(operation);
                 args.Parameters = ctxParameters;
 
@@ -282,6 +286,7 @@ private void InitializeFaxPaths()
             _faxPath = new DirectoryInfo(_configuration.FaxPath);
             _archivePath = new DirectoryInfo(_configuration.ArchivePath);
             _analysisPath = new DirectoryInfo(_configuration.AnalysisPath);
+            _convertToPdf = _configuration.ConvertToPdf;
 
             Logger.Instance.LogFormat(LogType.Trace, this, Properties.Resources.UsingIncomingFaxDirectory, _faxPath.FullName);
             Logger.Instance.LogFormat(LogType.Trace, this, Properties.Resources.UsingAnalyzedFaxDirectory, _analysisPath.FullName);

diff --git a/AlarmSources/Fax/FaxConfiguration.cs b/AlarmSources/Fax/FaxConfiguration.cs
@@ -55,6 +55,11 @@ internal string AnalysisPath
             get { return _settings.GetSetting(FaxSettingKeys.AnalysisPath).GetValue<string>(); }
         }
 
+        internal bool ConvertToPdf
+        {
+            get { return _settings.GetSetting(FaxSettingKeys.ConvertToPdf).GetValue<bool>(); }
+        }
+
         internal string OCRSoftwarePath
         {
             get { return _settings.GetSetting(FaxSettingKeys.OcrPath).GetValue<string>(); }
@@ -102,7 +107,7 @@ private void _settings_SettingChanged(object sender, SettingChangedEventArgs e)
                 {
                     changedKeys.Add("OCR.Path");
                 }
-                else if ((key.Equals(FaxSettingKeys.FaxPath) || key.Equals(FaxSettingKeys.AnalysisPath) || key.Equals(FaxSettingKeys.ArchivePath)) && !changedKeys.Contains("FaxPaths"))
+                else if ((key.Equals(FaxSettingKeys.FaxPath) || key.Equals(FaxSettingKeys.AnalysisPath) || key.Equals(FaxSettingKeys.ArchivePath) || key.Equals(FaxSettingKeys.ConvertToPdf)) && !changedKeys.Contains("FaxPaths"))
                 {
                     changedKeys.Add("FaxPaths");
                 }

diff --git a/AlarmSources/Fax/FaxSettingKeys.cs b/AlarmSources/Fax/FaxSettingKeys.cs
@@ -24,6 +24,7 @@ static class FaxSettingKeys
         internal static readonly SettingKey FaxPath = SettingKey.Create(Identifier, "FaxPath");
         internal static readonly SettingKey ArchivePath = SettingKey.Create(Identifier, "ArchivePath");
         internal static readonly SettingKey AnalysisPath = SettingKey.Create(Identifier, "AnalysisPath");
+        internal static readonly SettingKey ConvertToPdf = SettingKey.Create(Identifier, "ConvertToPdf");
         internal static readonly SettingKey AlarmFaxParserAlias = SettingKey.Create(Identifier, "AlarmfaxParser");
         internal static readonly SettingKey OcrPath = SettingKey.Create(Identifier, "OCR.Path");
     }

diff --git a/AlarmSources/Fax/Properties/Resources.Designer.cs b/AlarmSources/Fax/Properties/Resources.Designer.cs
diff --git a/AlarmSources/Fax/Properties/Resources.resx b/AlarmSources/Fax/Properties/Resources.resx
@@ -201,4 +201,7 @@
   <data name="GhostscriptConvertError" xml:space="preserve">
     <value>Error using Ghostscript. Maybe it's not installed.</value>
   </data>
+  <data name="ConvertImageToPdf" xml:space="preserve">
+    <value>Convert analysed image '{0}' to PDF-Document</value>
+  </data>
 </root>
diff --git a/AlarmSources/Fax/packages.config b/AlarmSources/Fax/packages.config
diff --git a/AlarmSources/Fax/settings.info.xml b/AlarmSources/Fax/settings.info.xml
@@ -8,6 +8,8 @@
              Description="Verzeichnis für verarbeitete Faxe." IsDynamic="true"/>
     <Setting Name="AnalysisPath" DisplayText="Analyse-Verzeichnis" Category="Verzeichnisse" Editor="DirectoryTypeEditor"
              Description="Verzeichnis für analysierte Faxe." IsDynamic="true"/>
+    <Setting Name="ConvertToPdf" DisplayText="Konvertieren zu PDF" Category="Verzeichnisse" IsDynamic="true"
+             Description="Gibt an ob das analysierte Fax in eine PDF-Datei umgewandelt werden soll."/>
 
     <Setting Name="OCR.Path" DisplayText="Pfad (Verzeichnis)" Category="Tesseract OCR-Software" Editor="DirectoryTypeEditor"
              Description="Wenn leer gelassen, wird das Standardverzeichnis (innerhalb des Programmverzeichnisses) genommen." IsDynamic="true"/>

diff --git a/AlarmSources/Fax/settings.xml b/AlarmSources/Fax/settings.xml
@@ -3,6 +3,7 @@
   <Setting Name="FaxPath" Type="System.String" IsNull="False">C:\Fax</Setting>
   <Setting Name="ArchivePath" Type="System.String" IsNull="False">C:\Fax\Archive\</Setting>
   <Setting Name="AnalysisPath" Type="System.String" IsNull="False">C:\Fax\Analysis\</Setting>
+  <Setting Name="ConvertToPdf" Type="System.Boolean" IsNull="False">False</Setting>
   <Setting Name="OCR.Path" Type="System.String" IsNull="False"></Setting>
   <Setting Name="AlarmfaxParser" Type="System.String" IsNull="False">NoParser</Setting>
 </SettingsConfiguration>
diff --git a/Jobs/Engine/AlarmSourcePrinter/AlarmSourcePrinterJob.cs b/Jobs/Engine/AlarmSourcePrinter/AlarmSourcePrinterJob.cs
@@ -27,6 +27,8 @@
 using AlarmWorkflow.Shared.Core;
 using AlarmWorkflow.Shared.Diagnostics;
 using AlarmWorkflow.Shared.Specialized.Printing;
+using AlarmWorkflow.Shared.Specialized.Pdf;
+using AlarmWorkflow.Shared.Specialized.Tiff;
 
 namespace AlarmWorkflow.Job.AlarmSourcePrinterJob
 {
@@ -44,21 +46,19 @@ class AlarmSourcePrinterJob : IJob
 
         private void PrintFaxes(IJobContext context, Operation operation)
         {
-            if (!context.Parameters.ContainsKey("ArchivedFilePath") || !context.Parameters.ContainsKey("ImagePath"))
+            if (!context.Parameters.ContainsKey("ArchivedFilePath"))
             {
                 Logger.Instance.LogFormat(LogType.Trace, this, Resources.NoPrintingPossible);
                 return;
             }
 
-            FileInfo sourceImageFile = new FileInfo((string)context.Parameters["ImagePath"]);
-            if (!sourceImageFile.Exists)
+            FileInfo archivedFile = new FileInfo((string)context.Parameters["ArchivedFilePath"]);
+            if (!archivedFile.Exists)
             {
-                Logger.Instance.LogFormat(LogType.Error, this, Resources.FileNotFound, sourceImageFile.FullName);
+                Logger.Instance.LogFormat(LogType.Error, this, Resources.FileNotFound, archivedFile.FullName);
                 return;
             }
 
-            string imagePath = (string)context.Parameters["ImagePath"];
-
             foreach (string queueName in _settings.GetSetting("AlarmSourcePrinterJob", "PrintingQueueNames").GetStringArray())
             {
                 var queues = _settings.GetSetting(SettingKeys.PrintingQueuesConfiguration).GetValue<PrintingQueuesConfiguration>();
@@ -69,7 +69,7 @@ private void PrintFaxes(IJobContext context, Operation operation)
                 }
 
                 PrintFaxTask task = new PrintFaxTask();
-                task.ImagePath = imagePath;
+                task.ArchivedFile = archivedFile.FullName;
                 task.Print(pq);
             }
         }
@@ -123,11 +123,25 @@ class PrintFaxTask
         {
             private IList<Image> _pages;
 
-            internal string ImagePath { private get; set; }
+            internal string ArchivedFile { private get; set; }
 
             internal void Print(PrintingQueue queue)
             {
-                _pages = SplitMultipageTiff(ImagePath);
+                switch (Path.GetExtension(ArchivedFile))
+                {
+                    case ".pdf":
+                        _pages = PdfHelper.ExtractImages(ArchivedFile);
+                        break;
+
+                    case ".tif":
+                        _pages = TiffHelper.SplitMultipage(ArchivedFile);
+                        break;
+
+                    default:
+                        Logger.Instance.LogFormat(LogType.Error, this, Resources.ArchivedFileWrongFormat, ArchivedFile);
+                        return;
+                }
+
 
                 ThreadPool.QueueUserWorkItem(w => GdiPrinter.Print(queue, GdiPrinterPrintAction));
             }
@@ -148,31 +162,6 @@ private bool GdiPrinterPrintAction(int pageIndex, Graphics graphics, Rectangle m
 
                 return pageIndex < _pages.Count;
             }
-
-            private static IList<Image> SplitMultipageTiff(string tiffFileName)
-            {
-                List<Image> images = new List<Image>();
-
-                using (Image tiffImage = Image.FromFile(tiffFileName))
-                {
-                    Guid objGuid = tiffImage.FrameDimensionsList[0];
-                    FrameDimension dimension = new FrameDimension(objGuid);
-                    int noOfPages = tiffImage.GetFrameCount(dimension);
-
-                    foreach (Guid guid in tiffImage.FrameDimensionsList)
-                    {
-                        for (int index = 0; index < noOfPages; index++)
-                        {
-                            FrameDimension currentFrame = new FrameDimension(guid);
-                            tiffImage.SelectActiveFrame(currentFrame, index);
-                            images.Add((Image)tiffImage.Clone());
-                        }
-                    }
-                }
-
-                return images;
-            }
-
         }
 
         #endregion

diff --git a/Jobs/Engine/AlarmSourcePrinter/Properties/Resources.Designer.cs b/Jobs/Engine/AlarmSourcePrinter/Properties/Resources.Designer.cs
diff --git a/Jobs/Engine/AlarmSourcePrinter/Properties/Resources.resx b/Jobs/Engine/AlarmSourcePrinter/Properties/Resources.resx
@@ -153,4 +153,8 @@
   <data name="ExportJobDisplayName" xml:space="preserve">
     <value>Alarmquellendruck</value>
   </data>
+  <data name="ArchivedFileWrongFormat" xml:space="preserve">
+    <value>The archived file '{0}' has no printable format</value>
+    <comment> </comment>
+  </data>
 </root>
diff --git a/Jobs/Engine/Mailing/Helpers.cs b/Jobs/Engine/Mailing/Helpers.cs
@@ -39,35 +39,7 @@ internal static Stream ToStream(this Image image, ImageFormat format)
             stream.Position = 0;
             return stream;
         }
-
-        internal static string[] ConvertTiffToJpegAndSplit(string fileName)
-        {
-            using (Image imageFile = Image.FromFile(fileName))
-            {
-                FrameDimension frameDimensions = new FrameDimension(imageFile.FrameDimensionsList[0]);
-                int frameNum = imageFile.GetFrameCount(frameDimensions);
-                string[] jpegPaths = new string[frameNum];
-
-                for (int frame = 0; frame < frameNum; frame++)
-                {
-                    imageFile.SelectActiveFrame(frameDimensions, frame);
-                    using (Bitmap bmp = new Bitmap(imageFile))
-                    {
-                        string tempFileName = Path.GetTempFileName();
-
-                        FileInfo fileInfo = new FileInfo(tempFileName);
-                        fileInfo.Attributes = FileAttributes.Temporary;
-
-                        jpegPaths[frame] = tempFileName;
-
-                        bmp.Save(jpegPaths[frame], ImageFormat.Jpeg);
-                    }
-                }
-
-                return jpegPaths;
-            }
-        }
-
+
         internal static Bitmap CombineBitmap(string[] files)
         {
             List<Bitmap> images = new List<Bitmap>();

diff --git a/Jobs/Engine/Mailing/MailingJob.cs b/Jobs/Engine/Mailing/MailingJob.cs
@@ -28,6 +28,7 @@
 using AlarmWorkflow.Shared.Core;
 using AlarmWorkflow.Shared.Diagnostics;
 using AlarmWorkflow.Shared.ObjectExpressions;
+using AlarmWorkflow.Shared.Specialized.Tiff;
 
 namespace AlarmWorkflow.Job.MailingJob
 {
@@ -185,21 +186,28 @@ private void SendMail(Operation operation, IJobContext context)
 
         private void AttachImage(IJobContext context, MailMessage message)
         {
-            if (context.Parameters.Keys.Contains("ImagePath"))
+            if (context.Parameters.Keys.Contains("ArchivedFilePath"))
             {
-                string imagePath = (string)context.Parameters["ImagePath"];
-                if (!string.IsNullOrWhiteSpace(imagePath))
+                string filePath = (string)context.Parameters["ArchivedFilePath"];
+                if (!string.IsNullOrWhiteSpace(filePath))
                 {
-                    if (File.Exists(imagePath))
+                    if (File.Exists(filePath))
                     {
-                        string[] splitFiles = Helpers.ConvertTiffToJpegAndSplit(imagePath);
-                        Stream stream = Helpers.CombineBitmap(splitFiles).ToStream(ImageFormat.Jpeg);
+                        if(Path.GetExtension(filePath) == ".tif")
+                        {
+                            string[] splitFiles = TiffHelper.ConvertToJpegAndSplit(filePath);
+                            Stream stream = Helpers.CombineBitmap(splitFiles).ToStream(ImageFormat.Jpeg);
 
-                        message.Attachments.Add(new Attachment(stream, ImageAttachmentFileName));
+                            message.Attachments.Add(new Attachment(stream, ImageAttachmentFileName));
 
-                        foreach (string s in splitFiles)
+                            foreach (string s in splitFiles)
+                            {
+                                File.Delete(s);
+                            }
+                        }
+                        else 
                         {
-                            File.Delete(s);
+                            message.Attachments.Add(new Attachment(filePath));
                         }
                     }
                 }

diff --git a/Resources/Documentation/RelNotes/0.9.9.0.txt b/Resources/Documentation/RelNotes/0.9.9.0.txt
@@ -16,6 +16,7 @@ Generelles
   * ConfEd: Im Adressbuch sind die Einträge nun nach Nachname/Vorname sortiert.
   * Als benutzerdefinierte Objektausdrücke sind nun auch Skripte in JavaScript möglich, siehe Anhang #2.
   * Die Faxauswertung erkennt nun auch PDF-Dateien.
+  * Ausgerwertete Faxe können optional als PDF-Dokumente gespeichert werden.
 
 Anhänge
 -------