Changeset 28107

Show
Ignore:
Timestamp:
20.08.2013 21:41:34 (6 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • other-projects/nightly-tasks/diffcol/trunk/diffcol/diffcol.pl

    r28102 r28107  
    558558            return 1; 
    559559        } 
     560    } elsif($file_contents =~ m@<Doc (.*)? file="(.*)?\\doc.xml" ([^>]*)?>@) {  # windows slashes detected in doc.xml in index/text/HASHxxx.dir 
     561        return 1; 
    560562    } 
    561563     
     
    638640        my ($model_contents, $test_contents); 
    639641 
    640         if($strModel =~ m/doc(mets)?\.xml$/) { 
     642        # archives/doc.xml files, archives/docmets.xml files and index/text/doc.xml files 
     643        if($strModel =~ m/doc(mets)?\.xml$/ || ($strModel =~ m@index[\\/]text@ && $strModel =~ m/doc\.xml$/)) { 
    641644 
    642645        open(FIN,"<$strModel") or die "Unable to open $strModel...ERROR: $!\n"; 
     
    742745#       &gdbdiff::print_string_to_file($model_contents, $savepath."model_docmets.xml"); 
    743746#       &gdbdiff::print_string_to_file($test_contents, $savepath."test_docmets.xml"); 
    744 #       if($strModel =~ m/(HASH0164.dir)/) { # list the HASH dirs for which you want the doc.xml file generated 
     747#       if($strModel =~ m/(HASH0164.dir)/) { # list the HASH dirs for which you want the doc.xml file generated, to inspect specific doc.xml files 
    745748#       &gdbdiff::print_string_to_file($model_contents, $savepath."$1_model_doc.xml"); 
    746749#       &gdbdiff::print_string_to_file($test_contents, $savepath."$1_test_doc.xml");