Redesigned hooks system (moving from CMS_RESPONSE to CMS_API).

Indeed, hooks does not require RESPONSE interface, and should be setup before, at the system level (i.e CMS_API) Added exportation solution via CMS_HOOK_EXPORT. Updated blocks settings for demo example project.
Fixed list item computation for ini file, especially with included ini file.
2015-11-09 21:07:02 +01:00 · 2015-11-02 21:07:26 +01:00 · 2015-11-02 18:54:30 +01:00 · 2015-11-02 18:10:27 +01:00 · 2015-11-02 14:38:36 +01:00 · 2015-11-02 14:33:14 +01:00
67 changed files with 2648 additions and 154 deletions
--- a/examples/demo/demo-safe.ecf
+++ b/examples/demo/demo-safe.ecf
@@ -26,11 +26,13 @@
 		<library name="cms_demo_module" location="modules\demo\cms_demo_module-safe.ecf" readonly="false"/>
 		<library name="cms_email_service" location="..\..\library\email\email-safe.ecf" readonly="false"/>
 		<library name="cms_feed_aggregator_module" location="..\..\modules\feed_aggregator\feed_aggregator-safe.ecf" readonly="false"/>
+		<library name="cms_google_search_module" location="..\..\modules\google_search\google_search-safe.ecf" readonly="false" use_application_options="true"/>
 		<library name="cms_model" location="..\..\library\model\cms_model-safe.ecf" readonly="false"/>
 		<library name="cms_node_module" location="..\..\modules\node\node-safe.ecf" readonly="false"/>
 		<library name="cms_oauth_20_module" location="..\..\modules\oauth20\oauth20-safe.ecf" readonly="false"/>
 		<library name="cms_openid_module" location="..\..\modules\openid\openid-safe.ecf" readonly="false"/>
 		<library name="cms_recent_changes_module" location="..\..\modules\recent_changes\recent_changes-safe.ecf" readonly="false"/>
+		
 		<library name="persistence_sqlite3" location="..\..\library\persistence\sqlite3\sqlite3-safe.ecf" readonly="false">
 			<option>
 				<assertions/>
--- a/examples/demo/install_modules.bat
+++ b/examples/demo/install_modules.bat
@@ -11,3 +11,4 @@ set ROC_CMS_DIR=%~dp0
 %ROC_CMD% install --module ..\..\modules\openid	--dir %ROC_CMS_DIR%
 %ROC_CMD% install --module ..\..\modules\recent_changes	--dir %ROC_CMS_DIR%
 %ROC_CMD% install --module ..\..\modules\feed_aggregator	--dir %ROC_CMS_DIR%
+%ROC_CMD% install --module ..\..\modules\google_search	--dir %ROC_CMS_DIR%
--- a/examples/demo/modules/demo/cms_demo_module.e
+++ b/examples/demo/modules/demo/cms_demo_module.e
@@ -10,7 +10,7 @@ class
 inherit
 	CMS_MODULE
 		redefine
-			register_hooks,
+			setup_hooks,
 			initialize,
 			install
 		end
@@ -85,10 +85,10 @@ feature -- Access: router

 feature -- Hooks

-	register_hooks (a_response: CMS_RESPONSE)
+	setup_hooks (a_hooks: CMS_HOOK_CORE_MANAGER)
 		do
-			a_response.hooks.subscribe_to_menu_system_alter_hook (Current)
-			a_response.hooks.subscribe_to_block_hook (Current)
+			a_hooks.subscribe_to_menu_system_alter_hook (Current)
+			a_hooks.subscribe_to_block_hook (Current)
 		end

 	block_list: ITERABLE [like {CMS_BLOCK}.name]
--- a/examples/demo/site/config/blocks.ini
+++ b/examples/demo/site/config/blocks.ini
@@ -9,30 +9,17 @@ management.conditions[]=is_front
 feed.news.weight=3
 feed.news.region=feed_news
 feed.news.region=content
-feed.news.condition=<none>
+feed.news.condition=is_front
+
 feed.forum.weight=2
 feed.forum.region=feed_forum
-feed.forum.region=<none>
-feed.forum.condition=<none>
-feed.forum.options[size]=15
+feed.forum.region=content
+feed.forum.condition=is_front
+feed.forum.options[size]=5

 #Updates
 recent_changes.region=content
 recent_changes.condition=is_front
 recent_changes.title=Updates
-recent_changes.options[size]=3
-
-#Aliases
-&aliases[foo]=management
-&aliases[bar]=feed.forum
-
-foo.region=content
-foo.condition=is_front
-foo.weight=-10
-
-bar.region=content
-bar.condition=is_front
-bar.title=Bar
-
-
+recent_changes.options[size]=4

--- a/examples/demo/site/modules/google_search/config/google_search.json
+++ b/examples/demo/site/modules/google_search/config/google_search.json
@@ -0,0 +1,6 @@
+{
+    "gcse": {
+     		"cx":"",
+     		"secret_key":""
+     }	
+}
--- a/examples/demo/site/modules/google_search/templates/block_search.tpl
+++ b/examples/demo/site/modules/google_search/templates/block_search.tpl
@@ -0,0 +1,40 @@
+<section>
+  <header>
+    <h2>Results for <kbd>{$result.current_page.search_terms/}</kbd></h2>
+  </header>
+  
+  <!-- list of results -->
+  <ol start="{$result.current_page.start_index/}">
+  
+    <!-- Item result -->
+    {foreach from="$result.items" item="item"}
+    <li>
+      <article>
+        <header>
+          <h3>
+            <cite>
+              <a href="{$item.link/}">{$item.title/}</a>
+            </cite>
+          </h3>
+        </header>
+        <blockquote cite="{$item.link/}">
+          <p>{$item.html_snippet/}</p>
+          <footer>
+            <p><abbr title="Uniform Resource Locator">Source</abbr> <a href="{$item.link/}">{$item.display_link/}</a></p>
+          </footer>
+        </blockquote>
+      </article>
+    </li>
+    {/foreach} 
+
+    
+  </ol>  
+  <ul class="cms-page-links">
+      {if isset="$result.previous_page"}
+        <li><a href="{$site_url/}gcse/?q={$result.previous_page.search_terms/}&amp;start={$result.previous_page.start_index/}&amp;num={$result.previous_page.count/}">Previous</a></li>
+      {/if}
+      {if isset="$result.next_page"}
+        <li><a href="{$site_url/}gcse/?q={$result.next_page.search_terms/}&amp;start={$result.next_page.start_index/}&amp;num={$result.next_page.count/}">Next</a></li>
+      {/if}
+  </ul>
+</section>
--- a/examples/demo/site/themes/bootstrap/assets/js/popup_search.js
+++ b/examples/demo/site/themes/bootstrap/assets/js/popup_search.js
@@ -0,0 +1,8 @@
+     $(document).ready(function() {
+       $('#gcse_search_form').submit(function() {
+           window.open('', 'formpopup', 'width=600,height=600,resizeable,scrollbars');
+           this.target = 'formpopup';
+       });
+   });
+
+
--- a/examples/demo/site/themes/bootstrap/page.tpl
+++ b/examples/demo/site/themes/bootstrap/page.tpl
@@ -5,9 +5,10 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<!-- EWF CMS -->
 	<link rel="stylesheet" href="{$site_url/}theme/css/style.css">
-
+ 
 	<!-- jQuery dep -->
 	<script src="{$site_url/}theme/js/jquery-1.10.2.min.js"></script>
+	<script src="{$site_url/}theme/js/popup_search.js"></script>

 {if isset="$head"}{$head/}{/if}
 {if isset="$styles"}{$styles/}{/if}
@@ -36,7 +37,17 @@
          {$page.primary_nav/}
      {/if}
    </div> 
-    
+	<!-- Page search -->
+	<div class="row">
+		<div class="col-md-2 col-md-offset-9">
+			<form action="{$site_url/}gcse" class="search-form" id="gcse_search_form">
+				<div class="form-group has-feedback">
+					<input type="search" class="form-control" name="q" id="gcse_search" placeholder="search">
+					<span class="glyphicon glyphicon-search form-control-feedback"></span>
+				</div>
+			</form>
+		</div>
+	</div>
    <!-- General Page Content -->
    <div id='content' class='row-fluid'>
 		<!-- Left Sidebar sidebar_first -->
--- a/examples/demo/src/demo_cms_execution.e
+++ b/examples/demo/src/demo_cms_execution.e
@@ -82,6 +82,9 @@ feature -- CMS modules

 			create {CMS_DEMO_MODULE} m.make
 			a_setup.register_module (m)
+
+			create {GOOGLE_CUSTOM_SEARCH_MODULE} m.make
+			a_setup.register_module (m)
 		end

 end
--- a/library/configuration/src/ini_config.e
+++ b/library/configuration/src/ini_config.e
@@ -442,7 +442,17 @@ feature {NONE} -- Implementation
 							j := k.index_of (']', i + 1)
 							if j = i + 1 then -- ends_with "[]"
 								k.keep_head (i - 1)
-								if attached {LIST [STRING_8]} items.item (k) as l_list then
+								if 
+									a_section_prefix /= Void and then
+									attached {LIST [STRING_8]} items.item (a_section_prefix + {STRING_32} "." + k) as l_list
+								then
+									lst := l_list
+								elseif 
+									attached last_section_name as l_section_prefix and then
+									attached {LIST [STRING_8]} items.item (l_section_prefix + {STRING_32} "." + k) as l_list
+								then
+									lst := l_list
+								elseif attached {LIST [STRING_8]} items.item (k) as l_list then
 									lst := l_list
 								else
 									create {ARRAYED_LIST [STRING_8]} lst.make (1)
@@ -456,7 +466,17 @@ feature {NONE} -- Implementation
 								sk.left_adjust
 								sk.right_adjust
 								k.keep_head (i - 1)
-								if attached {STRING_TABLE [STRING_8]} items.item (k) as l_table then
+								if 
+									a_section_prefix /= Void and then
+									attached {STRING_TABLE [STRING_8]} items.item (a_section_prefix + {STRING_32} "." + k) as l_table
+								then
+									tb := l_table
+								elseif 
+									attached last_section_name as l_section_prefix and then
+									attached {STRING_TABLE [STRING_8]} items.item (l_section_prefix + {STRING_32} "." + k) as l_table
+								then
+									tb := l_table
+								elseif attached {STRING_TABLE [STRING_8]} items.item (k) as l_table then
 									tb := l_table
 								else
 									create tb.make (1)
