Changeset 38048 for other-projects/nightly-tasks/diffcol/trunk/diffcol/diffcol.pl

Timestamp:

2023-09-06T19:03:44+12:00 (9 months ago)

Author:

anupama

Message:

Enhanced-PDF model vs test collection on windows: On windows, xpdf-tools seems to insert more newlines (and with double carriage returns at times) than on linux. So a little more cleaning up before diffing and these minor differences are resolved also.

File:

• other-projects/nightly-tasks/diffcol/trunk/diffcol/diffcol.pl (modified) (4 diffs)

other-projects/nightly-tasks/diffcol/trunk/diffcol/diffcol.pl

@@ -694 +694 @@
             
             # remove all carriage returns \r - introduced into doc.xml by multiread after pdf converted to html
-            $$win_contents =~ s@[\r]@@g;            
+            $$win_contents =~ s@[\r]@@g;
         
             # make all single windows slashes into single unix slashes
@@ -707 +707 @@
             # $$win_contents =~ s@\r@\n@mg;
             
-            if($strModel =~ m/doc\.xml$/) { # processing particular to doc.xml
+            if($strModel =~ m/doc\.xml$/) { # processing that's particular to doc.xml
                 # remove solitary, stray carriage returns \r in the linux doc.xml, as occurs in the tudor collection owing to the source material
                 # containing solitary carriage returns instead of linefeed
                 $$lin_contents =~ s@[\r]@@g; #$$lin_contents =~ s@[\r][^\n]@@g;
                 
+                
+                # replace all multiple newlines with single one (for Enhanced-PDF, xpdf-tools introduces more newlines on Windows than linux)
+                $$win_contents =~ s@(\n)+@\n@g;
+                $$lin_contents =~ s@(\n)+@\n@g;
                 
                 # make all single back slash in the linux file into / slash, if when \ was used as a linux escape char in a path
@@ -733 +737 @@
         }
         
-        # processing particular to doc.xml  
+        # processing that's particular to doc.xml   
         if($strModel =~ m/doc\.xml$/) {
             # tmp dirs have subdirs with random numbers in name, remove randomly named subdir portion of path
@@ -784 +788 @@
             &flatdbdiff::print_string_to_file($model_contents, $savepath."model_docmets.xml");
             &flatdbdiff::print_string_to_file($test_contents, $savepath."test_docmets.xml");
-#           if($strModel =~ m/(HASH019c.dir|HASH2bdf.dir)/) { # list the HASH dirs for which you want the doc.xml file generated, to inspect specific doc.xml files
-#           &flatdbdiff::print_string_to_file($model_contents, $savepath."$1_model_doc.xml");
-#           &flatdbdiff::print_string_to_file($test_contents, $savepath."$1_test_doc.xml");
+#           if($strModel =~ m/doc\.xml$/ && $strModel =~ m/archives/
+#               && $strModel =~ m/(HASH019c.dir|HASH1a9c.dir)/) # list the HASH dirs for which you want the (archives) doc.xml file generated, to inspect specific doc.xml files
+#           {
+#               &flatdbdiff::print_string_to_file($model_contents, $savepath."$1_model_doc.xml");
+#               &flatdbdiff::print_string_to_file($test_contents, $savepath."$1_test_doc.xml");
 #           }
         }