Refactor main template (+ fix some strange regex bug)

[gigi.git] / src / org / cacert / gigi / output / Template.java

diff --git a/src/org/cacert/gigi/output/Template.java b/src/org/cacert/gigi/output/Template.java
index 225560c8869a1ecdb842c3e608859fa5056a1c93..586c6dad495b631928b4ea5b0331c7c56f447f00 100644 (file)
--- a/src/org/cacert/gigi/output/Template.java
+++ b/src/org/cacert/gigi/output/Template.java
@@ -18,7 +18,7 @@ public class Template implements Outputable {
                LinkedList<Outputable> commands = new LinkedList<Outputable>();
                Scanner sc = new Scanner(r);
                Pattern p1 = Pattern.compile("([^<]|<[^?])*<\\?");
-               Pattern p2 = Pattern.compile("([^<]|<[^?])*\\?>");
+               Pattern p2 = Pattern.compile("[^?]*\\?>");
                while (true) {
                        String s1 = sc.findWithinHorizon(p1, 0);
                        if (s1 == null) {