--- a/library/gcse/Readme.md
+++ b/library/gcse/Readme.md
@@ -0,0 +1,4 @@
+Google Custom Search Engine Eiffel Lbrary
+
+Based on https://developers.google.com/custom-search/json-api/v1/using_rest
+
--- a/library/gcse/gcse-safe.ecf
+++ b/library/gcse/gcse-safe.ecf
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-14-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-14-0 http://www.eiffel.com/developers/xml/configuration-1-14-0.xsd" name="gcse" uuid="81645CEF-4651-45CF-A890-B126E4A6D78C" library_target="gcse">
+	<target name="gcse">
+		<root all_classes="true"/>
+		<file_rule>
+			<exclude>/.git$</exclude>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/.svn$</exclude>
+		</file_rule>
+		<option warning="true" void_safety="all">
+			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
+		</option>
+		<setting name="console_application" value="true"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="http_client_extension" location="..\http_client_extension\http_client_extension-safe.ecf" readonly="false"/>
+		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json-safe.ecf" readonly="false"/>
+		<library name="wsf_encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder-safe.ecf"/>
+		<cluster name="gcse" location=".\src\" recursive="true"/>
+	</target>
+</system>
--- a/library/gcse/gcse.ecf
+++ b/library/gcse/gcse.ecf
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-14-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-14-0 http://www.eiffel.com/developers/xml/configuration-1-14-0.xsd" name="gcse" uuid="81645CEF-4651-45CF-A890-B126E4A6D78C" library_target="gcse">
+	<target name="gcse">
+		<root all_classes="true"/>
+		<file_rule>
+			<exclude>/.git$</exclude>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/.svn$</exclude>
+		</file_rule>
+		<option warning="true" void_safety="none">
+			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
+		</option>
+		<setting name="console_application" value="true"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
+		<library name="http_client_extension" location="..\http_client_extension\http_client_extension.ecf" readonly="false"/>
+		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json.ecf" readonly="false"/>
+		<library name="wsf_encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder.ecf"/>
+		<cluster name="gcse" location=".\src\" recursive="true"/>
+	</target>
+</system>
--- a/library/gcse/license.lic
+++ b/library/gcse/license.lic
@@ -0,0 +1,10 @@
+${NOTE_KEYWORD}
+	copyright: "2011-${YEAR} Javier Velilla, Jocelyn Fiat, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+	source: "[
+			Eiffel Software
+			5949 Hollister Ave., Goleta, CA 93117 USA
+			Telephone 805-685-1006, Fax 805-685-6869
+			Website http://www.eiffel.com
+			Customer support http://support.eiffel.com
+		]"
--- a/library/gcse/src/gcse_api.e
+++ b/library/gcse/src/gcse_api.e
@@ -0,0 +1,236 @@
+note
+	description: "[
+		Simple API to call Google Custome Search Engine
+		Example call:
+		GET https://www.googleapis.com/customsearch/v1?key=INSERT_YOUR_API_KEY&cx=017576662512468239146:omuauf_lfve&q=lectures
+	]"
+	date: "$Date: 2015-10-09 08:11:07 -0300 (vi., 09 oct. 2015) $"
+	revision: "$Revision: 97973 $"
+	EIS: "name=Google Custom Search Engine", "src=https://developers.google.com/custom-search/json-api/v1/using_rest", "protocol=uri"
+
+class
+	GCSE_API
+
+create
+	make
+
+feature {NONE} -- Initialization
+
+	make (a_query_parameters: GCSE_QUERY_PARAMETERS)
+			-- Create an object GCSE with query_parameters `a_query_parameters'
+		do
+			query_parameter := a_query_parameters
+		ensure
+			query_parameters_set: query_parameter = a_query_parameters
+		end
+
+feature -- Access
+
+	base_uri: STRING_8 = "https://www.googleapis.com/customsearch/v1"
+			-- Google custom search base URI.
+
+	query_parameter: GCSE_QUERY_PARAMETERS
+			-- Google custom search parameters.
+
+	last_result: detachable GCSE_RESPONSE
+			-- Search results.
+
+feature -- Status Reports
+
+	errors: detachable LIST [READABLE_STRING_8]
+			-- optional list of error messages.
+
+feature -- API
+
+	search
+			-- Search
+		local
+			l_parser: JSON_PARSER
+			l_gcse_response: detachable GCSE_RESPONSE
+		do
+				-- Data format for the response.
+				-- At the moment we are using the default value: json
+				-- but it's possible to define atom response using the alt parameter.
+			last_result := Void
+			if attached get as l_response then
+				create l_gcse_response
+				l_gcse_response.set_status (l_response.status)
+				l_gcse_response.set_status_nessage (l_response.status_message)
+
+				if attached l_response.body as l_body then
+					create l_parser.make_with_string (l_body)
+					l_parser.parse_content
+					if l_response.status = 200 and then l_parser.is_parsed and then attached {JSON_OBJECT} l_parser.parsed_json_object as jv then
+							-- Queries
+						if attached {JSON_OBJECT} jv.item (queries_key) as jqueries then
+								-- Next Page
+							if attached {GCSE_PAGE} query_page (next_page_key, jqueries) as l_page then
+								l_gcse_response.set_next_page (l_page)
+							end
+								-- Current Page
+							if attached {GCSE_PAGE} query_page (request_key, jqueries) as l_page then
+								l_gcse_response.set_current_page (l_page)
+							end
+								-- Previous Page
+							if attached {GCSE_PAGE} query_page (previous_page_key, jqueries) as l_page then
+								l_gcse_response.set_previous_page (l_page)
+							end
+						end
+						if attached {JSON_ARRAY} jv.item (items_key) as jitems then
+							across jitems as ic loop
+								if attached{JSON_OBJECT} ic.item as j_item  then
+									l_gcse_response.add_item (item (j_item))
+								end
+							end
+						end
+					else
+						put_error (l_body)
+					end
+				else
+					put_error (l_response.status.out)
+				end
+			else
+				put_error ("unknown")
+			end
+			last_result := l_gcse_response
+		end
+
+feature {NONE} -- REST API
+
+	get: detachable RESPONSE
+			-- Reading Data.
+		local
+			l_request: REQUEST
+		do
+			create l_request.make ("GET", new_uri)
+			Result := l_request.execute
+		end
+
+feature {NONE} -- Implementation
+
+	new_uri: STRING_8
+			-- new uri (BaseUri?key=secret_value&cx=a_cx_id&q=a_query
+			-- ?key=INSERT_YOUR_API_KEY&cx=017576662512468239146:omuauf_lfve&q=lectures
+			-- full template BaseUri?q={searchTerms}&num={count?}&start={startIndex?}&lr={language?}&
+			-- safe={safe?}&cx={cx?}&cref={cref?}&sort={sort?}&filter={filter?}&gl={gl?}&cr={cr?}&
+			-- googlehost={googleHost?}&c2coff={disableCnTwTranslation?}&hq={hq?}&hl={hl?}&siteSearch={siteSearch?}&
+			-- siteSearchFilter={siteSearchFilter?}&exactTerms={exactTerms?}&excludeTerms={excludeTerms?}&linkSite={linkSite?}&
+			-- orTerms={orTerms?}&relatedSite={relatedSite?}&dateRestrict={dateRestrict?}&lowRange={lowRange?}&highRange={highRange?}&
+			-- searchType={searchType}&fileType={fileType?}&rights={rights?}&imgSize={imgSize?}&imgType={imgType?}&
+			-- imgColorType={imgColorType?}&imgDominantColor={imgDominantColor?}&alt=json"
+
+		do
+			create Result.make_from_string (base_uri)
+			Result.append ("?key=")
+			Result.append (query_parameter.secret)
+			Result.append ("&cx=")
+			Result.append (query_parameter.cx)
+			Result.append ("&q=")
+			Result.append (query_parameter.query)
+				-- num
+			if attached query_parameter.num as l_num then
+				Result.append ("&num=")
+				Result.append (l_num)
+			end
+			if attached query_parameter.start as l_start then
+				Result.append ("&start=")
+				Result.append (l_start)
+			end
+		end
+
+	put_error (a_message: READABLE_STRING_GENERAL)
+			-- put error message `a_message'.
+		local
+			l_errors: like errors
+			utf: UTF_CONVERTER
+		do
+			l_errors := errors
+			if l_errors = Void then
+				create {ARRAYED_LIST [STRING]} l_errors.make (1)
+				errors := l_errors
+			end
+			l_errors.force (utf.utf_32_string_to_utf_8_string_8 (a_message))
+		end
+
+	item (a_item: JSON_OBJECT): GCSE_PAGE_ITEM
+			-- Google Result Metadata Item.
+		do
+			create Result
+			if attached {JSON_STRING} a_item.item ("kind") as l_kind then
+				Result.set_kind (l_kind.item)
+			end
+			if attached {JSON_STRING} a_item.item ("title") as l_title then
+				Result.set_title (l_title.item)
+			end
+			if attached {JSON_STRING} a_item.item ("htmlTitle") as l_htmltitle then
+				Result.set_html_title (l_htmltitle.unescaped_string_32)
+			end
+			if attached {JSON_STRING} a_item.item ("link") as l_link then
+				Result.set_link (l_link.item)
+			end
+			if attached {JSON_STRING} a_item.item ("displayLink") as l_display_link then
+				Result.set_display_link (l_display_link.item)
+			end
+			if attached {JSON_STRING} a_item.item ("snippet") as l_snippet then
+				Result.set_snippet (l_snippet.unescaped_string_8)
+			end
+			if attached {JSON_STRING} a_item.item ("htmlSnippet") as l_html_snippet then
+				Result.set_html_snippet (l_html_snippet.unescaped_string_32)
+			end
+			if attached {JSON_STRING} a_item.item ("formattedUrl") as l_formatted_url then
+				Result.set_formatted_url (l_formatted_url.item)
+			end
+		end
+
+	query_page (a_page_key: JSON_STRING; a_queries: JSON_OBJECT): detachable GCSE_PAGE
+			-- Google result medata query. Return a query page based for a query with page key `a_page_key', if any.
+		do
+			if
+				attached {JSON_ARRAY} a_queries.item (a_page_key) as jquerypage and then
+				jquerypage.count > 0 and then
+				attached {JSON_OBJECT} jquerypage.i_th (1) as jpage
+			then
+				create Result
+				if attached {JSON_STRING} jpage.item ("title") as l_title then
+					Result.set_title (l_title.item)
+				end
+				if attached {JSON_STRING} jpage.item ("totalResults") as l_results then
+					Result.set_total_results (l_results.item.to_integer)
+				end
+				if attached {JSON_STRING} jpage.item ("searchTerms") as l_search_terms then
+					Result.set_search_terms (l_search_terms.item)
+				end
+					-- TODO check if we should use INTEGER_64
+				if attached {JSON_NUMBER} jpage.item ("count") as l_count then
+					Result.set_count (l_count.integer_64_item.as_integer_32)
+				end
+				if attached {JSON_NUMBER} jpage.item ("startIndex") as l_index then
+					Result.set_start_index (l_index.integer_64_item.as_integer_32)
+				end
+			end
+		end
+
+feature {NONE} -- JSON Keys
+
+	queries_key: STRING = "queries"
+
+	next_page_key: STRING = "nextPage"
+
+	request_key: STRING = "request"
+
+	previous_page_key: STRING = "previousPage"
+
+	items_key: STRING = "items"
+
+note
+	copyright: "2011-2015 Javier Velilla, Jocelyn Fiat, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+	source: "[
+			Eiffel Software
+			5949 Hollister Ave., Goleta, CA 93117 USA
+			Telephone 805-685-1006, Fax 805-685-6869
+			Website http://www.eiffel.com
+			Customer support http://support.eiffel.com
+		]"
+
+end
--- a/library/gcse/src/gcse_page.e
+++ b/library/gcse/src/gcse_page.e
@@ -0,0 +1,118 @@
+note
+	description: "Represent metadata describing the query for the current set of results."
+	date: "$Date: 2015-10-09 08:11:07 -0300 (vi., 09 oct. 2015) $"
+	revision: "$Revision: 97973 $"
+
+class
+	GCSE_PAGE
+
+inherit
+
+	DEBUG_OUTPUT
+
+feature -- Access
+
+	search_terms: detachable STRING_8
+			-- search term
+
+	title: detachable STRING_8
+			-- Search title.
+
+	total_results: INTEGER
+			-- Search total results.
+
+	count: INTEGER
+			-- Rows per page.
+
+	start_index: INTEGER
+			-- Page index.
+
+feature -- Element change
+
+	set_search_terms (a_search_terms: like search_terms)
+			-- Assign `search_terms' with `a_search_terms'.
+		do
+			search_terms := a_search_terms
+		ensure
+			search_terms_assigned: search_terms = a_search_terms
+		end
+
+feature -- Change element
+
+	set_title (a_title: like title)
+			-- Set title with `a_title'
+		do
+			title := a_title
+		ensure
+			title_set: title = a_title
+		end
+
+	set_total_results (a_total_results: like total_results)
+			-- Set total_results with `a_total_results'.
+		do
+			total_results := a_total_results
+		ensure
+			total_results_set: total_results = a_total_results
+		end
+
+	set_count (a_count: like count)
+			-- Set count with `a_count'.
+		do
+			count := a_count
+		ensure
+			count_set: count = a_count
+		end
+
+	set_start_index (a_start_index: like start_index)
+			-- Set start_index with `a_start_index'.
+		do
+			start_index := a_start_index
+		ensure
+			start_index_set: start_index = a_start_index
+		end
+
+feature -- Status report
+
+		debug_output: STRING_8
+				-- <Precursor>
+			do
+				create Result.make_from_string ("%NPage details%N")
+				if attached title as l_title then
+					Result.append ("Title:")
+					Result.append (l_title)
+					Result.append_character ('%N')
+				end
+				if attached search_terms as l_search_tearm then
+					Result.append ("Search Tearm:")
+					Result.append (l_search_tearm)
+					Result.append_character ('%N')
+				end
+
+				Result.append ("Count:")
+				Result.append (count.out)
+				Result.append_character ('%N')
+				Result.append ("Total Result:")
+				Result.append (count.out)
+				Result.append_character ('%N')
+				Result.append ("Count:")
+				Result.append (total_results.out)
+				Result.append_character ('%N')
+				Result.append ("Start index:")
+				Result.append (start_index.out)
+				Result.append_character ('%N')
+
+			end
+
+
+note
+	copyright: "2011-2015 Javier Velilla, Jocelyn Fiat, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+	source: "[
+			Eiffel Software
+			5949 Hollister Ave., Goleta, CA 93117 USA
+			Telephone 805-685-1006, Fax 805-685-6869
+			Website http://www.eiffel.com
+			Customer support http://support.eiffel.com
+		]"
+
+end
--- a/library/gcse/src/gcse_page_item.e
+++ b/library/gcse/src/gcse_page_item.e
@@ -0,0 +1,209 @@
+note
+	description: "Represent a search result, include the URL, title and text snippets that describe the result"
+	date: "$Date: 2015-10-09 08:11:07 -0300 (vi., 09 oct. 2015) $"
+	revision: "$Revision: 97973 $"
+
+class
+	GCSE_PAGE_ITEM
+
+inherit
+
+	DEBUG_OUTPUT
+
+feature -- Access
+
+	html_formatted_url: detachable STRING_8
+			-- Html formatted url of this result
+
+	formatted_url: detachable STRING_8
+			-- Formatted url of this result
+
+	cache_id: detachable STRING_8
+			-- Cache id of this result
+
+	html_snippet: detachable STRING_8
+			-- Html snippet of this request
+
+	snippet: detachable STRING_8
+			-- Snippet of this result
+
+	display_link: detachable STRING_8
+			-- Display link of this result
+
+	link: detachable STRING_8
+			-- link of this result
+
+	html_title: detachable STRING_8
+			-- html title of result
+
+	title: detachable STRING_8
+			-- title of result.
+
+	kind: detachable STRING_8
+			-- Kind of actual search result.
+
+	page_map: detachable GCSE_PAGE_MAP
+			-- Page map
+			--! Not supported for now.
+
+feature -- Element change
+
+	set_html_formatted_url (a_html_formatted_url: like html_formatted_url)
+			-- Assign `html_formatted_url' with `a_html_formatted_url'.
+		do
+			html_formatted_url := a_html_formatted_url
+		ensure
+			html_formatted_url_assigned: html_formatted_url = a_html_formatted_url
+		end
+
+	set_formatted_url (a_formatted_url: like formatted_url)
+			-- Assign `formatted_url' with `a_formatted_url'.
+		do
+			formatted_url := a_formatted_url
+		ensure
+			formatted_url_assigned: formatted_url = a_formatted_url
+		end
+
+	set_cache_id (a_cache_id: like cache_id)
+			-- Assign `cache_id' with `a_cache_id'.
+		do
+			cache_id := a_cache_id
+		ensure
+			cache_id_assigned: cache_id = a_cache_id
+		end
+
+	set_html_snippet (a_html_snippet: like html_snippet)
+			-- Assign `html_snippet' with `a_html_snippet'.
+		do
+			html_snippet := a_html_snippet
+		ensure
+			html_snippet_assigned: html_snippet = a_html_snippet
+		end
+
+	set_snippet (a_snippet: like snippet)
+			-- Assign `snippet' with `a_snippet'.
+		do
+			snippet := a_snippet
+		ensure
+			snippet_assigned: snippet = a_snippet
+		end
+
+	set_display_link (a_display_link: like display_link)
+			-- Assign `display_link' with `a_display_link'.
+		do
+			display_link := a_display_link
+		ensure
+			display_link_assigned: display_link = a_display_link
+		end
+
+	set_link (a_link: like link)
+			-- Assign `link' with `a_link'.
+		do
+			link := a_link
+		ensure
+			link_assigned: link = a_link
+		end
+
+	set_html_title (a_html_title: like html_title)
+			-- Assign `html_title' with `a_html_title'.
+		do
+			html_title := a_html_title
+		ensure
+			html_title_assigned: html_title = a_html_title
+		end
+
+	set_title (a_title: like title)
+			-- Assign `title' with `a_title'.
+		do
+			title := a_title
+		ensure
+			title_assigned: title = a_title
+		end
+
+	set_kind (a_kind: like kind)
+			-- Assign `kind' with `a_kind'.
+		do
+			kind := a_kind
+		ensure
+			kind_assigned: kind = a_kind
+		end
+
+	set_page_map (a_map: like page_map)
+			-- Assign `kind' with `a_kind'.
+		do
+			page_map := a_map
+		ensure
+			page_map_assigned: page_map = a_map
+		end
+
+
+feature -- Output
+
+		debug_output: STRING_8
+				-- <Precursor>
+			do
+				create Result.make_from_string ("%NPage Item details%N")
+				if attached title as l_title then
+					Result.append ("Title:")
+					Result.append (l_title)
+					Result.append_character ('%N')
+				end
+				if attached kind as l_kind then
+					Result.append ("Kind:")
+					Result.append (l_kind)
+					Result.append_character ('%N')
+				end
+				if attached html_title as l_html_title then
+					Result.append ("Html title:")
+					Result.append (l_html_title)
+					Result.append_character ('%N')
+				end
+				if attached link as l_link then
+					Result.append ("Link:")
+					Result.append (l_link)
+					Result.append_character ('%N')
+				end
+				if attached display_link as l_display_link then
+					Result.append ("Display link:")
+					Result.append (l_display_link)
+					Result.append_character ('%N')
+				end
+				if attached snippet as l_snippet then
+					Result.append ("Snippet:")
+					Result.append (l_snippet)
+					Result.append_character ('%N')
+				end
+				if attached html_snippet as l_html_snippet then
+					Result.append ("Html snippet:")
+					Result.append (l_html_snippet)
+					Result.append_character ('%N')
+				end
+				if attached cache_id as l_cache_id then
+					Result.append ("Cache_id:")
+					Result.append (l_cache_id)
+					Result.append_character ('%N')
+				end
+				if attached formatted_url as l_formatted_url then
+					Result.append ("Formatted url:")
+					Result.append (l_formatted_url)
+					Result.append_character ('%N')
+				end
+				if attached html_formatted_url as l_html_formatted_url then
+					Result.append ("Html formatted url:")
+					Result.append (l_html_formatted_url)
+					Result.append_character ('%N')
+				end
+
+			end
+
+note
+	copyright: "2011-2015 Javier Velilla, Jocelyn Fiat, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+	source: "[
+			Eiffel Software
+			5949 Hollister Ave., Goleta, CA 93117 USA
+			Telephone 805-685-1006, Fax 805-685-6869
+			Website http://www.eiffel.com
+			Customer support http://support.eiffel.com
+		]"
+end
--- a/library/gcse/src/gcse_page_map.e
+++ b/library/gcse/src/gcse_page_map.e
@@ -0,0 +1,41 @@
+note
+	description: "[
+		Represent a google page map
+			"pagemap": {
+		    "cse_image": [
+		     {
+		      "src": "https://www.eiffel.org/portal/files/userpictures/picture-40.jpg"
+		     }
+		    ],
+		    "cse_thumbnail": [
+		     {
+		      "width": "81",
+		      "height": "61",
+		      "src": "https://encrypted-tbn2.gstatic.com/images?q=tbn:ANd9GcRnC-RKzps6BFItx_MLYBVskFI7U6u0y3VJBInomPYEF5sO6gkip94mLw"
+		     }
+		    ]
+		   }		
+	]"
+	date: "$Date: 2015-10-09 08:11:07 -0300 (vi., 09 oct. 2015) $"
+	revision: "$Revision: 97973 $"
+	EIS: "name=PageMaps", "src=https://developers.google.com/custom-search/docs/structured_data#pagemaps", "protocol=url"
+
+class
+	GCSE_PAGE_MAP
+
+feature -- Access
+
+
+
+
+note
+	copyright: "2011-2015 Javier Velilla, Jocelyn Fiat, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+	source: "[
+			Eiffel Software
+			5949 Hollister Ave., Goleta, CA 93117 USA
+			Telephone 805-685-1006, Fax 805-685-6869
+			Website http://www.eiffel.com
+			Customer support http://support.eiffel.com
+		]"
+end
--- a/library/gcse/src/gcse_query_parameters.e
+++ b/library/gcse/src/gcse_query_parameters.e
@@ -0,0 +1,238 @@
+note
+	description: "[
+		Represent google custom search parameters
+		Example url template
+		  "template": "https://www.googleapis.com/customsearch/v1?q={searchTerms}&num={count?}&start={startIndex?}&lr={language?}&safe={safe?}&cx={cx?}&cref={cref?}&sort={sort?}&filter={filter?}&gl={gl?}&cr={cr?}&googlehost={googleHost?}&c2coff={disableCnTwTranslation?}&hq={hq?}&hl={hl?}&siteSearch={siteSearch?}&siteSearchFilter={siteSearchFilter?}&exactTerms={exactTerms?}&excludeTerms={excludeTerms?}&linkSite={linkSite?}&orTerms={orTerms?}&relatedSite={relatedSite?}&dateRestrict={dateRestrict?}&lowRange={lowRange?}&highRange={highRange?}&searchType={searchType}&fileType={fileType?}&rights={rights?}&imgSize={imgSize?}&imgType={imgType?}&imgColorType={imgColorType?}&imgDominantColor={imgDominantColor?}&alt=json"
+	]"
+	optional_parameters: "[
+			Optional parameters
+			c2coff	string	Enables or disables Simplified and Traditional Chinese Search.
+					The default value for this parameter is 0 (zero), meaning that the feature is enabled. Supported values are:
+					1: Disabled
+					0: Enabled (default)
+			cr	string	Restricts search results to documents originating in a particular country.
+					You may use Boolean operators in the cr parameter's value.
+					Google Search determines the country of a document by analyzing:
+					the top-level domain (TLD) of the document's URL
+					the geographic location of the Web server's IP address
+					See the Country Parameter Values page for a list of valid values for this parameter.
+			cref	string	The URL of a linked custom search engine specification to use for this request.
+					Does not apply for Google Site Search
+					If both cx and cref are specified, the cx value is used
+			cx	string	The custom search engine ID to use for this request.
+					If both cx and cref are specified, the cx value is used.
+			dateRestrict	string	Restricts results to URLs based on date. Supported values include:
+					d[number]: requests results from the specified number of past days.
+					w[number]: requests results from the specified number of past weeks.
+					m[number]: requests results from the specified number of past months.
+					y[number]: requests results from the specified number of past years.
+			exactTerms	string	Identifies a phrase that all documents in the search results must contain.
+			excludeTerms	string	Identifies a word or phrase that should not appear in any documents in the search results.
+			fileType	string	Restricts results to files of a specified extension. A list of file types indexable by Google can be found in Webmaster Tools Help Center.
+			filter	string	Controls turning on or off the duplicate content filter.
+					See Automatic Filtering for more information about Google's search results filters. Note that host crowding filtering applies only to multi-site searches.
+					By default, Google applies filtering to all search results to improve the quality of those results.
+
+
+					Acceptable values are:
+					"0": Turns off duplicate content filter.
+					"1": Turns on duplicate content filter.
+					gl	string	Geolocation of end user.
+			The gl parameter value is a two-letter country code. The gl parameter boosts search results whose country of origin matches the parameter value. See the Country Codes page for a list of valid values.
+			Specifying a gl parameter value should lead to more relevant results. This is particularly true for international customers and, even more specifically, for customers in English- speaking countries other than the United States.
+			googlehost	string	The local Google domain (for example, google.com, google.de, or google.fr) to use to perform the search.
+			highRange	string
+			Specifies the ending value for a search range.
+			Use lowRange and highRange to append an inclusive search range of lowRange...highRange  to the query.
+			hl	string	Sets the user interface language.
+			Explicitly setting this parameter improves the performance and the quality of your search results.
+			See the Interface Languages section of Internationalizing Queries and Results Presentation for more information, and Supported Interface Languages for a list of supported languages.
+			hq	string	Appends the specified query terms to the query, as if they were combined with a logical AND operator.
+			imgColorType	string	Returns black and white, grayscale, or color images: mono, gray, and color.
+
+					Acceptable values are:
+					"color": color
+					"gray": gray
+					"mono": mono
+			imgDominantColor	string	Returns images of a specific dominant color.
+
+					Acceptable values are:
+					"black": black
+					"blue": blue
+					"brown": brown
+					"gray": gray
+					"green": green
+					"pink": pink
+					"purple": purple
+					"teal": teal
+					"white": white
+					"yellow": yellow
+			imgSize	string	Returns images of a specified size.
+
+					Acceptable values are:
+					"huge": huge
+					"icon": icon
+					"large": large
+					"medium": medium
+					"small": small
+					"xlarge": xlarge
+					"xxlarge": xxlarge
+			imgType	string	Returns images of a type.
+
+					Acceptable values are:
+					"clipart": clipart
+					"face": face
+					"lineart": lineart
+					"news": news
+					"photo": photo
+			linkSite	string	Specifies that all search results should contain a link to a particular URL
+			lowRange	string	Specifies the starting value for a search range.
+			Use lowRange and highRange to append an inclusive search range of lowRange...highRange to the query.
+			lr	string	Restricts the search to documents written in a particular language (e.g., lr=lang_ja).
+
+					Acceptable values are:
+					"lang_ar": Arabic
+					"lang_bg": Bulgarian
+					"lang_ca": Catalan
+					"lang_cs": Czech
+					"lang_da": Danish
+					"lang_de": German
+					"lang_el": Greek
+					"lang_en": English
+					"lang_es": Spanish
+					"lang_et": Estonian
+					"lang_fi": Finnish
+					"lang_fr": French
+					"lang_hr": Croatian
+					"lang_hu": Hungarian
+					"lang_id": Indonesian
+					"lang_is": Icelandic
+					"lang_it": Italian
+					"lang_iw": Hebrew
+					"lang_ja": Japanese
+					"lang_ko": Korean
+					"lang_lt": Lithuanian
+					"lang_lv": Latvian
+					"lang_nl": Dutch
+					"lang_no": Norwegian
+					"lang_pl": Polish
+					"lang_pt": Portuguese
+					"lang_ro": Romanian
+					"lang_ru": Russian
+					"lang_sk": Slovak
+					"lang_sl": Slovenian
+					"lang_sr": Serbian
+					"lang_sv": Swedish
+					"lang_tr": Turkish
+					"lang_zh-CN": Chinese (Simplified)
+					"lang_zh-TW": Chinese (Traditional)
+
+			orTerms	string	Provides additional search terms to check for in a document, where each document in the search results must contain at least one of the additional search terms.
+			relatedSite	string	Specifies that all search results should be pages that are related to the specified URL.
+			rights	string	Filters based on licensing. Supported values include: cc_publicdomain, cc_attribute, cc_sharealike, cc_noncommercial, cc_nonderived, and combinations of these.
+			safe	string	Search safety level.
+
+					Acceptable values are:
+					"high": Enables highest level of SafeSearch filtering.
+					"medium": Enables moderate SafeSearch filtering.
+					"off": Disables SafeSearch filtering. (default)
+			searchType	string	Specifies the search type: image.  If unspecified, results are limited to webpages.
+
+			Acceptable values are:
+					"image": custom image search.
+			siteSearch	string	Specifies all search results should be pages from a given site.
+			siteSearchFilter	string	Controls whether to include or exclude results from the site named in the siteSearch parameter.
+
+					Acceptable values are:
+					"e": exclude
+					"i": include
+					sort	string	The sort expression to apply to the results.
+]"
+	date: "$Date: 2015-10-08 07:51:29 -0300 (ju., 08 oct. 2015) $"
+	revision: "$Revision: 97966 $"
+	EIS: "GCSE parameters", "src=https://developers.google.com/custom-search/json-api/v1/reference/cse/list", "protocol=URI"
+
+class
+	GCSE_QUERY_PARAMETERS
+
+create
+	make
+
+feature {NONE} -- Initialization
+
+	make (a_secret_key,  a_cx, a_query: READABLE_STRING_8)
+			-- Create an object GCSE_QUERY_PARAMETERS with secret key `a_secret_key' and a custom search engine id `a_cx'.
+			-- and query `a_query'.
+		do
+				-- TODO
+				-- At the moment the API only use cx as Google Custom Search id.
+				-- Custom search engine ID - Use either cx or cref to specify the custom search engine you want to use to perform this search
+
+			secret := a_secret_key
+			cx := a_cx
+			query := a_query
+		ensure
+			secret_set: secret.same_string (a_secret_key)
+			cx_set: cx.same_string (a_cx)
+			query_set: query.same_string (a_query)
+		end
+
+feature -- Access : Required Parameters
+
+	secret: READABLE_STRING_8
+			-- Required. The shared key between your site and Google Custom Search Engine.
+
+	cx: READABLE_STRING_8
+			-- Custom search engine id to perform this search.
+
+	query: READABLE_STRING_8
+			-- Search query, query parameter to specify your search expression.
+
+feature -- Optional Parameters
+
+
+
+	num	: detachable STRING_8
+		-- Number of search results to return.
+		-- Valid values are integers between 1 and 10, inclusive.
+
+	start: detachable STRING_8
+			--	The index of the first result to return.
+
+
+feature -- Change Elements
+
+	set_num (a_num: READABLE_STRING_8)
+		require
+			is_number: a_num.is_integer
+			valid_range: a_num.to_integer >= 1 and then a_num.to_integer <= 10
+		do
+			num := a_num
+		ensure
+			num_set: num = a_num
+			valid_rage_set: attached num as l_num and then l_num.to_integer >= 1 and then l_num.to_integer <= 10
+		end
+
+
+	set_start (a_start: READABLE_STRING_8)
+		require
+			is_number: a_start.is_integer
+			valid_start: a_start.to_integer >= 1
+		do
+			start := a_start
+		ensure
+			start_set: start = a_start
+			valid_start_set: attached start as l_start and then l_start.to_integer >= 1
+		end
+
+note
+	copyright: "2011-2015 Javier Velilla, Jocelyn Fiat, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+	source: "[
+			Eiffel Software
+			5949 Hollister Ave., Goleta, CA 93117 USA
+			Telephone 805-685-1006, Fax 805-685-6869
+			Website http://www.eiffel.com
+			Customer support http://support.eiffel.com
+		]"
+end
--- a/library/gcse/src/gcse_response.e
+++ b/library/gcse/src/gcse_response.e
@@ -0,0 +1,115 @@
+note
+	description: "[
+		Represent search request metadata
+		URL: search template used for the current results.
+		Queries: current, next and previous page.
+		Context
+		Search infromation
+		Items: array of actual search results.
+	]"
+	date: "$Date: 2015-10-08 07:51:29 -0300 (ju., 08 oct. 2015) $"
+	revision: "$Revision: 97966 $"
+
+class
+	GCSE_RESPONSE
+
+	--! TODO
+	--! All suppport for for url, context and search information.
+
+feature -- Access
+
+	current_page: detachable GCSE_PAGE
+		-- Metadata describing the query for the current set of results.
+		--		This role is always present in the response.	
+		--		It is always an array with just one element.
+
+	next_page: detachable GCSE_PAGE
+		-- Metadata describing the query to use for the next page of results.
+		-- 		This role is not present if the current results are the last page. Note: This API returns up to the first 100 results only.
+		--		When present, it is always a array with just one element.
+
+	previous_page: detachable GCSE_PAGE
+		-- Metadata describing the query to use for the previous page of results.
+		--		Not present if the current results are the first page.
+		--		When present, it is always a array with just one element.
+
+	items: detachable LIST [GCSE_PAGE_ITEM]
+			-- Contains the actual search results. The search results include the URL, title and text snippets that describe the result.
+
+feature -- Change Element
+
+	set_current_page (a_page: GCSE_PAGE)
+			-- Set `current_page' with `a_page'.
+		do
+			current_page := a_page
+		ensure
+			current_page_set: current_page = a_page
+		end
+
+	set_next_page (a_page: GCSE_PAGE)
+			-- Set `next_page' with `a_page'.
+		do
+			next_page := a_page
+		ensure
+			next_page_set: next_page = a_page
+		end
+
+	set_previous_page (a_page: GCSE_PAGE)
+			-- Set `previous_page' with `a_page'.
+		do
+			previous_page := a_page
+		ensure
+			previous_page_set: previous_page = a_page
+		end
+
+	add_item (a_item: GCSE_PAGE_ITEM)
+			-- Add item `a_item' to the list of items.
+		local
+			l_items: like items
+		do
+			l_items := items
+			if l_items = Void then
+				create {ARRAYED_LIST[GCSE_PAGE_ITEM]}l_items.make (10)
+				items := l_items
+			end
+			l_items.force (a_item)
+		end
+
+
+feature -- Acess: HTTP Response
+
+	status: INTEGER
+		-- HTTP status code.
+
+	status_message: detachable READABLE_STRING_8
+		--  associated textual phrase for the response status.
+
+feature -- Change Element: HTTP Response
+
+	set_status (a_status: like status)
+			-- Set `status' with `a_status'.
+		do
+			status := a_status
+		ensure
+			status_set: status = a_status
+		end
+
+	set_status_nessage (a_message: like status_message)
+			-- Set `status_message' with `a_message'.
+		do
+			status_message := a_message
+		ensure
+			status_message_set: status_message = a_message
+		end
+
+;note
+	copyright: "2011-2015 Javier Velilla, Jocelyn Fiat, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+	source: "[
+			Eiffel Software
+			5949 Hollister Ave., Goleta, CA 93117 USA
+			Telephone 805-685-1006, Fax 805-685-6869
+			Website http://www.eiffel.com
+			Customer support http://support.eiffel.com
+		]"
+end
--- a/library/gcse/test/application.e
+++ b/library/gcse/test/application.e
@@ -0,0 +1,80 @@
+note
+	description : "test application root class"
+	date        : "$Date: 2015-10-08 07:51:29 -0300 (ju., 08 oct. 2015) $"
+	revision    : "$Revision: 97966 $"
+
+class
+	APPLICATION
+
+inherit
+	ARGUMENTS
+
+create
+	make
+
+feature {NONE} -- Initialization
+
+	make
+			-- Run application.
+		local
+			gcse: GCSE_API
+			l_parameters: GCSE_QUERY_PARAMETERS
+		do
+			create l_parameters.make (key, cx, "scoop")
+			create gcse.make (l_parameters)
+			gcse.search
+
+			if attached {GCSE_RESPONSE} gcse.last_result as l_result then
+				if attached l_result.current_page as l_page then
+					print ("Current Page%N")
+					print (l_page.to_string)
+				end
+				if attached l_result.next_page as l_page then
+					print ("Next Page%N")
+					print (l_page.to_string)
+				end
+				if attached l_result.previous_page as l_page then
+					print ("Previous Page%N")
+					print (l_page.to_string)
+				end
+
+				if attached l_result.items as l_items then
+					print ("Number of items:"  + l_items.count.out)
+					across l_items as ic loop print (ic.item.to_string) end
+				end
+
+				if attached l_result.next_page as l_page then
+					l_parameters.set_start (l_page.start_index.out)
+					gcse.search
+				end
+			end
+
+			if attached {GCSE_RESPONSE} gcse.last_result as l_result then
+				if attached l_result.current_page as l_page then
+					print ("Current Page%N")
+					print (l_page.to_string)
+				end
+				if attached l_result.next_page as l_page then
+					print ("Next Page%N")
+					print (l_page.to_string)
+				end
+				if attached l_result.previous_page as l_page then
+					print ("Previous Page%N")
+					print (l_page.to_string)
+				end
+
+				if attached l_result.items as l_items then
+					print ("Number of items:"  + l_items.count.out)
+					across l_items as ic loop print (ic.item.to_string) end
+				end
+
+			end
+
+
+		end
+
+feature {NONE} -- Implementation
+
+	Key: STRING = "AIzaSyBKAXNofo-RqZb6kUmpbiCwPEy7n7-E51k"
+	cx : STRING = "015017565055626880074:9gdgp1fvt-g"
+end
--- a/library/gcse/test/gcse_api_test_set.e
+++ b/library/gcse/test/gcse_api_test_set.e
@@ -0,0 +1,31 @@
+note
+	description: "[
+		Eiffel tests that can be executed by testing tool.
+	]"
+	author: "EiffelStudio test wizard"
+	date: "$Date: 2015-10-08 07:51:29 -0300 (ju., 08 oct. 2015) $"
+	revision: "$Revision: 97966 $"
+	testing: "type/manual"
+
+class
+	GCSE_API_TEST_SET
+
+inherit
+	EQA_TEST_SET
+
+feature -- Test routines
+
+
+feature {NONE} -- Implementation
+
+	has_error (l_captcha: GCSE_API; a_error: READABLE_STRING_32): BOOLEAN
+		do
+			if attached l_captcha.errors as l_errors then
+				l_errors.compare_objects
+				Result := l_errors.has (a_error)
+			end
+		end
+
+end
+
+
--- a/library/gcse/test/test.ecf
+++ b/library/gcse/test/test.ecf
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-13-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-13-0 http://www.eiffel.com/developers/xml/configuration-1-13-0.xsd" name="test">
+	<target name="test">
+		<root class="APPLICATION" feature="make"/>
+		<option warning="true" void_safety="transitional">
+			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
+		</option>
+		<setting name="console_application" value="true"/>
+		<precompile name="base_pre" location="$ISE_PRECOMP\base-safe.ecf"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="gcse" location="..\gcse-safe.ecf" readonly="false"/>
+		<library name="testing" location="$ISE_LIBRARY\library\testing\testing-safe.ecf"/>
+		<cluster name="test" location=".\" recursive="true">
+			<file_rule>
+				<exclude>/EIFGENs$</exclude>
+				<exclude>/CVS$</exclude>
+				<exclude>/.svn$</exclude>
+			</file_rule>
+		</cluster>
+	</target>
+</system>
--- a/library/http_client_extension/http_client_extension-safe.ecf
+++ b/library/http_client_extension/http_client_extension-safe.ecf
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-14-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-14-0 http://www.eiffel.com/developers/xml/configuration-1-14-0.xsd" name="http_client_extension" uuid="EA6A381D-2E78-448C-8A6D-B71759F1082E" library_target="http_client_extension">
+	<target name="http_client_extension">
+		<root all_classes="true"/>
+		<option warning="true" void_safety="all">
+			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
+		</option>
+		<setting name="console_application" value="true"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="base_extension" location="$ISE_LIBRARY\library\base_extension\base_extension-safe.ecf"/>
+		<library name="curl" location="$ISE_LIBRARY\library\cURL\cURL-safe.ecf"/>
+		<library name="encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder-safe.ecf"/>
+		<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http-safe.ecf"/>
+		<library name="http_client" location="$ISE_LIBRARY\contrib\library\network\http_client\http_client-safe.ecf"/>
+		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json-safe.ecf" readonly="false"/>
+		<library name="uri" location="$ISE_LIBRARY\library\text\uri\uri-safe.ecf"/>
+		<cluster name="http_client_extension" location=".\src\" recursive="true">
+			<file_rule>
+				<exclude>/.git$</exclude>
+				<exclude>/EIFGENs$</exclude>
+				<exclude>/CVS$</exclude>
+				<exclude>/.svn$</exclude>
+			</file_rule>
+		</cluster>
+	</target>
+</system>
--- a/library/http_client_extension/http_client_extension.ecf
+++ b/library/http_client_extension/http_client_extension.ecf
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-14-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-14-0 http://www.eiffel.com/developers/xml/configuration-1-14-0.xsd" name="http_client_extension" uuid="DD90A4FA-1B7F-4C8C-A739-AE67D6F40384" library_target="http_client_extension">
+	<target name="http_client_extension">
+		<root all_classes="true"/>
+		<file_rule>
+			<exclude>/.git$</exclude>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/.svn$</exclude>
+		</file_rule>
+		<option warning="true" void_safety="none">
+			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
+		</option>
+		<setting name="console_application" value="true"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
+		<library name="base_extension" location="$ISE_LIBRARY\library\base_extension\base_extension.ecf"/>
+		<library name="curl" location="$ISE_LIBRARY\library\cURL\cURL.ecf"/>
+		<library name="encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder.ecf"/>
+		<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http.ecf"/>
+		<library name="http_client" location="$ISE_LIBRARY\contrib\library\network\http_client\http_client.ecf"/>
+		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json.ecf" readonly="false"/>
+		<library name="uri" location="$ISE_LIBRARY\library\text\uri\uri.ecf"/>
+		<cluster name="http_client_extension" location=".\src\" recursive="true"/>
+	</target>
+</system>
--- a/library/http_client_extension/src/request/request.e
+++ b/library/http_client_extension/src/request/request.e
@@ -0,0 +1,199 @@
+note
+	description: "Represent an HTTP request."
+	date: "$Date: 2015-10-08 07:51:29 -0300 (ju., 08 oct. 2015) $"
+	revision: "$Revision: 97966 $"
+
+class
+	REQUEST
+
+inherit
+
+	HTTP_CONSTANTS
+
+create
+	make
+
+feature {NONE} -- Initialization
+
+	make (a_method: READABLE_STRING_8; a_uri: READABLE_STRING_8)
+		require
+			valid_http_method: is_http_method (a_method)
+			valid_uri: is_valid_uri (a_uri)
+		do
+			verb := a_method
+			uri := a_uri
+			create headers.make (5)
+		ensure
+			ver_set: verb = a_method
+			uri_set: uri = a_uri
+		end
+
+feature -- Status Report
+
+	is_valid_uri (a_uri: READABLE_STRING_8): BOOLEAN
+		local
+			l_uri: URI
+		do
+			create l_uri.make_from_string (a_uri)
+			Result := l_uri.is_valid
+		end
+
+	query_string: detachable READABLE_STRING_8
+		local
+			l_uri: URI
+		do
+			create l_uri.make_from_string (uri)
+			Result := l_uri.query
+		end
+
+	sanitized_url: READABLE_STRING_8
+			-- Returns the URL without the query string part
+		local
+			l_uri: URI
+		do
+			create l_uri.make_from_string (uri)
+			l_uri.remove_query
+			Result := l_uri.string
+		ensure
+			sanitized: not as_uri (Result).has_query
+		end
+
+	is_http_method (a_method: READABLE_STRING_GENERAL): BOOLEAN
+		do
+			if a_method.same_string (method_connect) then
+				Result := True
+			elseif a_method.same_string (method_delete) then
+				Result := True
+			elseif a_method.same_string (method_get) then
+				Result := True
+			elseif a_method.same_string (method_head) then
+				Result := True
+			elseif a_method.same_string (method_options) then
+				Result := True
+			elseif a_method.same_string (method_patch) then
+				Result := True
+			elseif a_method.same_string (method_post) then
+				Result := True
+			elseif a_method.same_string (method_put) then
+				Result := True
+			elseif a_method.same_string (method_trace) then
+				Result := True
+			end
+		end
+
+feature -- Constants
+
+	content_type_header_name: STRING_8 = "Content-Type";
+
+	default_content_type: STRING
+		once
+			Result := application_json
+		end
+
+feature -- Access
+
+	uri: READABLE_STRING_8
+
+	verb: READABLE_STRING_8
+
+	headers: STRING_TABLE [READABLE_STRING_8]
+
+	payload: detachable READABLE_STRING_8
+
+	executor: detachable REQUEST_EXECUTOR
+
+feature -- Change Element
+
+	add_payload (a_payload: like payload)
+		do
+			payload := a_payload
+		ensure
+			payload_set: attached payload as l_payload implies l_payload = a_payload
+		end
+
+	add_header (key: READABLE_STRING_8; value: READABLE_STRING_8)
+		do
+			headers.force (value, key)
+		end
+
+feature -- Execute
+
+	execute: detachable RESPONSE
+		do
+			initialize_executor
+			Result := execute_request
+		end
+
+	initialize_executor
+		do
+			create executor.make (uri, verb)
+		end
+
+feature {NONE} -- Implementation
+
+	execute_request: detachable RESPONSE
+		do
+			if attached executor as l_executor then
+					-- add headers
+				add_headers (l_executor)
+				if verb.same_string (method_put) or else verb.same_string (method_post) or else verb.same_string (method_patch) then
+					l_executor.set_body (body_contents)
+				end
+				if not l_executor.context_executor.headers.has (content_type_header_name) then
+					l_executor.context_executor.add_header (content_type_header_name, default_content_type)
+				end
+				if attached l_executor.execute as l_response then
+					create Result.make (l_response)
+				end
+			end
+		end
+
+feature {NONE} -- Implementation
+
+	add_headers (a_executor: REQUEST_EXECUTOR)
+		local
+			l_context_executor: HTTP_CLIENT_REQUEST_CONTEXT
+			s: READABLE_STRING_GENERAL
+			utf: UTF_CONVERTER
+		do
+			l_context_executor := a_executor.context_executor
+			across
+				headers as ic
+			loop
+				s := ic.key
+				if s.is_valid_as_string_8 then
+					l_context_executor.add_header (s.as_string_8, ic.item)
+				else
+					l_context_executor.add_header (utf.utf_32_string_to_utf_8_string_8 (s), ic.item)
+				end
+			end
+		end
+
+	body_contents: READABLE_STRING_8
+		do
+			if attached payload as l_payload then
+				Result := l_payload
+			else
+				Result := ""
+			end
+		end
+
+	as_uri (a_string: READABLE_STRING_8): URI
+		require
+			is_valid_uri: is_valid_uri (a_string)
+		do
+			create Result.make_from_string (a_string)
+		end
+
+note
+	copyright: "2011-2015 Javier Velilla, Jocelyn Fiat, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+	source: "[
+		Eiffel Software
+		5949 Hollister Ave., Goleta, CA 93117 USA
+		Telephone 805-685-1006, Fax 805-685-6869
+		Website http://www.eiffel.com
+		Customer support http://support.eiffel.com
+	]"
+
+end
--- a/library/http_client_extension/src/request/request_executor.e
+++ b/library/http_client_extension/src/request/request_executor.e
@@ -0,0 +1,97 @@
+note
+	description: "Executes an HTTP request"
+	date: "$Date: 2015-10-08 07:51:29 -0300 (ju., 08 oct. 2015) $"
+	revision: "$Revision: 97966 $"
+
+class
+	REQUEST_EXECUTOR
+
+inherit
+
+	HTTP_CLIENT_HELPER
+
+	HTTP_CONSTANTS
+
+create
+	make
+
+feature {NONE} -- Initialization
+
+	make (a_url: READABLE_STRING_8; a_method: READABLE_STRING_8)
+		do
+			set_base_url (a_url)
+			verb := a_method
+		ensure
+			base_url_set: base_url.same_string (a_url)
+			method_set: verb.same_string (a_method)
+		end
+
+	set_base_url (a_url: READABLE_STRING_8)
+			-- Set base_url with `a_url'
+		local
+			s: STRING
+		do
+			create s.make_from_string (a_url)
+			s.left_adjust
+			s.right_adjust
+			base_url := s
+		ensure
+			base_url_set: a_url.has_substring (base_url)
+		end
+
+feature -- Access
+
+	verb: READABLE_STRING_8
+			-- HTTP METHOD (Get, Post, ...)
+
+	body: detachable READABLE_STRING_8
+			-- body content
+
+feature -- Element Change
+
+	set_body (a_body: like body)
+			-- Set body with `a_body'.
+		do
+			body := a_body
+		ensure
+			body_set: body = a_body
+		end
+
+feature -- Execute
+
+	execute: detachable HTTP_CLIENT_RESPONSE
+			-- Http executor
+		do
+			if verb.same_string (method_connect) then
+				Result := Void -- not supported for now
+			elseif verb.same_string (method_delete) then
+				Result := execute_delete ("")
+			elseif verb.same_string (method_get) then
+				Result := execute_get ("")
+			elseif verb.same_string (method_head) then
+				Result := Void
+			elseif verb.same_string (method_options) then
+				Result := Void
+			elseif verb.same_string (method_patch) then
+				Result := execute_patch ("", body)
+			elseif verb.same_string (method_post) then
+				Result := execute_post ("", body)
+			elseif verb.same_string (method_put) then
+				Result := execute_put ("", body)
+			elseif verb.same_string (method_trace) then
+				Result := Void
+			end
+		end
+
+note
+	copyright: "2011-2015 Javier Velilla, Jocelyn Fiat, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+	source: "[
+		Eiffel Software
+		5949 Hollister Ave., Goleta, CA 93117 USA
+		Telephone 805-685-1006, Fax 805-685-6869
+		Website http://www.eiffel.com
+		Customer support http://support.eiffel.com
+	]"
+
+end
--- a/library/http_client_extension/src/response/response.e
+++ b/library/http_client_extension/src/response/response.e
@@ -0,0 +1,57 @@
+note
+	description: "Represent and HTTP Response"
+	date: "$Date: 2015-10-08 07:51:29 -0300 (ju., 08 oct. 2015) $"
+	revision: "$Revision: 97966 $"
+
+class
+	RESPONSE
+
+create
+	make
+
+feature {NONE} --Initialization
+
+	make (a_response: HTTP_CLIENT_RESPONSE)
+		do
+			http_response := a_response
+			body := a_response.body
+			status := a_response.status
+			headers := a_response.headers
+			status_message := a_response.status_line
+			error_message := a_response.error_message
+		ensure
+			http_reponse_set: http_response = a_response
+			headers_set: headers = a_response.headers
+			status_set: status = a_response.status
+			status_message_set: status_message = a_response.status_line
+			error_message_set: error_message = a_response.error_message
+		end
+
+feature -- Access
+
+	status: INTEGER
+
+	status_message: detachable READABLE_STRING_8
+
+	error_message: detachable READABLE_STRING_8
+
+	body: detachable READABLE_STRING_8
+
+	headers: LIST [TUPLE [name: READABLE_STRING_8; value: READABLE_STRING_8]]
+
+feature {NONE} -- Implementation
+
+	http_response: HTTP_CLIENT_RESPONSE;
+
+note
+	copyright: "2011-2015 Javier Velilla, Jocelyn Fiat, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+	source: "[
+		Eiffel Software
+		5949 Hollister Ave., Goleta, CA 93117 USA
+		Telephone 805-685-1006, Fax 805-685-6869
+		Website http://www.eiffel.com
+		Customer support http://support.eiffel.com
+	]"
+
+end
--- a/library/http_client_extension/src/util/http_client_helper.e
+++ b/library/http_client_extension/src/util/http_client_helper.e
@@ -0,0 +1,99 @@
+note
+	description: "Wrapper class for HTTP_CLIENT_SESSION"
+	date: "$Date: 2015-10-08 07:51:29 -0300 (ju., 08 oct. 2015) $"
+	revision: "$Revision: 97966 $"
+
+deferred class
+	HTTP_CLIENT_HELPER
+
+feature -- Access
+
+	http_session: detachable HTTP_CLIENT_SESSION
+
+	get_http_session
+		local
+			h: LIBCURL_HTTP_CLIENT
+			b: like base_url
+		do
+			create h.make
+			b := base_url
+			if b = Void then
+				b := ""
+			end
+			if attached {HTTP_CLIENT_SESSION} h.new_session (base_url) as sess then
+				http_session := sess
+				sess.set_timeout (-1)
+				sess.set_connect_timeout (-1)
+				sess.set_is_insecure (True)
+				sess.set_any_auth_type
+				debug ("curl")
+					sess.set_is_debug (True)
+				end
+				debug ("proxy8888")
+					sess.set_proxy ("127.0.0.1", 8888) --| inspect traffic with http://www.fiddler2.com/
+				end
+			end
+		end
+
+feature -- HTTP client helpers
+
+	execute_get (command_name: READABLE_STRING_8): detachable HTTP_CLIENT_RESPONSE
+		do
+			get_http_session
+			if attached http_session as sess then
+				Result := sess.get (command_name, context_executor)
+			end
+		end
+
+	execute_post (command_name: READABLE_STRING_8; data: detachable READABLE_STRING_8): detachable HTTP_CLIENT_RESPONSE
+		do
+			get_http_session
+			if attached http_session as sess then
+				Result := sess.post (command_name, context_executor, data)
+			end
+		end
+
+	execute_delete (command_name: READABLE_STRING_8): detachable HTTP_CLIENT_RESPONSE
+		do
+			get_http_session
+			if attached http_session as sess then
+				Result := sess.delete (command_name, context_executor)
+			end
+		end
+
+	execute_put (command_name: READABLE_STRING_8; data: detachable READABLE_STRING_8): detachable HTTP_CLIENT_RESPONSE
+		do
+			get_http_session
+			if attached http_session as sess then
+				Result := sess.put (command_name, context_executor, data)
+			end
+		end
+
+	execute_patch (command_name: READABLE_STRING_8; data: detachable READABLE_STRING_8): detachable HTTP_CLIENT_RESPONSE
+		do
+			get_http_session
+			if attached http_session as sess then
+				Result := sess.patch (command_name, context_executor, data)
+			end
+		end
+
+	context_executor: HTTP_CLIENT_REQUEST_CONTEXT
+			-- request context for each request
+		once
+			create Result.make
+		end
+
+	base_url: STRING;
+
+note
+	copyright: "2011-2015 Javier Velilla, Jocelyn Fiat, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+	source: "[
+		Eiffel Software
+		5949 Hollister Ave., Goleta, CA 93117 USA
+		Telephone 805-685-1006, Fax 805-685-6869
+		Website http://www.eiffel.com
+		Customer support http://support.eiffel.com
+	]"
+
+end
--- a/modules/admin/cms_admin_module.e
+++ b/modules/admin/cms_admin_module.e
@@ -9,7 +9,7 @@ class
 inherit
 	CMS_MODULE
 		redefine
