Changeset 14018

Timestamp:

2007-04-23T15:14:21+12:00 (17 years ago)

Author:

cvs_anon

Message:

fix HTMLPlug bug for the Page turning application

File:

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

trunk/gsdl/perllib/plugins/HTMLPlug.pm

@@ -341 +341 @@
     &util::mk_dir($tmp_dirname) if (!-e $tmp_dirname);
     
+    my $test_dirname = "";
+    if ($dirname =~ /import\//)
+    {
+        $test_dirname = $';
+    
+    #print STDERR "init $'\n";
+    
+    while ($test_dirname =~ /[\/]/)
+    {
+        my $folderdirname = $`;
+        $tmp_dirname = &util::filename_cat($tmp_dirname,$folderdirname);
+            &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/[\\\/]+$//;
+    #$dirname =~ s/[\\\/]+$//;
     # create folder for this file
-    my $folderdirname = &File::Basename::basename($dirname);
-    $tmp_dirname = &util::filename_cat($tmp_dirname,$folderdirname);
-    &util::mk_dir($tmp_dirname) if (!-e $tmp_dirname);
+    #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");
@@ -353 +379 @@
     if (($suffix eq ".htm") || ($suffix eq ".html") || ($suffix eq ".shtml"))
     {   
-        # convert the input file to a new style HDL
+        #convert the input file to a new style HDL
         my $hdl_output_filename = $input_filename;
         if ($self->{'old_style_HDL'})
@@ -361 +387 @@
         }
     
-    # tidy the input file
-    my $tidy_output_filename = $hdl_output_filename;
-    if ($self->{'tidy_html'})
-    {
-        $tidy_output_filename = &util::filename_cat($tmp_dirname, "$tailname$suffix");
-        $tidy_output_filename = $self->tmp_tidy_file($hdl_output_filename,$tidy_output_filename);
-    }
-    
-    $tmp_filename = $tidy_output_filename;
-    
-    # just for checking copy all other file from the base dir to tmp dir if it is not exists
+    #just for checking copy all other file from the base dir to tmp dir if it is not exists
     opendir(DIR,$base_dirname) or die "Can't open base directory : $base_dirname!";
     my @files = grep {!/^\.+$/} readdir(DIR);
@@ -390 +406 @@
         }
     }
+    
+    # tidy the input file
+    my $tidy_output_filename = $hdl_output_filename;
+    if ($self->{'tidy_html'})
+    {
+        $tidy_output_filename = &util::filename_cat($tmp_dirname, "$tailname$suffix");
+        $tidy_output_filename = $self->tmp_tidy_file($hdl_output_filename,$tidy_output_filename);
+    }
+    $tmp_filename = $tidy_output_filename;
     }
     else