X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmir%2Futil%2FGeneratorHTMLFunctions.java;h=bcedf17bc4254dfe2a73823621881ea0a8291c7e;hb=29da699109ce8842d02b60abcdb0dfdc4aa4f0db;hp=cd6364bb3dd05b9b5b4f60da2e29590f8357d2af;hpb=781ae5e450f0fdc85d3ee5b4b586aa542611a562;p=mir.git

diff --git a/source/mir/util/GeneratorHTMLFunctions.java b/source/mir/util/GeneratorHTMLFunctions.java
index cd6364bb..bcedf17b 100755
--- a/source/mir/util/GeneratorHTMLFunctions.java
+++ b/source/mir/util/GeneratorHTMLFunctions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002  The Mir-coders group
+ * Copyright (C) 2001, 2002 The Mir-coders group
  *
  * This file is part of Mir.
  *
@@ -18,52 +18,96 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with the com.oreilly.servlet library, any library
- * licensed under the Apache Software License, The Sun (tm) Java Advanced
- * Imaging library (JAI), The Sun JIMI library (or with modified versions of
- * the above that use the same license as the above), and distribute linked
- * combinations including the two.  You must obey the GNU General Public
- * License in all respects for all of the code used other than the above
- * mentioned libraries.  If you modify this file, you may extend this exception
- * to your version of the file, but you are not obligated to do so.  If you do
- * not wish to do so, delete this exception statement from your version.
+ * the code of this program with  any library licensed under the Apache Software License,
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
+ * (or with modified versions of the above that use the same license as the above),
+ * and distribute linked combinations including the two.  You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries.  If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your version.
  */
-
 package mir.util;
 
-import java.util.*;
-import java.net.*;
+import java.util.List;
 
-import mir.misc.*;
-import mir.generator.*;
+import mir.generator.Generator;
+import mir.generator.GeneratorExc;
+import mir.generator.GeneratorFailure;
 
 public class GeneratorHTMLFunctions {
   private GeneratorHTMLFunctions() {}
 
   public static class encodeURIGeneratorFunction implements Generator.GeneratorFunction {
-    public Object perform(List aParameters) throws GeneratorExc {
-      if (aParameters.size()!=1)
-        throw new GeneratorExc("encodeURIGeneratorFunction: only 1 parameter expected");
-      if (aParameters.get(0)==null)
-        return "";
-      if (!(aParameters.get(0) instanceof String))
-        throw new GeneratorExc("encodeURIGeneratorFunction: parameter must be a string (not a "+aParameters.get(0).getClass().getName()+")");
+    public Object perform(List aParameters) throws GeneratorExc, GeneratorFailure {
+      try {
+        if (aParameters.size()<1 || aParameters.size()>2)
+          throw new GeneratorExc("encodeURIGeneratorFunction <text> [<encoding>]: only 1 or 2 parameters expected");
+
+        if (aParameters.size()>=2)
+          return HTMLRoutines.encodeURL(StringRoutines.interpretAsString(aParameters.get(0)), (StringRoutines.interpretAsString(aParameters.get(1))));
+        else
+          return HTMLRoutines.encodeURL(StringRoutines.interpretAsString(aParameters.get(0)));
+
 
-      return URLEncoder.encode((String) aParameters.get(0));
+      }
+      catch (GeneratorExc e) {
+        throw e;
+      }
+      catch (Throwable t) {
+        throw new GeneratorFailure("encodeURIGeneratorFunction: " + t.getMessage(), t);
+      }
     };
   }
 
   public static class encodeHTMLGeneratorFunction implements Generator.GeneratorFunction {
     public Object perform(List aParameters) throws GeneratorExc {
-      if (aParameters.size()!=1)
-        throw new GeneratorExc("encodeHTMLGeneratorFunction: only 1 parameter expected");
-      if (aParameters.get(0)==null)
-        return "";
-      if (!(aParameters.get(0) instanceof String))
-        throw new GeneratorExc("encodeHTMLGeneratorFunction: parameter must be a string (not a "+aParameters.get(0).getClass().getName()+")");
+      try {
+        if (aParameters.size()!=1)
+          throw new GeneratorExc("encodeHTMLGeneratorFunction: only 1 parameter expected");
+
+        return HTMLRoutines.encodeHTML(StringRoutines.interpretAsString(aParameters.get(0)));
+      }
+      catch (GeneratorExc e) {
+        throw e;
+      }
+      catch (Throwable t) {
+        throw new GeneratorFailure("encodeHTMLGeneratorFunction: " + t.getMessage(), t);
+      }
+    };
+  }
 
+  public static class prettyEncodeHTMLGeneratorFunction implements Generator.GeneratorFunction {
+    public Object perform(List aParameters) throws GeneratorExc {
+      try {
+        if (aParameters.size()!=1)
+          throw new GeneratorExc("prettyEncodeHTMLGeneratorFunction: only 1 parameter expected");
+
+        return HTMLRoutines.prettyEncodeHTML(StringRoutines.interpretAsString(aParameters.get(0)));
+      }
+      catch (GeneratorExc e) {
+        throw e;
+      }
+      catch (Throwable t) {
+        throw new GeneratorFailure("prettyEncodeHTMLGeneratorFunction: " + t.getMessage(), t);
+      }
+    };
+  }
+
+  public static class encodeXMLGeneratorFunction implements Generator.GeneratorFunction {
+    public Object perform(List aParameters) throws GeneratorExc {
+      try {
+        if (aParameters.size()!=1)
+          throw new GeneratorExc("encodeHTMLGeneratorFunction: only 1 parameter expected");
 
-      return HTMLRoutines.encodeHTML((String) aParameters.get(0));
+        return HTMLRoutines.encodeXML(StringRoutines.interpretAsString(aParameters.get(0)));
+      }
+      catch (GeneratorExc e) {
+        throw e;
+      }
+      catch (Throwable t) {
+        throw new GeneratorFailure("encodeHTMLGeneratorFunction: " + t.getMessage(), t);
+      }
     };
   }
 }