Changeset 1446

Timestamp:

2000-08-25T13:05:54+12:00 (24 years ago)

Author:

paynter

Message:

Major overhauls; works with the new gsConvert.pl instead of gs2text/gs2html.

File:

• trunk/gsdl/perllib/plugins/ConvertToPlug.pm (modified) (6 diffs)

trunk/gsdl/perllib/plugins/ConvertToPlug.pm

@@ -38 +38 @@
 package ConvertToPlug;
 
+use BasPlug;
 use HTMLPlug;
 use TEXTPlug;
 
 sub BEGIN {
-    @ISA = ('HTMLPlug', 'TEXTPlug');
+    @ISA = ('HTMLPlug');
+#    @ISA = ('HTMLPlug', 'TEXTPlug');
+#    @ISA = ('BasPlug'); #, 'HTMLPlug', 'TEXTPlug');
 }
 
@@ -80 +83 @@
 sub new {
     my $class = shift (@_);
-    
     my ($plugin_name,$generate_format) = $class->parse_args(\@_);
-
     my $self;
 
@@ -96 +97 @@
     $self->{'convert_to'} = "HTML";
     $self->{'convert_to_ext'} = "html";
+
+    $self->{'rename_assoc_files'} = 1;
+    $self->{'metadata_fields'} .= ",GENERATOR";
     }
 
@@ -103 +107 @@
 
 
-# Run conversion utility on the input file.  Output files generated in
-# collection specific 'tmp' directory.  
-# The collection tmp area is used to convert Word, PDF etc documents into 
-# another format (such as text or HTML) suitable for reading and indexing
+# Run conversion utility on the input file.  
+#
+# The conversion takes place in a collection specific 'tmp' directory so 
+# that we don't accidentally damage the input.
+#
+# The desired output type is indicated by $output_ext.  This is usually
+# something like "html" or "word", but can be "best" (or the empty string)
+# to indicate that the conversion utility should do the best it can.
 
 sub tmp_area_convert_file {
     my $self = shift (@_);
     my ($output_ext,$input_filename, $textref) = @_;
+
+    my $convert_to = $self->{'convert_to'};
 
     # softlink to collection tmp dir
@@ -122 +132 @@
     = File::Basename::fileparse($input_filename,'\..+');
     my $tmp_filename = &util::filename_cat($tmp_dirname,"$tailname$suffix");
-
     # Remove any white space from filename -- no risk of name collision, and
-    # makes latter conversion by utils simpler
+    # makes later conversion by utils simpler
     $tmp_filename =~ s/\s+//g; 
 
     &util::soft_link($input_filename,$tmp_filename);
-
-    my $output_filename 
-    = &util::filename_cat($tmp_dirname,"$tailname.$output_ext");
-    $output_filename =~ s/\s+//g; 
 
     my $verbosity = $self->{'verbosity'};
     if ($verbosity>0)
     {
-    print STDERR "Converting $tailname$suffix to $self->{'convert_to'}\n";
-    }
-    
-    # run either gs2txt.pl or gs2html.pl to peform the requested conversion
-    if (system("gs2$output_ext.pl -verbose $verbosity \"$tmp_filename\"")>0)
-    {
-    print STDERR "Warning: unable to convert to $output_ext format\n";
+    print STDERR "Converting $tailname$suffix to $convert_to format\n";
+    }
+    
+    # Execute the conversion command and get the type of the result,
+    # making sure the converter gives us the appropriate output type
+    my $output_type = lc($convert_to);
+    my $cmd = "gsConvert.pl -verbose $verbosity -output $output_type \"$tmp_filename\"";
+    $output_type = `$cmd`;
+
+    # Check STDERR here
+
+    chomp $output_type;
+    if ($output_type eq "fail") {
+    print STDERR "Could not convert $tailname$suffix to $convert_to format\n";
+    exit 1;
     }
 
     # remove symbolic link to original file
     &util::rm($tmp_filename);
+
+    # store the *actual* output type and return the output filename
+    $self->{'convert_to_ext'} = $output_type;
+    my $output_filename = $tmp_filename;
+    $output_filename =~ s/$suffix$/.$output_type/;
 
     return $output_filename;
@@ -207 +225 @@
     if ($convert_to eq "TEXT")
     {
+
     $ret_val = TEXTPlug::process($self,$textref,$pluginfo,
                      $tmp_dirname,$tmp_tailname,