Changeset 28267 for main/trunk

Timestamp:

2013-09-12T13:03:28+12:00 (11 years ago)

Author:

davidb

Message:

Code change to allow doc.xml files that do not have a DOCTYPE line

File:

• main/trunk/greenstone2/perllib/plugins/GreenstoneXMLPlugin.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/plugins/GreenstoneXMLPlugin.pm

@@ -105 +105 @@
     # can we process this file??
     my ($filename_full_path, $filename_no_path) = &util::get_full_filenames($base_dir, $file);
+
     return undef unless $self->can_process_this_file($filename_full_path);
 
@@ -145 +146 @@
 
 sub xml_start_document {
-}
-
-sub xml_end_document {
-}
-
-sub get_doctype {
-    my $self = shift(@_);
-    
-    return "(Greenstone)?Archive";
-}
-
-
-sub xml_doctype {
+
     my $self = shift(@_);
 
     my ($expat, $name, $sysid, $pubid, $internal) = @_;
-
-    # allow the short-lived and badly named "GreenstoneArchive" files to be processed
-    # as well as the "Archive" files which should now be created by import.pl
-    die "" if ($name !~ /^(Greenstone)?Archive$/);
 
     my $outhandle = $self->{'outhandle'};
     print $outhandle "GreenstoneXMLPlugin: processing $self->{'file'}\n" if $self->{'verbosity'} > 1;
     print STDERR "<Processing n='$self->{'file'}' p='GreenstoneXMLPlugin'>\n" if $self->{'gli'};
+
+}
+
+sub xml_end_document {
+}
+
+sub get_doctype {
+    my $self = shift(@_);
+    
+    return "(Greenstone)?Archive";
+}
+
+
+sub xml_doctype {
+    my $self = shift(@_);
+
+    my ($expat, $name, $sysid, $pubid, $internal) = @_;
+
+    # Some doc.xml files that have been manipulated by XML::Rules
+    # no longer have the DOCTYPE line.  No obvious way to fix
+    # the XML::Rules based code to keep DOCTYPE, so commenting
+    # out the code below to allow doc.xml files with DOCTYPE
+    # to be processed
+
+    # allow the short-lived and badly named "GreenstoneArchive" files to be processed
+    # as well as the "Archive" files which should now be created by import.pl
+##    die "" if ($name !~ /^(Greenstone)?Archive$/);
+
+#    my $outhandle = $self->{'outhandle'};
+#    print $outhandle "GreenstoneXMLPlugin: processing $self->{'file'}\n" if $self->{'verbosity'} > 1;
+#    print STDERR "<Processing n='$self->{'file'}' p='GreenstoneXMLPlugin'>\n" if $self->{'gli'};
 
 }