-Fix to array data type reader (strings with square bracket inside)

bubibubi · Sep 7, 2023 · ac4f8e7 · ac4f8e7
1 parent 0aa1170
commit ac4f8e7
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 1 deletion.
diff --git a/BuildTablesFromPdf.Engine.Test/BuildTablesFromPdf.Engine.Test.csproj b/BuildTablesFromPdf.Engine.Test/BuildTablesFromPdf.Engine.Test.csproj
@@ -54,6 +54,7 @@
     </Otherwise>
   </Choose>
   <ItemGroup>
+    <Compile Include="PdfArrayDataTypeTest.cs" />
     <Compile Include="SimpleTextExtractorTest.cs" />
     <Compile Include="BuildTablesFromPdfTest.cs" />
     <Compile Include="MHDiff.cs" />

diff --git a/BuildTablesFromPdf.Engine.Test/PdfArrayDataTypeTest.cs b/BuildTablesFromPdf.Engine.Test/PdfArrayDataTypeTest.cs
@@ -0,0 +1,29 @@
+using System;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace BuildTablesFromPdf.Engine.Test
+{
+    [TestClass]
+    public class PdfArrayDataTypeTest
+    {
+        [TestMethod]
+        public void TestGetRawDataBaseTest()
+        {
+            var inputData = "[(:)19(-)] TJ\n0 -13.65 Td\n(\"$$7.#8-8:;9-) Tj\n0 -14.7 Td\n(+) Tj\n[(8)75(\")75(89<9#8-6)(\")75(89-)] TJ\n144 29.2 Td\n(\"96) Tj\n0 -14.65 Td\n($.!!9#8) Tj\n[(-)31(\"$$7.#8)] TJ\n-65.6 -12.1 Td\n/c 7 Tf\n(=>?@\\)*-ABC-DE'>F) Tj\n17.55 12.75 Td\n(=>?@\\)*-&GH) Tj\n14.95 12.5 Td\n(IJKL\\)*) Tj\n-13.8 30 Td\n(=>?@\\)*-MN') Tj\n46.9 -56.85 Td\n/c 8 Tf\n(O5POQP4O45) Tj\n-144 40 Td\n(/ \"#-#7-) Tj\n144 0.85 Td\n(\"931-O42O-OR1S-4O41-13R3-5OQ) Tj\n0 14.75 Td\n(OR1S4O4113R35OQ) Tj\n-10.45 -15.6 Td\n(T) Tj\n0 -12.5 Td\n(T) Tj\n0 -14.65 Td\n(T) Tj\n0 -12.5 Td\n(T) Tj\n0.1 55.25 Td\n(T) Tj\n-77.05 -14.1 Td\n/c 7 Tf\n(UV'WK\\)*-=>?@J\\)-U\\)GX\\)*-MN'\\)*) Tj\nET\nQ\nBT\n1 0 0 1 240.35 -205.7 Tm\n0 0 0 sc\n/c 8 Tf\n(Y!7<-) Tj\n115.15 1.95 Td\n(ZK) Tj\n17.85 -0.25 Td\n(T) Tj\n9.6 1.1 Td\n(OQPO[P4O44) Tj\n63.7 -0.85 Td\n[(8)75(\\\\)] TJ\n23.85 0 Td\n(U\\)]) Tj\n15.25 0 Td\n(T) Tj\n7.1 0.85 Td\n(5QPQ4P4O44) Tj\n-467.5 -19.95 Td\n/g 9 Tf\n( !\"#$%&'\\(\"\\)*) Tj\n519.8 0 Td\n(+\\(,\"$%) Tj\n-23.2 -11.5 Td\n/c 8 Tf\n(-- \"0";
+            int i = 0;
+            var outputData = PdfArrayDataType.GetRawData(inputData, ref i);
+            Assert.AreEqual("[(:)19(-)]", outputData);
+        }
+
+        [TestMethod]
+        public void TestGetRawDataTextWithSquareBracketTest()
+        {
+            var inputData = "[(:])19(-)] TJ\n0 -13.65 Td\n(\"$$7.#8-8:;9-) Tj\n0 -14.7 Td\n(+) Tj\n[(8)75(\")75(89<9#8-6)(\")75(89-)] TJ\n144 29.2 Td\n(\"96) Tj\n0 -14.65 Td\n($.!!9#8) Tj\n[(-)31(\"$$7.#8)] TJ\n-65.6 -12.1 Td\n/c 7 Tf\n(=>?@\\)*-ABC-DE'>F) Tj\n17.55 12.75 Td\n(=>?@\\)*-&GH) Tj\n14.95 12.5 Td\n(IJKL\\)*) Tj\n-13.8 30 Td\n(=>?@\\)*-MN') Tj\n46.9 -56.85 Td\n/c 8 Tf\n(O5POQP4O45) Tj\n-144 40 Td\n(/ \"#-#7-) Tj\n144 0.85 Td\n(\"931-O42O-OR1S-4O41-13R3-5OQ) Tj\n0 14.75 Td\n(OR1S4O4113R35OQ) Tj\n-10.45 -15.6 Td\n(T) Tj\n0 -12.5 Td\n(T) Tj\n0 -14.65 Td\n(T) Tj\n0 -12.5 Td\n(T) Tj\n0.1 55.25 Td\n(T) Tj\n-77.05 -14.1 Td\n/c 7 Tf\n(UV'WK\\)*-=>?@J\\)-U\\)GX\\)*-MN'\\)*) Tj\nET\nQ\nBT\n1 0 0 1 240.35 -205.7 Tm\n0 0 0 sc\n/c 8 Tf\n(Y!7<-) Tj\n115.15 1.95 Td\n(ZK) Tj\n17.85 -0.25 Td\n(T) Tj\n9.6 1.1 Td\n(OQPO[P4O44) Tj\n63.7 -0.85 Td\n[(8)75(\\\\)] TJ\n23.85 0 Td\n(U\\)]) Tj\n15.25 0 Td\n(T) Tj\n7.1 0.85 Td\n(5QPQ4P4O44) Tj\n-467.5 -19.95 Td\n/g 9 Tf\n( !\"#$%&'\\(\"\\)*) Tj\n519.8 0 Td\n(+\\(,\"$%) Tj\n-23.2 -11.5 Td\n/c 8 Tf\n(-- \"0";
+            int i = 0;
+            var outputData = PdfArrayDataType.GetRawData(inputData, ref i);
+            Assert.AreEqual("[(:])19(-)]", outputData);
+        }
+
+
+    }
+}
diff --git a/BuildTablesFromPdf.Engine/PdfDataTypes/PdfArrayDataType.cs b/BuildTablesFromPdf.Engine/PdfDataTypes/PdfArrayDataType.cs
@@ -77,7 +77,7 @@ public static bool IsStartChar(string content, int i)
             return content[i] == '[';
         }
 