-			register_hooks,
+			setup_hooks,
 			permissions
 		end

@@ -54,6 +54,7 @@ feature -- Access: router
 			l_role_handler:	CMS_ROLE_HANDLER

 			l_admin_cache_handler: CMS_ADMIN_CACHE_HANDLER
+			l_admin_export_handler: CMS_ADMIN_EXPORT_HANDLER

 			l_uri_mapping: WSF_URI_MAPPING
 		do
@@ -73,6 +74,10 @@ feature -- Access: router
 			create l_uri_mapping.make_trailing_slash_ignored ("/admin/cache", l_admin_cache_handler)
 			a_router.map (l_uri_mapping, a_router.methods_get_post)

+			create l_admin_export_handler.make (a_api)
+			create l_uri_mapping.make_trailing_slash_ignored ("/admin/export", l_admin_export_handler)
+			a_router.map (l_uri_mapping, a_router.methods_get_post)
+
 			create l_user_handler.make (a_api)
 			a_router.handle ("/admin/add/user", l_user_handler, a_router.methods_get_post)
 			a_router.handle ("/admin/user/{id}", l_user_handler, a_router.methods_get)
@@ -84,8 +89,6 @@ feature -- Access: router
 			a_router.handle ("/admin/role/{id}", l_role_handler, a_router.methods_get)
 			a_router.handle ("/admin/role/{id}/edit", l_role_handler, a_router.methods_get_post)
 			a_router.handle ("/admin/role/{id}/delete", l_role_handler, a_router.methods_get_post)
