Changeset 28107 for other-projects/nightly-tasks/diffcol/trunk/diffcol

Timestamp:

2013-08-20T21:41:34+12:00 (11 years ago)

Author:

ak19

Message:

Demo-Lucene has a different type of doc.xml in its index\text folder's HASH dirs. Expanding diffcol doc.xml processing to support this.

File:

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

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

@@ -558 +558 @@
             return 1;
         }
+    } elsif($file_contents =~ m@<Doc (.*)? file="(.*)?\\doc.xml" ([^>]*)?>@) {  # windows slashes detected in doc.xml in index/text/HASHxxx.dir
+        return 1;
     }
     
@@ -638 +640 @@
         my ($model_contents, $test_contents);
 
-        if($strModel =~ m/doc(mets)?\.xml$/) {
+        # archives/doc.xml files, archives/docmets.xml files and index/text/doc.xml files
+        if($strModel =~ m/doc(mets)?\.xml$/ || ($strModel =~ m@index[\\/]text@ && $strModel =~ m/doc\.xml$/)) {
 
         open(FIN,"<$strModel") or die "Unable to open $strModel...ERROR: $!\n";
@@ -742 +745 @@
 #       &gdbdiff::print_string_to_file($model_contents, $savepath."model_docmets.xml");
 #       &gdbdiff::print_string_to_file($test_contents, $savepath."test_docmets.xml");
-#       if($strModel =~ m/(HASH0164.dir)/) { # list the HASH dirs for which you want the doc.xml file generated
+#       if($strModel =~ m/(HASH0164.dir)/) { # list the HASH dirs for which you want the doc.xml file generated, to inspect specific doc.xml files
 #       &gdbdiff::print_string_to_file($model_contents, $savepath."$1_model_doc.xml");
 #       &gdbdiff::print_string_to_file($test_contents, $savepath."$1_test_doc.xml");