--- cvs-head/lib/WAIT/Document/Ora.pm	2002/01/28 21:35:39	72
+++ cvs-head/lib/WAIT/Document/Ora.pm	2002/03/08 21:18:51	74
@@ -28,13 +28,12 @@
 
   opendir(DIR, $dir) or croak "Could not open '$dir': $!";
  DIRENT: for my $entry (readdir DIR) {
-    # next unless $entry =~ /nt/;
     if (-f "$dir/$entry/desc.html") {
       my $index = "$dir/$entry/index.html";
       open F, $index or Carp::confess("Could not open $index: $!");
       local $/;
       my $content = <F>;
-      next DIRENT unless $content =~ m|<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"\s+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\s+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US" xml:lang="en-US">\s+<head>\s+<!-- product id:|s;
+      next DIRENT unless $content =~ m|<div|s;
       push @files, $entry;
     }
   }
@@ -48,29 +47,27 @@
 
 sub FETCH {
   my $self = shift;
-  my $file = shift;
+  my $id = shift;
 
   local($/) = undef;
 
-  my $fh = IO::File->new(join('/',$self->{Dir},$file,'desc.html'));
-  my $desc = conv_getline($fh);
-  $fh = IO::File->new(join('/',$self->{Dir},$file,'author.html'));
-  my $author = conv_getline($fh) if $fh;
-  $fh = IO::File->new(join('/',$self->{Dir},$file,'index.html'));
-  my $index = conv_getline($fh) if $fh;
-  $fh = IO::File->new(join('/',$self->{Dir},$file,'colophon.html'));
-  my $colophon = conv_getline($fh) if $fh;
   return {
-          desc => $desc,
-          author => $author,
-          index => $index,
-          colophon => $colophon,
+          desc => $self->conv_getline("$id/desc.html"),
+          author => $self->conv_getline("$id/author.html"),
+          index => $self->conv_getline("$id/index.html"),
+          colophon => $self->conv_getline("$id/colophon.html"),
+          translator => $self->conv_getline("$id/translator.html"),
+          toc => $self->conv_getline("$id/toc.html"),
+          inx => $self->conv_getline("$id/inx.html"),
          };
 }
 
 # WAIT::Document::Ora::conv_getline
-sub conv_getline ($) {
-  my($fh) = shift;
+sub conv_getline {
+  my($self) = shift;
+  my($file) = shift;
+  my $fh = IO::File->new("$self->{Dir}/$file") or return "";
+
   local $/ = "\n";
   my $firstline = <$fh>;
   my $src_enc;