-
-
 		end

 feature -- Security
@@ -99,15 +102,18 @@ feature -- Security
 			Result.force ("admin roles")
 			Result.force ("admin modules")
 			Result.force ("install modules")
+			Result.force ("admin core caches")
+			Result.force ("clear blocks cache")
+			Result.force ("admin export")
 		end

 feature -- Hooks

-	register_hooks (a_response: CMS_RESPONSE)
+	setup_hooks (a_hooks: CMS_HOOK_CORE_MANAGER)
 			-- <Precursor>
 		do
-			a_response.hooks.subscribe_to_menu_system_alter_hook (Current)
-			a_response.hooks.subscribe_to_response_alter_hook (Current)
+			a_hooks.subscribe_to_menu_system_alter_hook (Current)
+			a_hooks.subscribe_to_response_alter_hook (Current)
 		end

 	response_alter (a_response: CMS_RESPONSE)
@@ -128,13 +134,13 @@ feature -- Hooks
 				lnk.set_permission_arguments (<<"manage " + {CMS_ADMIN_MODULE}.name>>)
 				a_menu_system.management_menu.extend (lnk)
 			end
-			if
-				a_response.has_permission ("admin cache") -- Note: admin user has all permissions enabled by default.
-			then
-				create lnk.make ("Cache", "admin/cache")
-				lnk.set_permission_arguments (<<"admin cache">>)
-				a_menu_system.management_menu.extend (lnk)
-			end
+				-- Per module cache permission!
+			create lnk.make ("Cache", "admin/cache")
+			a_menu_system.management_menu.extend (lnk)
+
+				-- Per module export permission!
+			create lnk.make ("Export", "admin/export")
+			a_menu_system.management_menu.extend (lnk)
 		end

 note
