Changeset 17983

Timestamp:

2008-11-28 19:29:16 (1 month ago)

Author:

ak19

Message:

Wvware inserts a comment at the end of the HTML it generates which contains urls that Greenstone replaces with macros. When the macros are expanded by GS, the wvWare comment breaks and the resulting HTML is ugly. This comment has been removed in order to prevent the page from breaking when the page is served by the Greenstone server.

Files:

• gsdl/trunk/perllib/plugins/HTMLPlugin.pm (modified) (1 diff)

gsdl/trunk/perllib/plugins/HTMLPlugin.pm

@@ -666 +666 @@
-        $file =~ s@(\\)+@/@g; 
-    }
+
+    # Any document converted by wvWare into HTML tends to have a certain comment inserted 
+    # by wvware at the end of the HTML it generated. This comment contains urls that 
+    # Greenstone replaces with macros, which then break the comment when the macros are
+    # expanded. The result is that the HTML displayed in the Greenstone browser is ugly.
+    # Therefore, we remove wvWare's insertion here. 
+    $$textref =~ s/<!--\n(?:.*?)Document created with(?:.*?)wvware(?:.*?)-->//s;
-    
-    # reset per-doc stuff...