-        public static string GetRawData(string content, ref int i)
+        public static string GetRawData_(string content, ref int i)
         {
             if (!IsStartChar(content, i))
                 throw new ArgumentException("The content is not a PdfArrayDataType");
@@ -95,5 +95,52 @@ public static string GetRawData(string content, ref int i)
             return data;
         }
 
+        public static string GetRawData(string content, ref int i)
+        {
+            if (!IsStartChar(content, i))
+                throw new ArgumentException("The content is not a PdfArrayDataType");
+
+            string data = "[";
+
+            i++;
+            while (i < content.Length)
+            {
+                if (PdfStringDataType.IsStartChar(content, i))
+                {
+                    string item = PdfStringDataType.GetRawData(content, ref i);
+                    data += item;
+                }
+                else if (PdfHexStringDataType.IsStartChar(content, i))
+                {
+                    string item = PdfHexStringDataType.GetRawData(content, ref i);
+                    data += item;
+                }
+                else if (PdfNumericDataType.IsStartChar(content, i))
+                {
+                    string item = PdfNumericDataType.GetRawData(content, ref i);
+                    data += item;
+                }
+                else if (PdfArrayDataType.IsStartChar(content, i))
+                {
+                    string item = PdfArrayDataType.GetRawData(content, ref i);
+                    data += item;
+                }
+                else if (content[i] == ']')
+                {
+                    data += content[i];
+                    return data;
+                }
+                else if (content[i] == ' ')
+                    i++;
+                else if (content[i] == '\n')
+                    i++;
+                else
+                    throw new ArgumentException(string.Format("{0} is not an array", content));
+            }
+
+            return data;
+        }
+
+
     }
 }