--- a/modules/admin/handler/cms_admin_cache_handler.e
+++ b/modules/admin/handler/cms_admin_cache_handler.e
@@ -42,14 +42,10 @@ feature -- Execution
 			f: CMS_FORM
 		do
 			create {GENERIC_VIEW_CMS_RESPONSE} l_response.make (req, res, api)
-			if l_response.has_permission ("admin cache") then
-				f := clear_cache_web_form (l_response)
-				create s.make_empty
-				f.append_to_html (create {CMS_TO_WSF_THEME}.make (l_response, l_response.theme), s)
-				l_response.set_main_content (s)
-			else
-				create {FORBIDDEN_ERROR_CMS_RESPONSE} l_response.make (req, res, api)
-			end
+			f := clear_cache_web_form (l_response)
+			create s.make_empty
+			f.append_to_html (create {CMS_TO_WSF_THEME}.make (l_response, l_response.theme), s)
+			l_response.set_main_content (s)
 			l_response.execute
 		end

@@ -60,26 +56,22 @@ feature -- Execution
 			f: CMS_FORM
 		do
 			create {GENERIC_VIEW_CMS_RESPONSE} l_response.make (req, res, api)
-			if l_response.has_permission ("admin cache") then
-				f := clear_cache_web_form (l_response)
-				f.process (l_response)
-				if
-					attached f.last_data as fd and then
-					fd.is_valid
-				then
-					if attached fd.string_item ("op") as l_op and then l_op.same_string (text_clear_all_caches) then
-						l_response.hooks.invoke_clear_cache (Void, l_response)
-						l_response.add_notice_message ("Cache cleared!")
-					else
-						fd.report_error ("Invalid form data!")
-					end
+			f := clear_cache_web_form (l_response)
+			f.process (l_response)
+			if
+				attached f.last_data as fd and then
+				fd.is_valid
+			then
+				if attached fd.string_item ("op") as l_op and then l_op.same_string (text_clear_all_caches) then
+					l_response.hooks.invoke_clear_cache (Void, l_response)
+					l_response.add_notice_message ("Caches cleared (if allowed)!")
+				else
+					fd.report_error ("Invalid form data!")
 				end
-				create s.make_empty
-				f.append_to_html (create {CMS_TO_WSF_THEME}.make (l_response, l_response.theme), s)
-				l_response.set_main_content (s)
-			else
-				create {FORBIDDEN_ERROR_CMS_RESPONSE} l_response.make (req, res, api)
 			end
+			create s.make_empty
+			f.append_to_html (create {CMS_TO_WSF_THEME}.make (l_response, l_response.theme), s)
+			l_response.set_main_content (s)
 			l_response.execute
 		end

--- a/modules/admin/handler/cms_admin_export_handler.e
+++ b/modules/admin/handler/cms_admin_export_handler.e
@@ -0,0 +1,104 @@
+note
+	description: "[
+			Administrate export functionality.
+		]"
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	CMS_ADMIN_EXPORT_HANDLER
+
+inherit
+	CMS_HANDLER
+
+	WSF_URI_HANDLER
+		rename
+			new_mapping as new_uri_mapping
+		end
+
+	WSF_RESOURCE_HANDLER_HELPER
+		redefine
+			do_get,
+			do_post
+		end
+
+	REFACTORING_HELPER
+
+create
+	make
+
+feature -- Execution
+
+	execute (req: WSF_REQUEST; res: WSF_RESPONSE)
+			-- Execute request handler
+		do
+			execute_methods (req, res)
+		end
+
+	do_get (req: WSF_REQUEST; res: WSF_RESPONSE)
+		local
+			l_response: CMS_RESPONSE
+			s: STRING
+			f: CMS_FORM
+		do
+			create {GENERIC_VIEW_CMS_RESPONSE} l_response.make (req, res, api)
+			f := exportation_web_form (l_response)
+			create s.make_empty
+			f.append_to_html (create {CMS_TO_WSF_THEME}.make (l_response, l_response.theme), s)
+			l_response.set_main_content (s)
+			l_response.execute
+		end
+
+	do_post (req: WSF_REQUEST; res: WSF_RESPONSE)
+		local
+			l_response: CMS_RESPONSE
+			s: STRING
+			f: CMS_FORM
+			l_exportation_parameters: CMS_EXPORT_PARAMETERS
+		do
+			create {GENERIC_VIEW_CMS_RESPONSE} l_response.make (req, res, api)
+			f := exportation_web_form (l_response)
+			f.process (l_response)
+			if
+				attached f.last_data as fd and then
+				fd.is_valid
+			then
+				if attached fd.string_item ("op") as l_op and then l_op.same_string (text_export_all_data) then
+					create l_exportation_parameters.make (api.site_location.extended ("export").extended ((create {DATE_TIME}.make_now_utc).formatted_out ("yyyy-[0]mm-[0]dd_hh12-[0]mi-[0]ss")))
+					l_response.hooks.invoke_export_to (Void, l_exportation_parameters, l_response)
+					l_response.add_notice_message ("All data exported (if allowed)!")
+					create s.make_empty
+					across
+						l_exportation_parameters.logs as ic
+					loop
+						s.append (ic.item)
+						s.append ("<br/>")
+						s.append_character ('%N')
+					end
+					l_response.add_notice_message (s)
+				else
+					fd.report_error ("Invalid form data!")
+				end
+			end
+			create s.make_empty
+			f.append_to_html (create {CMS_TO_WSF_THEME}.make (l_response, l_response.theme), s)
+			l_response.set_main_content (s)
+			l_response.execute
+		end
+
+feature -- Widget
+
+	exportation_web_form (a_response: CMS_RESPONSE): CMS_FORM
+		local
+			but: WSF_FORM_SUBMIT_INPUT
+		do
+			create Result.make (a_response.url (a_response.location, Void), "export_all_data")
+			create but.make_with_text ("op", text_export_all_data)
+			Result.extend (but)
+		end
+
+feature -- Interface text.		
+
+	text_export_all_data: STRING_32 = "Export all data"
+
+end
--- a/modules/auth/cms_authentication_module.e
+++ b/modules/auth/cms_authentication_module.e
@@ -9,7 +9,7 @@ class
 inherit
 	CMS_MODULE
 		redefine
-			register_hooks
+			setup_hooks
 		end


@@ -91,12 +91,12 @@ feature -- Router

 feature -- Hooks configuration

-	register_hooks (a_response: CMS_RESPONSE)
+	setup_hooks (a_hooks: CMS_HOOK_CORE_MANAGER)
 			-- Module hooks configuration.
 		do
-			auto_subscribe_to_hooks (a_response)
-			a_response.hooks.subscribe_to_block_hook (Current)
-			a_response.hooks.subscribe_to_value_table_alter_hook (Current)
+			auto_subscribe_to_hooks (a_hooks)
+			a_hooks.subscribe_to_block_hook (Current)
+			a_hooks.subscribe_to_value_table_alter_hook (Current)
 		end

 	value_table_alter (a_value: CMS_VALUE_TABLE; a_response: CMS_RESPONSE)
@@ -123,6 +123,7 @@ feature -- Hooks configuration
 				lnk.set_weight (98)
 				a_menu_system.primary_menu.extend (lnk)
 			end
+
 		end

 feature -- Handler
--- a/modules/basic_auth/cms_basic_auth_module.e
+++ b/modules/basic_auth/cms_basic_auth_module.e
@@ -13,7 +13,7 @@ inherit
 	CMS_MODULE
 		redefine
 			filters,
-			register_hooks
+			setup_hooks
 		end

 	CMS_HOOK_AUTO_REGISTER
@@ -101,12 +101,12 @@ feature {NONE} -- Implementation: routes

 feature -- Hooks configuration

-	register_hooks (a_response: CMS_RESPONSE)
+	setup_hooks (a_hooks: CMS_HOOK_CORE_MANAGER)
 			-- Module hooks configuration.
 		do
-			auto_subscribe_to_hooks (a_response)
-			a_response.hooks.subscribe_to_block_hook (Current)
-			a_response.hooks.subscribe_to_value_table_alter_hook (Current)
+			auto_subscribe_to_hooks (a_hooks)
+			a_hooks.subscribe_to_block_hook (Current)
+			a_hooks.subscribe_to_value_table_alter_hook (Current)
 		end

 feature -- Hooks
--- a/modules/blog/cms_blog_api.e
+++ b/modules/blog/cms_blog_api.e
@@ -97,6 +97,21 @@ feature -- Access node
 			Result := nodes_to_blogs (blog_storage.blogs_from_user_limited (a_user, a_limit, a_offset))
 		end

