Changeset 24944 for gs3-extensions/html-to-expeditee/trunk/src/perllib/ExpediteeFrameIO.pm

Timestamp:

2012-01-12T15:52:20+13:00 (12 years ago)

Author:

davidb

Message:

More careful recursive traversal to classifier nodes; further developed of CSS to Expeditee attributes (background colour); and slightly less cludgy way to deal with full img URLS

File:

• gs3-extensions/html-to-expeditee/trunk/src/perllib/ExpediteeFrameIO.pm (modified) (3 diffs)

gs3-extensions/html-to-expeditee/trunk/src/perllib/ExpediteeFrameIO.pm

@@ -74 +74 @@
     my $exp_attr = {};
 
-    if (defined $css_attr->{'background-color'}) {
-    $exp_attr->{'e'} = $css_attr->{'background-color'};
-    }
-
     # load up some defaults for font information
     my $exp_font_family = "s"; # t
@@ -97 +93 @@
 
 #    $exp_attr->{'f'} = $exp_font_family.$exp_font_face.$exp_font_size;
+
+    # background color
+
+
+    if (defined $css_attr->{'background-color'}) {
+    my $css_color = $css_attr->{'background-color'};
+
+    my $exp_color = CssStyleToExpAttr::convert_color($css_color);
+
+    $exp_attr->{'e'} = $exp_color;
+    }
 
     return $exp_attr;
@@ -447 +454 @@
 
         my $img_url = $html_node->{'img'};
-        $img_url =~ s/^http:\/\/www\.nzdl\.org\/greenstone3-showcase\///;
+        $img_url =~ s/^http:\/\/(.*?)\/greenstone3(.*?)\///;
         if ($img_url =~ m/^interfaces\//) {
         $img_url = "images/$img_url";