Changeset 14532

Timestamp:

2007-09-17T15:43:24+12:00 (16 years ago)

Author:

qq6

Message:

updated replacing macros

File:

• greenstone3/trunk/src/java/org/greenstone/gsdl3/util/GS2MacroResolver.java (modified) (3 diffs)

greenstone3/trunk/src/java/org/greenstone/gsdl3/util/GS2MacroResolver.java

@@ -20 +20 @@
 
 import java.util.ArrayList;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.net.URLDecoder;
 
 public class GS2MacroResolver 
-    extends MacroResolver 
+    extends MacroResolver
 {
 
@@ -71 +74 @@
         // the (?s) treats the string as a single line, cos . 
         // doesn't necessarily match line breaks
-        if (text.matches("(?s).*"+m.macro+".*")) {
+        //if (text.matches("(?s).*"+m.macro+".*")) {
+        Pattern p_text = Pattern.compile(".*" + m.macro + ".*",Pattern.DOTALL);
+        Matcher match_text = p_text.matcher(text);
+        if (match_text.matches()) {
             if (m.resolve) {
             new_text = this.resolve(m.text, lang, scope, doc_oid);
@@ -78 +84 @@
             }
             text = text.replaceAll(m.macro, new_text);
+            if (m.macro.endsWith("\\\\")){ // to get rid of "\" from the string likes: "src="http://www.greenstone.org:80/.../mw.gif\">"
+            Pattern p_back_slash = Pattern.compile("\\\"");// create a pattern "\\\"", but it matches both " and \"
+            Matcher m_slash = p_back_slash.matcher(text);
+            String clean_str = "";
+            int s=0;
+            while (m_slash.find()){
+                if (!text.substring(m_slash.end()-2,m_slash.end()-1).equals("\\")){
+                clean_str = clean_str + text.substring(s,m_slash.end()-1); // it matches ", so get a substring before "
+                }else{
+                clean_str = clean_str + text.substring(s,m_slash.end()-2);// it matches \", so get a substring before \
+                }
+                s = m_slash.end();// get the index of the last match
+                clean_str = clean_str + "\"";
+            }
+            text = clean_str + text.substring(s,text.length());
+            }
         }
         break;
         case TYPE_META:
-        if (text.matches(".*"+m.macro+".*")) {
+        Pattern p = Pattern.compile(".*" + m.macro + ".*",Pattern.DOTALL);
+        Matcher match = p.matcher(text);
+        if (match.matches()) {
             if (node_info == null) {
             node_info = gdbm_src.getInfo(doc_oid);