+feature -- Conversion
+
+	full_blog_node (a_blog: CMS_BLOG): CMS_BLOG
+			-- If `a_blog' is partial, return the full blog node from `a_blog',
+			-- otherwise return directly `a_blog'.
+		require
+			a_blog_set: a_blog /= Void
+		do
+			if attached {CMS_BLOG} node_api.full_node (a_blog) as l_full_blog then
+				Result := l_full_blog
+			else
+				Result := a_blog
+			end
+		end
+
 feature {NONE} -- Helpers

 	nodes_to_blogs (a_nodes: LIST [CMS_NODE]): ARRAYED_LIST [CMS_BLOG]
--- a/modules/blog/cms_blog_module-safe.ecf
+++ b/modules/blog/cms_blog_module-safe.ecf
@@ -14,6 +14,8 @@
 		<library name="cms" location="..\..\cms-safe.ecf" readonly="false"/>
 		<library name="cms_model" location="..\..\library\model\cms_model-safe.ecf" readonly="false"/>
 		<library name="cms_node_module" location="..\..\modules\node\node-safe.ecf" readonly="false"/>
+		<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error-safe.ecf"/>
+
 		<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http-safe.ecf"/>
 		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json-safe.ecf" readonly="false"/>
 		<library name="text_filter" location="$ISE_LIBRARY\unstable\library\text\text_filter\text_filter-safe.ecf"/>
--- a/modules/blog/cms_blog_module.e
+++ b/modules/blog/cms_blog_module.e
@@ -12,7 +12,7 @@ inherit
 		rename
 			module_api as blog_api
 		redefine
-			register_hooks,
+			setup_hooks,
 			initialize,
 			install,
 			blog_api
@@ -22,6 +22,10 @@ inherit

 	CMS_HOOK_RESPONSE_ALTER

+	CMS_HOOK_EXPORT
+
+	CMS_EXPORT_NODE_UTILITIES
+
 create
 	make

@@ -149,10 +153,11 @@ feature -- Access: router

 feature -- Hooks

-	register_hooks (a_response: CMS_RESPONSE)
+	setup_hooks (a_hooks: CMS_HOOK_CORE_MANAGER)
 		do
-			a_response.hooks.subscribe_to_menu_system_alter_hook (Current)
-			a_response.hooks.subscribe_to_response_alter_hook (Current)
+			a_hooks.subscribe_to_menu_system_alter_hook (Current)
+			a_hooks.subscribe_to_response_alter_hook (Current)
+			a_hooks.subscribe_to_export_hook (Current)
 		end

 	response_alter (a_response: CMS_RESPONSE)
@@ -168,4 +173,47 @@ feature -- Hooks
 			create lnk.make ("Blogs", "blogs/")
 			a_menu_system.primary_menu.extend (lnk)
 		end
+
+	export_to (a_export_id_list: detachable ITERABLE [READABLE_STRING_GENERAL]; a_export_parameters: CMS_EXPORT_PARAMETERS; a_response: CMS_RESPONSE)
+			-- Export data identified by `a_export_id_list',
+			-- or export all data if `a_export_id_list' is Void.
+		local
+			n: CMS_BLOG
+			p: PATH
+			d: DIRECTORY
+			f: PLAIN_TEXT_FILE
+			lst: LIST [CMS_BLOG]
+		do
+			if
+				a_export_id_list = Void
+				or else across a_export_id_list as ic some ic.item.same_string ("blog") end
+			then
+				if attached blog_api as l_blog_api then
+					lst := l_blog_api.blogs_order_created_desc
+					a_export_parameters.log ("Exporting " + lst.count.out + " blogs")
+					across
+						lst as ic
+					loop
+						n := l_blog_api.full_blog_node (ic.item)
+						a_export_parameters.log (n.content_type + " #" + n.id.out)
+						p := a_export_parameters.location.extended ("nodes").extended (n.content_type).extended (n.id.out)
+						create d.make_with_path (p.parent)
+						if not d.exists then
+							d.recursive_create_dir
+						end
+						create f.make_with_path (p)
+						if not f.exists or else f.is_access_writable then
+							f.open_write
+							f.put_string (json_to_string (blog_node_to_json (n)))
+							f.close
+						end
+					end
+				end
+			end
+		end
+
+	blog_node_to_json (a_blog: CMS_BLOG): JSON_OBJECT
+		do
+			Result := node_to_json (a_blog)
+		end
 end
--- a/modules/blog/handler/blog_handler.e
+++ b/modules/blog/handler/blog_handler.e
@@ -230,9 +230,9 @@ feature -- HTML Output
 				lnk := blog_api.node_api.node_link (n)
 				a_output.append ("<p class=%"blog_list_summary%">")
 				if attached api.format (n.format) as f then
-					a_output.append (f.formatted_output (l_summary))
+					f.append_formatted_to (l_summary, a_output)
 				else
-					a_output.append (page.formats.default_format.formatted_output (l_summary))
+					page.formats.default_format.append_formatted_to (l_summary, a_output)
 				end
 				a_output.append ("<br />")
 				a_output.append (page.link ("See more...", lnk.location, Void))
--- a/modules/blog/persistence/cms_blog_storage_i.e
+++ b/modules/blog/persistence/cms_blog_storage_i.e
@@ -6,8 +6,12 @@ note
 deferred class
 	CMS_BLOG_STORAGE_I

-inherit
-	CMS_NODE_STORAGE_I
+feature -- Error Handling
+
+	error_handler: ERROR_HANDLER
+			-- Error handler.
+		deferred
+		end

 feature -- Access

--- a/modules/feed_aggregator/feed_aggregator_module.e
+++ b/modules/feed_aggregator/feed_aggregator_module.e
@@ -12,7 +12,7 @@ inherit
 			module_api as feed_aggregator_api
 		redefine
 			initialize,
-			register_hooks,
+			setup_hooks,
 			permissions,
 			feed_aggregator_api
 		end
@@ -46,9 +46,13 @@ feature -- Access
 			-- List of permission ids, used by this module, and declared.
 		do
 			Result := Precursor
-			Result.force ("manage feed aggregator")
+			Result.force (permission__manage_feed_aggregator)
+			Result.force (permission__clear_feed_cache)
 		end

+	permission__manage_feed_aggregator: STRING = "manage feed aggregator"
+	permission__clear_feed_cache: STRING = "clear feed cache"
+
 feature {CMS_API} -- Module Initialization			

 	initialize (api: CMS_API)
@@ -177,13 +181,13 @@ feature -- Handle

 feature -- Hooks configuration

-	register_hooks (a_response: CMS_RESPONSE)
+	setup_hooks (a_hooks: CMS_HOOK_CORE_MANAGER)
 			-- Module hooks configuration.
 		do
-			a_response.hooks.subscribe_to_block_hook (Current)
-			a_response.hooks.subscribe_to_response_alter_hook (Current)
-			a_response.hooks.subscribe_to_menu_system_alter_hook (Current)
-			a_response.hooks.subscribe_to_cache_hook (Current)
+			a_hooks.subscribe_to_block_hook (Current)
+			a_hooks.subscribe_to_response_alter_hook (Current)
+			a_hooks.subscribe_to_menu_system_alter_hook (Current)
+			a_hooks.subscribe_to_cache_hook (Current)
 		end

 feature -- Hook
@@ -194,12 +198,14 @@ feature -- Hook
 			p: PATH
 			dir: DIRECTORY
 		do
-			if a_cache_id_list = Void then
-					-- Clear all cache.
-				p := a_response.api.files_location.extended (".cache").extended (name)
-				create dir.make_with_path (p)
-				if dir.exists then
-					dir.recursive_delete
+			if a_response.has_permissions (<<permission__clear_feed_cache, permission__manage_feed_aggregator>>) then
+				if a_cache_id_list = Void then
+						-- Clear all cache.
+					p := a_response.api.files_location.extended (".cache").extended (name)
+					create dir.make_with_path (p)
+					if dir.exists then
+						dir.recursive_delete
+					end
 				end
 			end
 		end
@@ -341,7 +347,7 @@ feature -- Hook
 			-- for related response `a_response'.
 		do
 			a_menu_system.navigation_menu.extend (create {CMS_LOCAL_LINK}.make ("Feeds", "feed_aggregation/"))
-			if a_response.has_permission ("manage feed aggregator") then
+			if a_response.has_permission (permission__manage_feed_aggregator) then
 				a_menu_system.management_menu.extend (create {CMS_LOCAL_LINK}.make ("Feeds (admin)", "admin/feed_aggregator/"))
 			end
 		end
--- a/modules/google_search/Readme.md
+++ b/modules/google_search/Readme.md
@@ -0,0 +1 @@
+Google Custom Search Module.
--- a/modules/google_search/google_search-safe.ecf
+++ b/modules/google_search/google_search-safe.ecf
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-14-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-14-0 http://www.eiffel.com/developers/xml/configuration-1-14-0.xsd" name="google_search" uuid="054E9C5C-ACCB-4A4D-B825-6C574AEC30A9" library_target="google_search">
+	<target name="google_search">
+		<root all_classes="true"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="cms" location="..\..\cms-safe.ecf" readonly="false"/>
+		<library name="cms_app_env" location="..\..\library\app_env\app_env-safe.ecf" readonly="false"/>
+		<library name="cms_config" location="..\..\library\configuration\config-safe.ecf"/>
+		<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error-safe.ecf"/>
+		<library name="google_cse" location="..\..\library\gcse\gcse-safe.ecf"/>
+		<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http-safe.ecf"/>
+		<library name="net" location="$ISE_LIBRARY\library\net\net-safe.ecf"/>
+		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
+		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf-safe.ecf"/>
+		<library name="wsf_encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder-safe.ecf"/>
+		<cluster name="src" location="src\" recursive="true"/>
+	</target>
+</system>
--- a/modules/google_search/google_search.ecf
+++ b/modules/google_search/google_search.ecf
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-15-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-15-0 http://www.eiffel.com/developers/xml/configuration-1-15-0.xsd" name="google_search" uuid="054E9C5C-ACCB-4A4D-B825-6C574AEC30A9" library_target="google_search">
+	<target name="google_search">
+		<root all_classes="true"/>
+		<option is_attached_by_default="false" void_safety="none">
+		</option>
+		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
+		<library name="cms" location="..\..\cms.ecf" readonly="false"/>
+		<library name="cms_app_env" location="..\..\library\app_env\app_env.ecf" readonly="false"/>
+		<library name="cms_config" location="..\..\library\configuration\config.ecf"/>
+		<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error.ecf"/>
+		<library name="google_cse" location="..\..\library\gcse\gcse.ecf"/>
+		<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http.ecf"/>
+		<library name="net" location="$ISE_LIBRARY\library\net\net.ecf"/>
+		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
+		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf.ecf"/>
+		<library name="wsf_encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder.ecf"/>
+		<cluster name="src" location="src\" recursive="true"/>
+	</target>
+</system>
--- a/modules/google_search/site/config/google_search.json
+++ b/modules/google_search/site/config/google_search.json
@@ -0,0 +1,6 @@
+{
+    "gcse": {
+     		"cx":"",
+     		"secret_key":""
+     }	
+}
--- a/modules/google_search/site/templates/block_search.tpl
+++ b/modules/google_search/site/templates/block_search.tpl
@@ -0,0 +1,40 @@
+<section>
+  <header>
+    <h2>Results for <kbd>{$result.current_page.search_terms/}</kbd></h2>
+  </header>
+  
+  <!-- list of results -->
+  <ol start="{$result.current_page.start_index/}">
+  
+    <!-- Item result -->
+    {foreach from="$result.items" item="item"}
+    <li>
+      <article>
+        <header>
+          <h3>
+            <cite>
+              <a href="{$item.link/}">{$item.title/}</a>
+            </cite>
+          </h3>
+        </header>
+        <blockquote cite="{$item.link/}">
+          <p>{$item.html_snippet/}</p>
+          <footer>
+            <p><abbr title="Uniform Resource Locator">Source</abbr> <a href="{$item.link/}">{$item.display_link/}</a></p>
+          </footer>
+        </blockquote>
+      </article>
+    </li>
+    {/foreach} 
+
+    
+  </ol>  
+  <ul class="cms-page-links">
+      {if isset="$result.previous_page"}
+        <li><a href="{$site_url/}gcse/?q={$result.previous_page.search_terms/}&amp;start={$result.previous_page.start_index/}&amp;num={$result.previous_page.count/}">Previous</a></li>
+      {/if}
+      {if isset="$result.next_page"}
+        <li><a href="{$site_url/}gcse/?q={$result.next_page.search_terms/}&amp;start={$result.next_page.start_index/}&amp;num={$result.next_page.count/}">Next</a></li>
+      {/if}
+  </ul>
+</section>
--- a/modules/google_search/src/google_custom_search_module.e
+++ b/modules/google_search/src/google_custom_search_module.e
@@ -0,0 +1,150 @@
+note
+	description: "[
+			Module providing Google Custom Search functionality.
+		]"
+	date: "$Date: 2015-10-09 20:50:01 -0300 (vi. 09 de oct. de 2015) $"
+	revision: "$Revision: 97982 $"
+
+class
+	GOOGLE_CUSTOM_SEARCH_MODULE
+
+inherit
+
+	CMS_MODULE
+
+	CMS_HOOK_BLOCK_HELPER
+
+	SHARED_EXECUTION_ENVIRONMENT
+		export
+			{NONE} all
+		end
+
+	REFACTORING_HELPER
+
+	SHARED_LOGGER
+
+create
+	make
+
+feature {NONE} -- Initialization
+
+	make
+			-- Create current module
+		do
+			version := "1.0"
+			description := "Google custome search module"
+			package := "search"
+		end
+
+feature -- Access
+
+	name: STRING = "google_search"
+			-- <Precursor>
+
+feature -- Router
+
+	setup_router (a_router: WSF_ROUTER; a_api: CMS_API)
+			-- Router configuration.
+		do
+			a_router.handle ("/gcse", create {WSF_URI_AGENT_HANDLER}.make (agent handle_search (a_api, ?, ?)), a_router.methods_head_get)
+		end
+
+feature -- Recaptcha
+
+	gcse_secret_key (api: CMS_API): detachable READABLE_STRING_8
+			-- Get recaptcha security key.
+		local
+			utf: UTF_CONVERTER
+		do
+			if attached api.module_configuration (Current, Void) as cfg then
+				if
+					attached cfg.text_item ("gcse.secret_key") as l_recaptcha_key and then
+					not l_recaptcha_key.is_empty
+				then
+					Result := utf.utf_32_string_to_utf_8_string_8 (l_recaptcha_key)
+				end
+			end
+		end
+
+	gcse_cx_key (api: CMS_API): detachable READABLE_STRING_8
+			-- Get recaptcha security key.
+		local
+			utf: UTF_CONVERTER
+		do
+			if attached api.module_configuration (Current, Void) as cfg then
+				if
+					attached cfg.text_item ("gcse.cx") as l_recaptcha_key and then
+					not l_recaptcha_key.is_empty
+				then
+					Result := utf.utf_32_string_to_utf_8_string_8 (l_recaptcha_key)
+				end
+			end
+		end
+
+feature -- Handler
+
+	handle_search (api: CMS_API; req: WSF_REQUEST; res: WSF_RESPONSE)
+		local
+			r: CMS_RESPONSE
+			l_parameters:GCSE_QUERY_PARAMETERS
+			l_search: GCSE_API
+		do
+				-- TODO handle errors!!!
+			write_debug_log (generator + ".handle_search")
+			create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, api)
+			if
+				attached {WSF_STRING} req.query_parameter ("q") as l_query and then
+				not l_query.value.is_empty
+			then
+				if
+					attached gcse_cx_key (api) as l_cx and then
+					attached gcse_secret_key (api) as l_key
+				then
+					create l_parameters.make (l_key, l_cx, l_query.url_encoded_value )
+					if
+						attached {WSF_STRING} req.query_parameter ("start") as l_index and then
+					  	attached {WSF_STRING} req.query_parameter ("num") as l_num
+					then
+						l_parameters.set_start (l_index.value)
+						l_parameters.set_num (l_num.value)
+					end
+					create l_search.make (l_parameters)
+					l_search.search
+					if
+						attached l_search.last_result as l_result and then
+					    l_result.status = 200
+					then
+						if attached template_block (Current, "search", r) as l_tpl_block then
+							l_tpl_block.set_value (l_result, "result")
+							r.add_block (l_tpl_block, "content")
+						end
+					else
+							-- Quota limit (403 status code) or not results.
+						google_search_site (req, r,  l_query)
+					end
+				else
+						-- If no key are provided, at least output google search result page.
+					google_search_site (req, r,  l_query)
+				end
+			else
+				r.add_message ("No query submitted", Void)
+			end
+			r.execute
+		end
+
+feature {NONE} -- Helper
+
+	google_search_site (req: WSF_REQUEST; res: CMS_RESPONSE; query: WSF_STRING)
+			-- Workaround to output google search result page
+			-- If no key are provided or if GCSE reached the quota limit.
+		local
+			l_url_encoder: URL_ENCODER
+		do
+			create l_url_encoder
+			if req.is_https then
+				res.set_redirection ("https://www.google.com/search?sitesearch=" + l_url_encoder.general_encoded_string (res.absolute_url ("", Void)) + "&q=" + query.url_encoded_value)
+			else
+				res.set_redirection ("http://www.google.com/search?sitesearch=" + l_url_encoder.general_encoded_string (res.absolute_url ("", Void)) + "&q=" + query.url_encoded_value)
+			end
+		end
+end
--- a/modules/node/cms_node_api.e
+++ b/modules/node/cms_node_api.e
@@ -330,6 +330,14 @@ feature -- Access: Node
 			end
 		end

