From 5fac51b910cd5a69b262138452d1f3b26f155b1c Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 28 Aug 2012 12:26:09 +0200
Subject: [PATCH] url_recipe_handle: allow %{var[reg]} substitutions

It's like ${var[reg]} but does URI component encoding as well.
---
 src/url_recipe.cpp |   49 +++++++++++++++++++++++++++++++++++++------------
 1 file changed, 37 insertions(+), 12 deletions(-)

diff --git a/src/url_recipe.cpp b/src/url_recipe.cpp
index 5d0c6ea..b514f7c 100644
--- a/src/url_recipe.cpp
+++ b/src/url_recipe.cpp
@@ -18,6 +18,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "config.hpp"
 
+#include <yaz/srw.h>
 #include <boost/regex.hpp>
 #include <metaproxy/xmlutil.hpp>
 
@@ -38,17 +39,28 @@ std::string mp_xml::url_recipe_handle(xmlDoc *doc, std::string recipe)
         ptr1 = ptr1->children;
 
     size_t p0 = 0;
-    for (;;)
+    while (p0 < recipe.length())
     {
-        size_t p1 = recipe.find_first_of("${", p0);
-        if (p1 == std::string::npos)
+        bool uri_encode = false;
+        if (p0 < recipe.length() -1 && recipe[p0] == '%'
+            && recipe[p0 + 1] == '{')
         {
-            result += recipe.substr(p0);
-            break;
+            p0++;
+            p0++;
+            uri_encode = true;
+        }
+        else if (p0 < recipe.length() -1 && recipe[p0] == '$'
+            && recipe[p0 + 1] == '{')
+        {
+            p0++;
+            p0++;
+        }
+        else
+        {
+            result += recipe[p0];
+            p0++;
+            continue;
         }
-        result += recipe.substr(p0, p1 - p0);
-        p0 = p1+2;
-
         int step = 0;  // 0=variable, 1=pattern, 2=replacement, 3=mode
         std::string variable;
         std::string pattern;
@@ -117,9 +129,7 @@ std::string mp_xml::url_recipe_handle(xmlDoc *doc, std::string recipe)
                             break;
                         }
                 }
-            if (pattern.length() == 0)
-                result += text;
-            else
+            if (pattern.length() > 0)
             {
                 boost::regex::flag_type b_mode = boost::regex::perl;
                 if (mode.find_first_of('i') != std::string::npos)
@@ -128,7 +138,22 @@ std::string mp_xml::url_recipe_handle(xmlDoc *doc, std::string recipe)
                 boost::match_flag_type match_mode = boost::format_first_only;
                 if (mode.find_first_of('g') != std::string::npos)
                     match_mode = boost::format_all;
-                result += regex_replace(text, e, replacement, match_mode);
+                text = regex_replace(text, e, replacement, match_mode);
+            }
+            if (!uri_encode)
+                result += text;
+            else
+            {
+                char src[2];
+                char dst[4];
+                size_t i;
+                for (i = 0; i < text.length(); i++)
+                {
+                    src[0] = text[i];
+                    src[1] = '\0';
+                    yaz_encode_uri_component(dst, src);
+                    result += dst;
+                }
             }
         }
     }
-- 
1.7.10.4