Changeset 14913 for gsdl/trunk/perllib/plugins/HTMLPlug.pm

Timestamp:

2007-12-12T13:40:19+13:00 (16 years ago)

Author:

qq6

Message:

updated by Veronica

File:

• gsdl/trunk/perllib/plugins/HTMLPlug.pm (modified) (9 diffs)

gsdl/trunk/perllib/plugins/HTMLPlug.pm

@@ -43 +43 @@
 
 use Image::Size;
+use File::Copy;
 
 sub BEGIN {
@@ -107 +108 @@
     'desc' => "{HTMLPlug.sectionalise_using_h_tags}",
     'type' => "flag" },
-      { 'name' => "tidy_html",
+      { 'name' => "use_realistic_book",
         'desc' => "{HTMLPlug.tidy_html}",
     'type' => "flag"},
-      { 'name' => "old_style_HDL",
+      { 'name' => "is_old_HDL_tags",
         'desc' => "{HTMLPlug.old_style_HDL}",
     'type' => "flag"}   
@@ -349 +350 @@
     
     my $test_dirname = "";
-    if ($dirname =~ /import\//)
+    my $f_separator = &util::get_os_dirsep();
+    
+   if ($dirname =~ /import$f_separator/)
     {
         $test_dirname = $';
@@ -355 +358 @@
     #print STDERR "init $'\n";
     
-    while ($test_dirname =~ /[\/]/)
+    while ($test_dirname =~ /[$f_separator]/)
     {
         my $folderdirname = $`;
@@ -361 +364 @@
             &util::mk_dir($tmp_dirname) if (!-e $tmp_dirname);
         $test_dirname = $';
-        #print STDERR "folder $`\n";
-    }
-    
-    #my $folderdirname = $';
-    #$tmp_dirname = &util::filename_cat($tmp_dirname,$folderdirname);
-        #&util::mk_dir($tmp_dirname) if (!-e $tmp_dirname);
-    #print STDERR "folderdirnae $'\n";
-    
-    #$test_dirname =~ s/[\\\/]+$//;
-    #print STDERR "$'";
-    }
-    
-    # remove trailing slashes
-    #$dirname =~ s/[\\\/]+$//;
-    # create folder for this file
-    #my $folderdirname = &File::Basename::basename($dirname);
-    #my $folderdirname = $test_dirname;
-    #$tmp_dirname = &util::filename_cat($tmp_dirname,$folderdirname);
-    #&util::mk_dir($tmp_dirname) if (!-e $tmp_dirname);
+    }
+    }
     
     my $tmp_filename = &util::filename_cat($tmp_dirname, "$tailname$suffix");
@@ -406 +392 @@
         {
             # just copy the original file back to the tmp directory
-                open (TIDYIN, "< $src_file") or die "Can't open $src_file : $!";
-                open (TIDYOUT, "> $dest_file") or die "Can't open $dest_file : $!";
-                print TIDYOUT <TIDYIN>;
-                close TIDYIN;
-                close TIDYOUT;
+            copy($src_file,$dest_file) or die "Can't copy file $src_file to $dest_file $!";
         }
     }
@@ -428 +410 @@
     {
             # just copy the original file back to the tmp directory
-            open (TIDYIN, "< $input_filename") or die "Can't open $input_filename : $!";
-            open (TIDYOUT, "> $tmp_filename") or die "Can't open $tmp_filename : $!";
-            print TIDYOUT <TIDYIN>;
-            close TIDYIN;
-            close TIDYOUT;
+        copy($input_filename,$tmp_filename) or die "Can't copy file $input_filename to $tmp_filename $!";
     }
     }
@@ -498 +476 @@
 
         # run html-tidy on the tmp file to make it a proper XML file
-        my $tidyfile = `tidy -wrap 0 -asxml $tmp_filename`;
+        my $tidyfile = `tidy -utf8 -wrap 0 -asxml $tmp_filename`;
 
         # write result back to the tmp file
@@ -525 +503 @@
     if (($self->{'tidy_html'}) || ($self->{'old_style_HDL'}))
     {
+        # because the document has to be sectionalized set the description tags 
+        $self->{'description_tags'} = 1;
+
         # set the file to be tidied
             $input_filename = &util::filename_cat($base_dir,$file) if $base_dir =~ /\w/;