+	nodes_of_type (a_node_type: CMS_CONTENT_TYPE): LIST [CMS_NODE]
+			-- List of nodes of type `a_node_type'.
+		do
+			Result := node_storage.nodes_of_type (a_node_type)
+		ensure
+			expected_type: across Result as ic all ic.item.content_type.same_string (a_node_type.name) end
+		end
+
 feature -- Access: page/book outline

 	children (a_node: CMS_NODE): detachable LIST [CMS_NODE]
--- a/modules/node/cms_node_module.e
+++ b/modules/node/cms_node_module.e
@@ -9,7 +9,7 @@ class
 inherit
 	CMS_MODULE
 		redefine
-			register_hooks,
+			setup_hooks,
 			initialize,
 			is_installed,
 			install,
@@ -25,6 +25,10 @@ inherit

 	CMS_RECENT_CHANGES_HOOK

+	CMS_HOOK_EXPORT
+
+	CMS_EXPORT_NODE_UTILITIES
+
 create
 	make

@@ -224,15 +228,16 @@ feature -- Access: router

 feature -- Hooks

-	register_hooks (a_response: CMS_RESPONSE)
+	setup_hooks (a_hooks: CMS_HOOK_CORE_MANAGER)
 			-- <Precursor>
 		do
-			a_response.hooks.subscribe_to_menu_system_alter_hook (Current)
-			a_response.hooks.subscribe_to_block_hook (Current)
-			a_response.hooks.subscribe_to_response_alter_hook (Current)
+			a_hooks.subscribe_to_menu_system_alter_hook (Current)
+			a_hooks.subscribe_to_block_hook (Current)
+			a_hooks.subscribe_to_response_alter_hook (Current)
+			a_hooks.subscribe_to_export_hook (Current)

 				-- Module specific hook, if available.
-			a_response.hooks.subscribe_to_hook (Current, {CMS_RECENT_CHANGES_HOOK})
+			a_hooks.subscribe_to_hook (Current, {CMS_RECENT_CHANGES_HOOK})
 		end

 	response_alter (a_response: CMS_RESPONSE)
@@ -353,4 +358,69 @@ feature -- Hooks
 			end
 		end

+	export_to (a_export_id_list: detachable ITERABLE [READABLE_STRING_GENERAL]; a_export_parameters: CMS_EXPORT_PARAMETERS; a_response: CMS_RESPONSE)
+			-- Export data identified by `a_export_id_list',
+			-- or export all data if `a_export_id_list' is Void.
+		local
+			l_node_type: CMS_CONTENT_TYPE
+			n: CMS_NODE
+			p: PATH
+			d: DIRECTORY
+			f: PLAIN_TEXT_FILE
+			lst: LIST [CMS_NODE]
+		do
+			if attached node_api as l_node_api then
+				across
+					l_node_api.node_types as types_ic
+				loop
+					l_node_type := types_ic.item
+					if
+						l_node_type.name.same_string_general ("page") and then
+						(	a_export_id_list = Void
+							or else across a_export_id_list as ic some ic.item.same_string (l_node_type.name) end
+						)
+					then
+
+							-- For now, handle only page from this node module.
+						lst := l_node_api.nodes_of_type (l_node_type)
+						a_export_parameters.log ("Exporting " + lst.count.out + " nodes of type " + l_node_type.name)
+						across
+							lst as ic
+						loop
+							n := l_node_api.full_node (ic.item)
+							a_export_parameters.log (l_node_type.name + " #" + n.id.out)
+							p := a_export_parameters.location.extended ("nodes").extended (l_node_type.name).extended (n.id.out)
+							create d.make_with_path (p.parent)
+							if not d.exists then
+								d.recursive_create_dir
+							end
+							create f.make_with_path (p)
+							if not f.exists or else f.is_access_writable then
+								f.open_write
+								if attached {CMS_PAGE} n as l_page then
+									f.put_string (json_to_string (page_node_to_json (l_page)))
+								else
+									f.put_string (json_to_string (node_to_json (n)))
+								end
+								f.close
+							end
+						end
+					end
+				end
+			end
+		end
+
+	page_node_to_json (a_page: CMS_PAGE): JSON_OBJECT
+		local
+			j: JSON_OBJECT
+		do
+			Result := node_to_json (a_page)
+			if attached a_page.parent as l_parent_page then
+				create j.make_empty
+				j.put_string (l_parent_page.content_type, "type")
+				j.put_integer (l_parent_page.id, "nid")
+				Result.put (j, "parent")
+			end
+		end
+
 end
--- a/modules/node/export/cms_export_node_utilities.e
+++ b/modules/node/export/cms_export_node_utilities.e
@@ -0,0 +1,55 @@
+note
+	description: "[
+				Routines usefull during node exportation (see {CMS_HOOK_EXPORT}).
+			]"
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	CMS_EXPORT_NODE_UTILITIES
+	
+inherit
+	CMS_EXPORT_JSON_UTILITIES
+	
+feature -- Access
+	
+	node_to_json (n: CMS_NODE): JSON_OBJECT
+		local
+			jo,j_author: JSON_OBJECT
+		do
+			create Result.make_empty
+			Result.put_string (n.content_type, "type")
+			Result.put_integer (n.id, "nid")
+			Result.put_integer (n.revision, "revision")
+			Result.put_string (n.title, "title")
+			put_date_into_json (n.creation_date, "creation_date", Result)
+			put_date_into_json (n.modification_date, "modification_date", Result)
+			put_date_into_json (n.publication_date, "publication_date", Result)
+			Result.put_integer (n.status, "status")
+			if attached n.author as u then
+				create j_author.make
+				j_author.put_integer (u.id, "uid")
+				j_author.put_string (u.name, "name")
+				Result.put (j_author, "author")
+			end
+			create jo.make_empty
+			if attached n.format as l_format then
+				jo.put_string (l_format, "format")
+			end
+			if attached n.summary as s then
+				jo.put_string (s, "summary")
+			end
+			if attached n.content as s then
+				jo.put_string (s, "content")
+			end
+			Result.put (jo, "data")
+			if attached n.link as lnk then
+				create jo.make_empty
+				jo.put_string (lnk.title, "title")
+				jo.put_string (lnk.location, "location")
+				jo.put_integer (lnk.weight, "weight")
+				Result.put (jo, "link")
+			end
+		end
+
+end
--- a/modules/node/node-safe.ecf
+++ b/modules/node/node-safe.ecf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-14-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-14-0 http://www.eiffel.com/developers/xml/configuration-1-14-0.xsd" name="node" uuid="C7114DD4-FA92-4AE5-A209-0FFC45E44257" library_target="node">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-15-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-15-0 http://www.eiffel.com/developers/xml/configuration-1-15-0.xsd" name="node" uuid="C7114DD4-FA92-4AE5-A209-0FFC45E44257" library_target="node">
 	<target name="node">
 		<root all_classes="true"/>
 		<file_rule>
@@ -7,7 +7,7 @@
 			<exclude>/CVS$</exclude>
 			<exclude>/.svn$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="false" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" full_class_checking="false" is_attached_by_default="true" is_obsolete_routine_type="true" void_safety="all" syntax="transitional">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
@@ -17,6 +17,7 @@
 		<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error-safe.ecf"/>
 		<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http-safe.ecf"/>
 		<library name="http_authorization" location="$ISE_LIBRARY\contrib\library\web\authentication\http_authorization\http_authorization-safe.ecf" readonly="false"/>
+		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json-safe.ecf"/>
 		<library name="text_filter" location="$ISE_LIBRARY\unstable\library\text\text_filter\text_filter-safe.ecf"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
 		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf-safe.ecf"/>
--- a/modules/node/node.ecf
+++ b/modules/node/node.ecf
@@ -17,6 +17,7 @@
 		<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error.ecf"/>
 		<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http.ecf"/>
 		<library name="http_authorization" location="$ISE_LIBRARY\contrib\library\network\authentication\http_authorization\http_authorization.ecf" readonly="false"/>
+		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json.ecf"/>
 		<library name="text_filter" location="$ISE_LIBRARY\unstable\library\text\text_filter\text_filter.ecf"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
 		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf.ecf"/>
--- a/modules/node/persistence/cms_node_storage_i.e
+++ b/modules/node/persistence/cms_node_storage_i.e
@@ -127,6 +127,26 @@ feature -- Access
 		deferred
 		end

+	nodes_of_type (a_node_type: CMS_CONTENT_TYPE): LIST [CMS_NODE]
+			-- List of nodes of type `a_node_type'.
+			--| Redefine to optimize!
+		do
+			Result := nodes
+			from
+				Result.start
+			until
+				Result.after
+			loop
+				if Result.item.content_type.same_string (a_node_type.name) then
+					Result.forth
+				else
+					Result.remove
+				end
+			end
+		ensure
+			expected_type: across Result as ic all ic.item.content_type.same_string (a_node_type.name) end
+		end
+
 feature -- Access: outline

 	children (a_node: CMS_NODE): detachable LIST [CMS_NODE]
--- a/modules/node/persistence/cms_node_storage_sql.e
+++ b/modules/node/persistence/cms_node_storage_sql.e
@@ -12,6 +12,9 @@ inherit
 	CMS_PROXY_STORAGE_SQL

 	CMS_NODE_STORAGE_I
+		redefine
+			nodes_of_type
+		end

 	CMS_STORAGE_SQL_I

@@ -264,6 +267,33 @@ feature -- Access
 --			end
 		end

+	nodes_of_type (a_node_type: CMS_CONTENT_TYPE): LIST [CMS_NODE]
+			-- <Precursor>
+		local
+			l_parameters: STRING_TABLE [detachable ANY]
+		do
+			create {ARRAYED_LIST [CMS_NODE]} Result.make (0)
+
+			error_handler.reset
+			write_information_log (generator + ".nodes_of_type")
+			create l_parameters.make (1)
+			l_parameters.put (a_node_type.name, "node_type")
+
+			from
+				sql_query (sql_select_nodes_of_type, l_parameters)
+				sql_start
+			until
+				sql_after
+			loop
+				if attached fetch_node as l_node then
+					check expected_node_type: l_node.content_type.same_string (a_node_type.name) end
+					Result.force (l_node)
+				end
+				sql_forth
+			end
+			sql_finalize
+		end
+
 feature -- Access: outline

 	children (a_node: CMS_NODE): detachable LIST [CMS_NODE]
@@ -495,6 +525,10 @@ feature {NONE} -- Queries
 			-- SQL Query to retrieve all nodes.
 			--| note: {CMS_NODE_API}.trashed = -1

+	sql_select_nodes_of_type: STRING = "SELECT nid, revision, type, title, summary, content, format, author, publish, created, changed, status FROM nodes WHERE status != -1 AND type=:node_type ;"
+			-- SQL Query to retrieve all nodes of type :node_type.
+			--| note: {CMS_NODE_API}.trashed = -1		
+
 	sql_select_node_revisions: STRING = "SELECT nodes.nid, node_revisions.revision, nodes.type, node_revisions.title, node_revisions.summary, node_revisions.content, node_revisions.format, node_revisions.author, nodes.publish, nodes.created, node_revisions.changed, node_revisions.status FROM nodes INNER JOIN node_revisions ON nodes.nid = node_revisions.nid WHERE nodes.nid = :nid AND node_revisions.revision < :revision ORDER BY node_revisions.revision DESC;"
 			-- SQL query to get node revisions (missing the latest one).

--- a/modules/oauth20/cms_oauth_20_module.e
+++ b/modules/oauth20/cms_oauth_20_module.e
@@ -12,7 +12,7 @@ inherit
 			module_api as user_oauth_api
 		redefine
 			filters,
-			register_hooks,
+			setup_hooks,
 			initialize,
 			install,
 			user_oauth_api
@@ -190,12 +190,12 @@ feature -- Router

 feature -- Hooks configuration

-	register_hooks (a_response: CMS_RESPONSE)
+	setup_hooks (a_hooks: CMS_HOOK_CORE_MANAGER)
 			-- Module hooks configuration.
 		do
-			auto_subscribe_to_hooks (a_response)
-			a_response.hooks.subscribe_to_block_hook (Current)
-			a_response.hooks.subscribe_to_value_table_alter_hook (Current)
+			auto_subscribe_to_hooks (a_hooks)
+			a_hooks.subscribe_to_block_hook (Current)
+			a_hooks.subscribe_to_value_table_alter_hook (Current)
 		end

 feature -- Hooks
--- a/modules/openid/cms_openid_module.e
+++ b/modules/openid/cms_openid_module.e
@@ -14,7 +14,7 @@ inherit
 			module_api as user_openid_api
 		redefine
 			filters,
-			register_hooks,
+			setup_hooks,
 			initialize,
 			install,
 			user_openid_api
@@ -166,12 +166,12 @@ feature -- Router

 feature -- Hooks configuration

-	register_hooks (a_response: CMS_RESPONSE)
+	setup_hooks (a_hooks: CMS_HOOK_CORE_MANAGER)
 			-- Module hooks configuration.
 		do
-			auto_subscribe_to_hooks (a_response)
-			a_response.hooks.subscribe_to_block_hook (Current)
-			a_response.hooks.subscribe_to_value_table_alter_hook (Current)
+			auto_subscribe_to_hooks (a_hooks)
+			a_hooks.subscribe_to_block_hook (Current)
+			a_hooks.subscribe_to_value_table_alter_hook (Current)
 		end

 feature -- Hooks
--- a/modules/recent_changes/cms_recent_changes_module.e
+++ b/modules/recent_changes/cms_recent_changes_module.e
@@ -11,7 +11,7 @@ inherit
 		rename
 			module_api as recent_changes_api
 		redefine
-			register_hooks,
+			setup_hooks,
 			permissions
 		end

@@ -94,7 +94,7 @@ feature -- Hook
 				recent_changes_feed (a_response, nb, Void).accept (gen)

 				create b.make (a_block_id, Void, l_content, Void)
-				a_response.put_block (b, Void, False)
+				a_response.add_block (b, Void)
 			end
 		end

@@ -397,12 +397,12 @@ feature -- Handler

 feature -- Hooks configuration

-	register_hooks (a_response: CMS_RESPONSE)
+	setup_hooks (a_hooks: CMS_HOOK_CORE_MANAGER)
 			-- Module hooks configuration.
 		do
