<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>Samples/GoogleSearchSample.cs</filename>
    </added>
    <added>
      <filename>Samples/LiveSearchSample.cs</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -20,6 +20,15 @@
       &lt;setting name=&quot;AmazonSubscriptionID&quot; serializeAs=&quot;String&quot;&gt;
         &lt;value&gt;[Your Subscription ID]&lt;/value&gt;
       &lt;/setting&gt;
+      &lt;setting name=&quot;LiveSearchUri&quot; serializeAs=&quot;String&quot;&gt;
+        &lt;value&gt;http://api.{operation}.live.net/json.aspx?AppId={appID}&amp;amp;Market=en-US&amp;amp;Sources=web&lt;/value&gt;
+      &lt;/setting&gt;
+      &lt;setting name=&quot;LiveSearchApiKey&quot; serializeAs=&quot;String&quot;&gt;
+        &lt;value&gt;[Your API Key]&lt;/value&gt;
+      &lt;/setting&gt;
+      &lt;setting name=&quot;GoogleSearchUri&quot; serializeAs=&quot;String&quot;&gt;
+        &lt;value&gt;http://ajax.googleapis.com/ajax/services/{operation}/web?v=1.0&lt;/value&gt;
+      &lt;/setting&gt;
     &lt;/Application.Settings&gt;
   &lt;/applicationSettings&gt;
 &lt;/configuration&gt;</diff>
      <filename>App.config</filename>
    </modified>
    <modified>
      <diff>@@ -60,5 +60,41 @@ namespace Application {
                 return ((string)(this[&quot;AmazonSubscriptionID&quot;]));
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute(&quot;http://api.{operation}.live.net/json.aspx?AppId={appID}&amp;Market=en-US&amp;Sources=web&quot;)]
+        public string LiveSearchUri {
+            get {
+                return ((string)(this[&quot;LiveSearchUri&quot;]));
+            }
+            set {
+                this[&quot;LiveSearchUri&quot;] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute(&quot;40EA1F3C4F04BE0EA8F0461962A8F8EAC4D773D3&quot;)]
+        public string LiveSearchApiKey {
+            get {
+                return ((string)(this[&quot;LiveSearchApiKey&quot;]));
+            }
+            set {
+                this[&quot;LiveSearchApiKey&quot;] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute(&quot;http://ajax.googleapis.com/ajax/services/{operation}/web?v=1.0&quot;)]
+        public string GoogleSearchUri {
+            get {
+                return ((string)(this[&quot;GoogleSearchUri&quot;]));
+            }
+            set {
+                this[&quot;GoogleSearchUri&quot;] = value;
+            }
+        }
     }
 }</diff>
      <filename>AppSettings.Designer.cs</filename>
    </modified>
    <modified>
      <diff>@@ -1,18 +1,27 @@
 &#65279;&lt;?xml version='1.0' encoding='utf-8'?&gt;
-&lt;SettingsFile xmlns=&quot;http://schemas.microsoft.com/VisualStudio/2004/01/settings&quot; CurrentProfile=&quot;(Default)&quot; GeneratedClassNamespace=&quot;Dynamic.Properties&quot; GeneratedClassName=&quot;Settings&quot;&gt;
+&lt;SettingsFile xmlns=&quot;http://schemas.microsoft.com/VisualStudio/2004/01/settings&quot; CurrentProfile=&quot;(Default)&quot; GeneratedClassNamespace=&quot;Application&quot; GeneratedClassName=&quot;AppSettings&quot;&gt;
   &lt;Profiles /&gt;
   &lt;Settings&gt;
     &lt;Setting Name=&quot;FlickrUri&quot; Type=&quot;System.String&quot; Scope=&quot;Application&quot;&gt;
       &lt;Value Profile=&quot;(Default)&quot;&gt;http://api.flickr.com/services/rest/?method=flickr.{operation}&amp;amp;api_key={apiKey}&amp;amp;format=json&amp;amp;nojsoncallback=1&lt;/Value&gt;
     &lt;/Setting&gt;
     &lt;Setting Name=&quot;FlickrApiKey&quot; Type=&quot;System.String&quot; Scope=&quot;Application&quot;&gt;
-      &lt;Value Profile=&quot;(Default)&quot;&gt;be9b6f66bd7a1c0c0f1465a1b7e8a764&lt;/Value&gt;
+      &lt;Value Profile=&quot;(Default)&quot;&gt;[Your API Key]&lt;/Value&gt;
     &lt;/Setting&gt;
     &lt;Setting Name=&quot;AmazonUri&quot; Type=&quot;System.String&quot; Scope=&quot;Application&quot;&gt;
       &lt;Value Profile=&quot;(Default)&quot;&gt;http://webservices.amazon.com/onca/xml?Service=AWSECommerceService&amp;amp;SubscriptionId={subscriptionID}&amp;amp;Operation={operation}&lt;/Value&gt;
     &lt;/Setting&gt;
     &lt;Setting Name=&quot;AmazonSubscriptionID&quot; Type=&quot;System.String&quot; Scope=&quot;Application&quot;&gt;
-      &lt;Value Profile=&quot;(Default)&quot;&gt;1S494ZXP934WJ38NH5R2&lt;/Value&gt;
+      &lt;Value Profile=&quot;(Default)&quot;&gt;[Your Subscription ID]&lt;/Value&gt;
+    &lt;/Setting&gt;
+    &lt;Setting Name=&quot;LiveSearchUri&quot; Type=&quot;System.String&quot; Scope=&quot;User&quot;&gt;
+      &lt;Value Profile=&quot;(Default)&quot;&gt;http://api.{operation}.live.net/json.aspx?AppId={appID}&amp;amp;Market=en-US&amp;amp;Sources=web&lt;/Value&gt;
+    &lt;/Setting&gt;
+    &lt;Setting Name=&quot;LiveSearchApiKey&quot; Type=&quot;System.String&quot; Scope=&quot;User&quot;&gt;
+      &lt;Value Profile=&quot;(Default)&quot;&gt;[Your API Key]&lt;/Value&gt;
+    &lt;/Setting&gt;
+    &lt;Setting Name=&quot;GoogleSearchUri&quot; Type=&quot;System.String&quot; Scope=&quot;User&quot;&gt;
+      &lt;Value Profile=&quot;(Default)&quot;&gt;http://ajax.googleapis.com/ajax/services/{operation}/web?v=1.0&lt;/Value&gt;
     &lt;/Setting&gt;
   &lt;/Settings&gt;
 &lt;/SettingsFile&gt;
\ No newline at end of file</diff>
      <filename>AppSettings.settings</filename>
    </modified>
    <modified>
      <diff>@@ -44,6 +44,8 @@
   &lt;ItemGroup&gt;
     &lt;Compile Include=&quot;Samples\AmazonSample.cs&quot; /&gt;
     &lt;Compile Include=&quot;DynamicRest\RestClientMode.cs&quot; /&gt;
+    &lt;Compile Include=&quot;Samples\GoogleSearchSample.cs&quot; /&gt;
+    &lt;Compile Include=&quot;Samples\LiveSearchSample.cs&quot; /&gt;
     &lt;Compile Include=&quot;Samples\JsonSample.cs&quot; /&gt;
     &lt;Compile Include=&quot;Samples\FlickrSample.cs&quot; /&gt;
     &lt;Compile Include=&quot;Core\StandardActionKinds.cs&quot; /&gt;</diff>
      <filename>DynamicRest.csproj</filename>
    </modified>
    <modified>
      <diff>@@ -70,32 +70,32 @@ namespace DynamicRest {
         private Uri CreateRequestUri(string operation, JsonObject parameters) {
             StringBuilder uriBuilder = new StringBuilder();
 
-            if (_parameters != null) {
-                List&lt;object&gt; values = new List&lt;object&gt;();
+            List&lt;object&gt; values = new List&lt;object&gt;();
 
-                string rewrittenUriFormat = TokenFormatRewriteRegex.Replace(_uriFormat, delegate(Match m) {
-                    Group startGroup = m.Groups[&quot;start&quot;];
-                    Group propertyGroup = m.Groups[&quot;property&quot;];
-                    Group formatGroup = m.Groups[&quot;format&quot;];
-                    Group endGroup = m.Groups[&quot;end&quot;];
+            string rewrittenUriFormat = TokenFormatRewriteRegex.Replace(_uriFormat, delegate(Match m) {
+                Group startGroup = m.Groups[&quot;start&quot;];
+                Group propertyGroup = m.Groups[&quot;property&quot;];
+                Group formatGroup = m.Groups[&quot;format&quot;];
+                Group endGroup = m.Groups[&quot;end&quot;];
 
-                    if (String.CompareOrdinal(propertyGroup.Value, &quot;operation&quot;) == 0) {
-                        values.Add(operation);
-                    }
-                    else {
-                        values.Add(_parameters[propertyGroup.Value]);
-                    }
+                if (String.CompareOrdinal(propertyGroup.Value, &quot;operation&quot;) == 0) {
+                    values.Add(operation);
+                }
+                else if (_parameters != null) {
+                    values.Add(_parameters[propertyGroup.Value]);
+                }
 
-                    return new string('{', startGroup.Captures.Count) + (values.Count - 1) + formatGroup.Value + new string('}', endGroup.Captures.Count);
-                });
+                return new string('{', startGroup.Captures.Count) + (values.Count - 1) + formatGroup.Value + new string('}', endGroup.Captures.Count);
+            });
 
+            if (values.Count != 0) {
                 uriBuilder.AppendFormat(CultureInfo.InvariantCulture, rewrittenUriFormat, values.ToArray()); 
             }
             else {
-                uriBuilder.Append(_uriFormat);
-                if (_uriFormat.IndexOf('?') &lt; 0) {
-                    uriBuilder.Append(&quot;?&quot;);
-                }
+                uriBuilder.Append(rewrittenUriFormat);
+            }
+            if (rewrittenUriFormat.IndexOf('?') &lt; 0) {
+                uriBuilder.Append(&quot;?&quot;);
             }
 
             if (parameters != null) {</diff>
      <filename>DynamicRest/RestClient.cs</filename>
    </modified>
    <modified>
      <diff>@@ -14,6 +14,12 @@ namespace Application {
             // Amazon Sample
             // AmazonSample.Run();
 
+            // Live Search
+            // LiveSearchSample.Run();
+
+            // Google Search
+            // GoogleSearchSample.Run();
+
             // JSON Sample
             // JsonSample.Run();
         }</diff>
      <filename>Program.cs</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>ebe540c87124d187f76e405b9757802b16ae6d5c</id>
    </parent>
  </parents>
  <author>
    <name>NikhilK</name>
    <email>nikhilk@live.com</email>
  </author>
  <url>http://github.com/NikhilK/dynamicrest/commit/8d17c112c6fa98ac2c0096be5bd11ccbd83a6770</url>
  <id>8d17c112c6fa98ac2c0096be5bd11ccbd83a6770</id>
  <committed-date>2008-11-14T18:02:16-08:00</committed-date>
  <authored-date>2008-11-14T18:02:16-08:00</authored-date>
  <message>Live Search and Google Search samples</message>
  <tree>8b8568ac17b3c0d1fe18c0b563bba21ec77223d9</tree>
  <committer>
    <name>NikhilK</name>
    <email>nikhilk@live.com</email>
  </committer>
</commit>
