Changeset 24944
- Timestamp:
- 2012-01-12T15:52:20+13:00 (12 years ago)
- Location:
- gs3-extensions/html-to-expeditee/trunk/src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
gs3-extensions/html-to-expeditee/trunk/src/perllib/CssStyleToExpAttr.pm
r24941 r24944 357 357 return $exp_font_size; 358 358 } 359 360 361 sub convert_color 362 { 363 my ($css_color) = @_; 364 365 my $exp_color; 366 367 if ($css_color =~ m/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/) { 368 369 my $r = int(100*$1/255); 370 my $g = int(100*$2/255); 371 my $b = int(100*$3/255); 372 373 print STDERR "*** r = $r, g = $g, b = $b\n"; 374 375 $exp_color = "$r $g $b"; 376 377 print STDERR "*** exp color = $exp_color\n"; 378 379 } 380 elsif ($css_color =~ m/^transparent/i) { 381 $exp_color = undef; 382 } 383 384 return $exp_color; 385 } 359 386 360 387 1; -
gs3-extensions/html-to-expeditee/trunk/src/perllib/ExpediteeFrameIO.pm
r24941 r24944 74 74 my $exp_attr = {}; 75 75 76 if (defined $css_attr->{'background-color'}) {77 $exp_attr->{'e'} = $css_attr->{'background-color'};78 }79 80 76 # load up some defaults for font information 81 77 my $exp_font_family = "s"; # t … … 97 93 98 94 # $exp_attr->{'f'} = $exp_font_family.$exp_font_face.$exp_font_size; 95 96 # background color 97 98 99 if (defined $css_attr->{'background-color'}) { 100 my $css_color = $css_attr->{'background-color'}; 101 102 my $exp_color = CssStyleToExpAttr::convert_color($css_color); 103 104 $exp_attr->{'e'} = $exp_color; 105 } 99 106 100 107 return $exp_attr; … … 447 454 448 455 my $img_url = $html_node->{'img'}; 449 $img_url =~ s/^http:\/\/ www\.nzdl\.org\/greenstone3-showcase\///;456 $img_url =~ s/^http:\/\/(.*?)\/greenstone3(.*?)\///; 450 457 if ($img_url =~ m/^interfaces\//) { 451 458 $img_url = "images/$img_url"; -
gs3-extensions/html-to-expeditee/trunk/src/src/cgi-bin/html-to-expeditee.pl.in
r24937 r24944 108 108 docOIDs = []; 109 109 var outstandingURLs = []; 110 var visitedURLs = {}; 111 110 112 outstandingURLs.push(url); 113 visitedURLs[url] = 1; 111 114 112 115 while (outstandingURLs.length>0) { … … 121 124 122 125 123 /* any links with a= d... cl=??? => outstandingURLS */126 /* any links with a=(b|d) ... cl=??? => outstandingURLS */ 124 127 /* any links with a=d ... d=??? => docOIDS */ 125 128 126 129 var actionRE = new RegExp("(\\\\?|&)a=(?:d|b)(&|\$)"); 127 var clRE = new RegExp("(\\\\?|&)cl=" + cl + " \\\\.");130 var clRE = new RegExp("(\\\\?|&)cl=" + cl + "(\\\\.\\\\d+)+(&|\$)"); 128 131 var docRE = new RegExp("(?:\\\\?|&)d=(.*?)(?:&|\$)"); 129 132 … … 133 136 if (href && href.match(actionRE)) { 134 137 if (href.match(clRE)) { 135 outstandingURLs.push(href); 138 if (!visitedURLs[href]) { 139 // console.log("found a new CL line: " + href); 140 outstandingURLs.push(href); 141 visitedURLs[href] = 1; 142 } 136 143 } 137 144 else if (href.match(docRE)) { … … 139 146 var docMatch = docRE.exec(href); 140 147 var docOID = docMatch[1]; 148 149 // console.log("found a new doc line: " + docOID); 141 150 142 151 docOIDs.push(docOID); … … 151 160 152 161 var docOID = docOIDs.shift(); 153 console.log("doc oid = " + docOID);162 //console.log("doc oid = " + docOID); 154 163 155 164 var url; -
gs3-extensions/html-to-expeditee/trunk/src/src/js/html-to-expeditee.js
r24941 r24944 171 171 style["background-color"] = getStyle(node,"background-color"); 172 172 173 // console.log("background color = " + style["background-color"]); 174 173 175 // console.log("font size = " + style["font-size"]); 174 176
Note:
See TracChangeset
for help on using the changeset viewer.