Changeset 23347 for main/trunk/greenstone2/perllib/plugins/HTMLPlugin.pm

Timestamp:

2010-11-26T09:43:59+13:00 (13 years ago)

Author:

davidb

Message:

Tidy up of debugging statements for handline filename encodings, plus finishing off the 'deduce_filename_encoding' routine

File:

• main/trunk/greenstone2/perllib/plugins/HTMLPlugin.pm (modified) (5 diffs)

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

@@ -379 +379 @@
 
     my ($tailname,$dirname) = &File::Basename::fileparse($file);
-    print STDERR "***!! file = $file\n";
+
 #    my $utf8_file = $self->filename_to_utf8_metadata($file);
 #    $utf8_file =~ s/&\#095;/_/g;
     my $utf8_file = &unicode::raw_filename_to_url_encoded($tailname);
-    print STDERR "***!! utf8_file = $utf8_file\n";
+
+    if ((defined $ENV{"DEBUG_UNICODE"}) && ($ENV{"DEBUG_UNICODE"})) {
+        print STDERR "***!! file = $file\n";
+        print STDERR "***!! utf8_file = $utf8_file\n";
+    }
+
 
     my $web_url = "http://";
@@ -758 +763 @@
 
     # If web page didn't give encoding, then default to utf8
-    print "*************** looking up $file\n";
+    if ((defined $ENV{"DEBUG_UNICODE"}) && ($ENV{"DEBUG_UNICODE"})) {
+        print STDERR "*** Web page didn't give encoding, defaulting to UTF8!\n";
+        print STDERR "*****  looking up $file\n";
+    }
 
     my $content_encoding= $self->{'content_encoding'} || "utf8";
@@ -767 +775 @@
 
     &ghtml::urlsafe ($href);
-    print STDERR "***!!! href=$href\n";    
+    if ((defined $ENV{"DEBUG_UNICODE"}) && ($ENV{"DEBUG_UNICODE"})) {
+        print STDERR "***!!! href=$href\n";    
+    }
+
 
     return $front . "_httpextlink_&rl=" . $rl . "&href=" . $href . $hash_part . $back;
@@ -818 +829 @@
     if (!-e $filename) {
     # try the original filename stored in map
-    print STDERR "***###!! orig filename did not exist: $filename\n";
+    if ((defined $ENV{"DEBUG_UNICODE"}) && ($ENV{"DEBUG_UNICODE"})) {
+        print STDERR "***###!! orig filename did not exist: $filename\n";
+    }
 
     my $original_filename = $self->{'utf8_to_original_filename'}->{$utf8_filename};
 
-    print STDERR "**** Trying for $original_filename\n";
+    if ((defined $ENV{"DEBUG_UNICODE"}) && ($ENV{"DEBUG_UNICODE"})) {
+        print STDERR "**** Trying for $original_filename\n";
+    }
 
     if (defined $original_filename && -e $original_filename) {
-        print STDERR "*** found match\n";
+        if ((defined $ENV{"DEBUG_UNICODE"}) && ($ENV{"DEBUG_UNICODE"})) {
+            print STDERR "*** found match\n";
+        }
         $filename = $original_filename;
     }
@@ -1164 +1181 @@
     $title =~ s/^$self->{'title_sub'}// if ($self->{'title_sub'});
     $title =~ s/^\s+//s; # in case title_sub introduced any...
-    print STDERR "**** adding Title: ", Encode::encode("utf8",$title), "\n";
     $doc_obj->add_utf8_metadata ($section, "Title", $title);
     print $outhandle " extracted Title metadata \"$title\" from $from\n"