Changeset 22653 for main

Timestamp:

2010-08-17T16:42:14+12:00 (14 years ago)

Author:

mdewsnip

Message:

Removed dmsafe() function from ghtml.pm. This shouldn't be done in the build time code because it is a runtime issue -- if you aren't using the Greenstone 2 receptionist (e.g OAI server, Greenstone 3) then escaping underscores just creates problems.

File:

• main/trunk/greenstone2/perllib/ghtml.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/ghtml.pm

@@ -66 +66 @@
 {
     $_[0] =~ s/[\x09\x20\x22\x3c\x3e\x5b\x5c\x5d\x5e\x60\x7b\x7c\x7d\x7e\?\=\&\+_\/]/sprintf("%%%2x", ord($&))/gse;
-}
-
-# dmsafe
-#
-# Converts characters which could make display.pl or html crack to their entity references.
-# Don't use this on dm macros as they will no longer be recognisable by dm (which
-# by the way, is the whole idea).
-# -- Rodger 12/1/98
-sub dmsafe {
-    my ($s) = $_[0];
-    $s =~ s/&/&/osg; # for html
-    $s =~ s/</&lt;/osg;  # for html
-    $s =~ s/>/&gt;/osg;  # for html
-    $s =~ s/\_/&#095;/osg; # for dm (we have a convention of starting macros with _
-    $s =~ s/\"/&quot;/osg; # for html (don't want to be interpreted as a quote)
-    $s =~ s/\{/&#123;/osg; # for dm blocks
-    $s =~ s/\}/&#125;/osg; # for dm blocks
-    $s =~ s/\\/&#092;/osg; # for dm (dm removes naturally occurring backquotes)
-    return $s;
 }