-			a_response.hooks.subscribe_to_menu_system_alter_hook (Current)
-			a_response.hooks.subscribe_to_response_alter_hook (Current)
-			a_response.hooks.subscribe_to_block_hook (Current)
+			a_hooks.subscribe_to_menu_system_alter_hook (Current)
+			a_hooks.subscribe_to_response_alter_hook (Current)
+			a_hooks.subscribe_to_block_hook (Current)
 		end

 feature -- Hook
--- a/src/hooks/cms_hook_auto_register.e
+++ b/src/hooks/cms_hook_auto_register.e
@@ -16,11 +16,11 @@ inherit

 feature -- Hook

-	auto_subscribe_to_hooks (a_response: CMS_RESPONSE)
+	auto_subscribe_to_hooks (a_hooks: CMS_HOOK_CORE_MANAGER)
 		local
 			l_manager: CMS_HOOK_CORE_MANAGER
 		do
-			l_manager := a_response.hooks
+			l_manager := a_hooks
 			if attached {CMS_HOOK_MENU_SYSTEM_ALTER} Current as h_menu_system_alter then
 				l_manager.subscribe_to_menu_system_alter_hook (h_menu_system_alter)
 			end
--- a/src/hooks/cms_hook_core_manager.e
+++ b/src/hooks/cms_hook_core_manager.e
@@ -219,7 +219,35 @@ feature -- Hook: cache
 					end
 				end

-				a_response.clear_block_caches (a_cache_id_list)
+				a_response.clear_cache (a_cache_id_list)
+			end
+		end
+
+feature -- Hook: export
+
+	subscribe_to_export_hook (h: CMS_HOOK_EXPORT)
+			-- Add `h' as subscriber of export hooks CMS_HOOK_EXPORT.		
+		do
+			subscribe_to_hook (h, {CMS_HOOK_EXPORT})
+		end
+
+	invoke_export_to (a_export_id_list: detachable ITERABLE [READABLE_STRING_GENERAL]; a_export_parameters: CMS_EXPORT_PARAMETERS; a_response: CMS_RESPONSE)
+			-- Invoke response alter hook for response `a_response'.		
+		local
+			d: DIRECTORY
+		do
+			if attached subscribers ({CMS_HOOK_EXPORT}) as lst then
+				create d.make_with_path (a_export_parameters.location)
+				if not d.exists then
+					d.recursive_create_dir
+				end
+				across
+					lst as ic
+				loop
+					if attached {CMS_HOOK_EXPORT} ic.item as h then
+						h.export_to (a_export_id_list, a_export_parameters, a_response)
+					end
+				end
 			end
 		end

--- a/src/hooks/export/cms_export_json_utilities.e
+++ b/src/hooks/export/cms_export_json_utilities.e
@@ -0,0 +1,35 @@
+note
+	description: "[
+			Usefull routines to export to JSON.
+		]"
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	CMS_EXPORT_JSON_UTILITIES
+
+feature -- Access
+
+	put_date_into_json (dt: detachable DATE_TIME; a_key: JSON_STRING; j: JSON_OBJECT)
+		local
+			hd: HTTP_DATE
+		do
+			if dt /= Void then
+				create hd.make_from_date_time (dt)
+				j.put_integer (hd.timestamp, a_key)
+			end
+		end
+
+	json_to_string (j: JSON_OBJECT): STRING
+		local
+			pp: JSON_PRETTY_STRING_VISITOR
+		do
+			create Result.make_empty
+			create pp.make (Result)
+			j.accept (pp)
+		end
+
+note
+	copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+end
--- a/src/hooks/export/cms_export_parameters.e
+++ b/src/hooks/export/cms_export_parameters.e
@@ -0,0 +1,43 @@
+note
+	description: "[
+			Parameters used by CMS_HOOK_EXPORT subscribers.
+		]"
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	CMS_EXPORT_PARAMETERS
+
+create
+	make
+
+feature {NONE} -- Initialization
+
+	make (a_location: PATH)
+		do
+			location := a_location
+			create logs.make (10)
+		end
+
+feature -- Access
+
+	location: PATH
+			-- Location of export folder.		
+
+feature -- Logs
+
+	logs: ARRAYED_LIST [READABLE_STRING_8]
+			-- Associated exportation logs.
+
+	log (m: READABLE_STRING_8)
+			-- Add message `m' into `logs'.
+		do
+			logs.force (m)
+		end
+
+invariant
+
+note
+	copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+end
--- a/src/hooks/export/cms_hook_export.e
+++ b/src/hooks/export/cms_hook_export.e
@@ -0,0 +1,31 @@
+note
+	description: "[
+			CMS HOOK providing a way to export module data according to specific export parameters.
+		]"
+	date: "$Date$"
+	revision: "$Revision$"
+
+deferred class
+	CMS_HOOK_EXPORT
+
+inherit
+	CMS_HOOK
+
+feature -- Hook	
+
+	export_to (a_export_id_list: detachable ITERABLE [READABLE_STRING_GENERAL]; a_export_parameters: CMS_EXPORT_PARAMETERS; a_response: CMS_RESPONSE)
+			-- Export data identified by `a_export_id_list',
+			-- or export all data if `a_export_id_list' is Void.
+		deferred
+		end
+
+--	export_identifiers: detachable ITERABLE [READABLE_STRING_32]
+--			-- Optional list of exportation ids, if any.
+--		do
+--				-- To redefine if needed.
+--		end
+
+note
+	copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+end
--- a/src/modules/cms_debug_module.e
+++ b/src/modules/cms_debug_module.e
@@ -9,7 +9,7 @@ class
 inherit
 	CMS_MODULE
 		redefine
-			register_hooks
+			setup_hooks
 		end

 	CMS_HOOK_BLOCK
@@ -47,11 +47,11 @@ feature -- Router

 feature -- Hooks configuration

-	register_hooks (a_response: CMS_RESPONSE)
+	setup_hooks (a_hooks: CMS_HOOK_CORE_MANAGER)
 			-- Module hooks configuration.
 		do
-			auto_subscribe_to_hooks (a_response)
-			a_response.hooks.subscribe_to_block_hook (Current)
+			auto_subscribe_to_hooks (a_hooks)
+			a_hooks.subscribe_to_block_hook (Current)
 		end

 feature -- Hooks
--- a/src/persistence/sql/cms_storage_sql_i.e
+++ b/src/persistence/sql/cms_storage_sql_i.e
@@ -302,6 +302,11 @@ feature -- Access
 			l_item := sql_item (a_index)
 			if attached {READABLE_STRING_8} l_item as l_string then
 				Result := l_string
+			elseif
+				attached {READABLE_STRING_32} l_item as l_string_32 and then
+				l_string_32.is_valid_as_string_8
+			then
+				Result := l_string_32.to_string_8
 			elseif attached {BOOLEAN} l_item as l_boolean then
 				Result := l_boolean.out
 			elseif attached {BOOLEAN_REF} l_item as l_boolean_ref then
--- a/src/service/cms_api.e
+++ b/src/service/cms_api.e
@@ -24,6 +24,7 @@ feature {NONE} -- Initialize
 			setup := a_setup
 			create error_handler.make
 			create {CMS_ENV_LOGGER} logger.make
+			create hooks.make
 			initialize
 		ensure
 			setup_set: setup = a_setup
@@ -51,6 +52,7 @@ feature {NONE} -- Initialize
 			l_enabled_modules := setup.enabled_modules
 			enabled_modules := l_enabled_modules

+
 				-- Complete storage setup.
 			storage.set_api (Current)

@@ -82,6 +84,9 @@ feature {NONE} -- Initialize
 					l_enabled_modules.remove (ic.item)
 				end
 			end
+			
+				-- Initialize hooks system
+			setup_hooks
 		end

 	initialize_formats
@@ -302,6 +307,32 @@ feature -- Query: module
 			end
 		end

+feature -- Hooks
+
+	hooks: CMS_HOOK_CORE_MANAGER
+			-- Manager handling hook subscriptions.
+
+feature {NONE} -- Hooks
+
+	setup_hooks
+		local
+			l_module: CMS_MODULE
+			l_enabled_modules: CMS_MODULE_COLLECTION
+			l_hooks: like hooks
+		do
+			l_hooks := hooks
+			l_enabled_modules := enabled_modules
+			across
+				l_enabled_modules as ic
+			loop
+				l_module := ic.item
+				if attached {CMS_HOOK_AUTO_REGISTER} l_module as l_auto then
+					l_auto.auto_subscribe_to_hooks (l_hooks)
+				end
+				l_module.setup_hooks (l_hooks)
+			end
+		end
+
 feature -- Query: API

 	user_api: CMS_USER_API
--- a/src/service/cms_module.e
+++ b/src/service/cms_module.e
@@ -129,7 +129,7 @@ feature -- Router

 feature -- Hooks configuration

-	register_hooks (a_response: CMS_RESPONSE)
+	setup_hooks (a_hooks: CMS_HOOK_CORE_MANAGER)
 			-- Module hooks configuration.
 		require
 			is_enabled: is_enabled
--- a/src/service/response/cms_response.e
+++ b/src/service/response/cms_response.e
@@ -33,8 +33,6 @@ feature {NONE} -- Initialization
 			get_theme
 			create menu_system.make
 			initialize_block_region_settings
-			create hooks.make
-			register_hooks
 		end

 	initialize_site_url
@@ -66,23 +64,6 @@ feature {NONE} -- Initialization
 			site_url_ends_with_slash: site_url.ends_with_general ("/")
 		end

-	register_hooks
-		local
-			l_module: CMS_MODULE
-			l_enabled_modules: CMS_MODULE_COLLECTION
-		do
-			l_enabled_modules := api.enabled_modules
-			across
-				l_enabled_modules as ic
-			loop
-				l_module := ic.item
-				if attached {CMS_HOOK_AUTO_REGISTER} l_module as l_auto then
-					l_auto.auto_subscribe_to_hooks (Current)
-				end
-				l_module.register_hooks (Current)
-			end
-		end
-
 feature -- Access

 	request: WSF_REQUEST
@@ -653,13 +634,9 @@ feature -- Blocks
 			-- and check optional associated condition.
 			-- If no condition then use `is_block_included_by_default' to
 			-- decide if block is included or not.
-		local
-			l_region: detachable like block_region
 		do
 			if is_block_included (b.name, is_block_included_by_default) then
-				l_region := block_region (b, a_default_region)
-				l_region.extend (b)
-				blocks.force (b, b.name)
+				add_block (b, a_default_region)
 			end
 		end

@@ -872,6 +849,9 @@ feature -- Hooks

 	hooks: CMS_HOOK_CORE_MANAGER
 			-- Manager handling hook subscriptions.
+		do
+			Result := api.hooks
+		end

 feature -- Menu: change

@@ -997,6 +977,17 @@ feature -- Element Change
 			status_code_set: status_code = a_status
 		end

+feature -- Cache managment
+
+	clear_cache (a_cache_id_list: detachable ITERABLE [READABLE_STRING_GENERAL])
+			-- Clear caches identified by `a_cache_id_list',
+			-- or clear all caches if `a_cache_id_list' is Void.	
+		do
+			if has_permissions (<<"clear blocks cache", "admin core caches">>) then
+				clear_block_caches (a_cache_id_list)
+			end
+		end
+
 feature -- Generation

 	prepare (page: CMS_HTML_PAGE)
--- a/tools/install.bat
+++ b/tools/install.bat
@@ -50,12 +50,14 @@ set TMP_CONTRIB_DIR=%TMP_TARGET_DIR%\contrib
 set TMP_UNSTABLE_DIR=%TMP_TARGET_DIR%\unstable

 echo Install ROC as CMS ewf
+%SAFE_RMDIR% %TMP_UNSTABLE_DIR%\library\cms\launcher
 %SAFE_RMDIR% %TMP_UNSTABLE_DIR%\library\cms\library
 %SAFE_RMDIR% %TMP_UNSTABLE_DIR%\library\cms\src
 %SAFE_RMDIR% %TMP_UNSTABLE_DIR%\library\cms\doc
 %SAFE_RMDIR% %TMP_UNSTABLE_DIR%\library\cms\modules
 %SAFE_RMDIR% %TMP_UNSTABLE_DIR%\library\cms\examples

+%COPYCMD% %TMP_DIR%\launcher	%TMP_UNSTABLE_DIR%\library\web\cms\launcher
 %COPYCMD% %TMP_DIR%\library	%TMP_UNSTABLE_DIR%\library\web\cms\library
 %COPYCMD% %TMP_DIR%\src	%TMP_UNSTABLE_DIR%\library\web\cms\src
 %COPYCMD% %TMP_DIR%\doc	%TMP_UNSTABLE_DIR%\library\web\cms\doc
Author	SHA1	Message	Date
Jocelyn Fiat	420051cd14	Redesigned hooks system (moving from CMS_RESPONSE to CMS_API). Indeed, hooks does not require RESPONSE interface, and should be setup before, at the system level (i.e CMS_API) Added exportation solution via CMS_HOOK_EXPORT. Updated blocks settings for demo example project.	2015-11-09 21:07:02 +01:00
Jocelyn Fiat	6b3ff6f980	Fixed list item computation for ini file, especially with included ini file.	2015-11-02 21:07:26 +01:00
Jocelyn Fiat	360855a558	Fixed recent_changes module to allow alias of recent_changes blocks. Factorized code in CMS_RESPONSE by reusing add_block.	2015-11-02 18:54:30 +01:00
Jocelyn Fiat	6aaec0be9f	Fixed table item computation for ini file, especially with included ini file.	2015-11-02 18:10:27 +01:00
Jocelyn Fiat	cb6d13b5f7	Updated gcse library to use unique own uuid in ecf file.	2015-11-02 14:38:36 +01:00
Jocelyn Fiat	951c977892	Use relative paths from google_search ecf files to other local cms library .ecf files.	2015-11-02 14:33:14 +01:00
Jocelyn Fiat	2a4ebfa12e	Updated google search libary ecf files to have better void-safe .ecf file.	2015-11-02 14:22:41 +01:00
Jocelyn Fiat	955852747a	Include google_search engine in example/demo installation script.	2015-11-02 11:18:45 +01:00
Jocelyn Fiat	23fe22cad1	Google search module: - cleanup unwanted file - fixed bad indentation in html template.	2015-11-02 11:16:54 +01:00
Jocelyn Fiat	da4b36869a	Include the launcher during installation (install.bat).	2015-11-02 10:50:27 +01:00
Jocelyn Fiat	5624892ebc	Updated code related to cache management in CMS core and modules.	2015-11-02 10:50:05 +01:00
jvelilla	e40a7969fa	Merge branch 'jvelilla-roc_gcse'	2015-10-26 10:51:51 -03:00
jvelilla	67fdd357df	Merge branch 'master' of https://github.com/EiffelWebFramework/ROC into roc_gcse Conflicts: examples/demo/demo-safe.ecf	2015-10-23 16:48:25 -03:00
Jocelyn Fiat	5b0ab76434	Fixed more unicode issues, or being more flexible when loading from database.	2015-10-20 19:02:04 +02:00
jvelilla	193760b34f	Remove unneeded file.	2015-10-14 11:57:06 -03:00
jvelilla	9263f31521	Renamed module name to google_search (custom_search) Clean code. Updated google custom search to handle quota limit and no query submit. Updated encoding issues for input searches: like "void safe" and "void + safe".	2015-10-14 11:51:59 -03:00
jvelilla	454d92f85b	Merge https://github.com/EiffelWebFramework/ROC into roc_gcse	2015-10-14 11:45:33 -03:00
jvelilla	0e63c14613	Added Module Custom Search Added Google custom search library Added HTTP client extension libaray Updated demo example to use the Module Custom Search	2015-10-13 10:23:30 -03:00