Integrate V2 code

@mxwright: Thanks for your work on this. I'm having trouble testing your patch. Is it working for you or is it a work in progress?

I configured GSE as the default search and enter my GSE ID, but when I make a search the page refreshes with no results, and the browser console logs this error:

GET http://www.google.com/uds/?file=ads&v=3&packages=search&async=2 net::ERR_BLOCKED_BY_CLIENT

Any ideas?

Ok, I was able to get your patch working. I had to configure the custom search at Google to use 'results only' and then also change the default query parameter in the Google settings to query instead of the default q. Does this sound right? Would it make sense to change the query parameter to Google's default of q instead so additional configuration isn't necessary or am I missing something? Thanks!

Ok, I guess the confusing part for me was needing to change the default query parameter on the Google CSE settings from q to query in order to make the module even work. I didn't find this documented anywhere. Is this required or am I missing something? Here is a screenshot:

I had the same problem. On my site module works with f.e. old google cse created 4 years ago but not with new cse.
Patch from #4 helped me.

Showing the screen shot only once int the issue summary.

Seems that the project is currently developed on GitHub. I ported the patch for the current GitHub 7.x-2.x-dev version. I'll also crate a pull request there.

So far it's working for me (I didn't change the code from #4), although not looking beautiful. I'll try to split the block into two blocks, one for the search form and one for the results (to integrate it better into panels).

There was some more stuff added by alex-moreno on GitHub which caused the notice:

Notice: Undefined index: page in google_cse_search_page() (line 62 of /sites/all/modules/contrib/google_cse/google_cse.module).

I guess for google cse advanced which caused an error. I fixed that but didn't test, as I am not using the google cse advanced.

osopolar You missed a closure on .module file on google_cse_search_page function (line 65)

@ronigal: You mean $output['suffix']['#markup'] = '</ol>' . theme('pager');?

New patch attached.

Hi osopolar,

I am more focused in the paid version, so it's great that you can have one eye on the free one. Let me test it and get it merged.

Thank you.

Isn't the paid version covered by the module Google Site Search, or is that for an other google product. Anyway, currently we are working with the free version.

Actually I am confused which version is the actual dev version. As I wrote in #13 i think the most actual version is the one on GitHub: https://github.com/Capgemini/google_cse (see also google_cse module page). At least that is the version I am currently using.

@mxwright: One more thing: you might use spaces to indent code, not tabs, and avoid trailing spaces, see for example (and other places):

+  );
+  ¶
+  $form['google_cse']['advanced']['google_cse_custom_results_display'] = array(
+    '#title' => t('Layout of Search Engine'),
+    '#type' => 'radios',
+    '#default_value' => variable_get('google_cse_custom_results_display', '<gcse:search></gcse:search>'),
+    '#options' => array(
+      '<gcse:search></gcse:search>' => t('Overlay'),
+      '<gcse:searchbox-only></gcse:searchbox-only><gcse:searchresults-only></gcse:searchresults-only>' => t('Two page'),
+	  '<gcse:search></gcse:search> ' => t('Full width'),

+++ b/google_cse.module
@@ -65,37 +69,35 @@ function google_cse_search_page($results) {
+  ¶
+  if (!$results) {
+    // No results found.
+    $output['search_results'] = array('#markup' => theme('google_cse_search_noresults'));
+   ¶
+    return $output;
+  }

Yes, osopolar, last one is the one in github. And your previous question, this module is the result of integrating another module which covered the paid version, into this one to avoid duplication. Why there is a third module I can't tell you atm, we are just using that one since 3 or 4 years ago and we are trying to contribute it back as often as we can.

We are reviewing / testing this in the next days and get it merged, thank you all for your contributions.

@mxwright: I didn't mean the '<gcse:search></gcse:search> '. If you use the Dreditor Browser Script you will easily see in the patch review what I mean (the little red rectangles inside green code). Anyway, these are just minor coding standard issues.

@urwen: Yes, thanks for your contribution. I don't use Google Site Search because its for the payed version only and my customer wants just the free version of CSE. Anyway, maybe it's worth joining forces, or maybe gss is something different, I don't know. It seems that its there for a while, since late 2011.

I tried the patch in #23 and got lots of failed hunks. Tried against the current "7.x-2.x" branch in the GitHub repo.

Also tried against "7.x-2.x" from Drupal.org to no avail.

No success also against the non-standard "develop" branch in GitHub. I could not find the "7.x-2.x-dev" mentioned elsewhere in this issue.

(BTW, I noticed that the GitHub repo have a completely disconnected commit history from the one in D.o. Wtf?! This will make updating the D.o repo more difficult and error-prone in the future.)

Folks, we have to move forward with this issue. Many of you may not have noticed (or be affected by) it yet, but Google entirely removed IFRAME support from new CSEs, which means that the current release still works for old CSEs, but for new ones it does not work anymore.

I am more than willing to help this issue move forward, so as a start I will be glad if someone could clarify which repo is more active, and which branch 7.x development is actually taking place.

I haven't tested the patches from mxwright. I am still using the one from #16 and waiting for news from urwen's review (see #24).

@osopolar, mxwright says that the latest dev is in GitHub, but I failed to apply the patch to any 7.x branch there.

In fact, first of all it would be important that the developers clean up this branch hell in favour of the Release naming conventions, as this will help everyone. It should be immediate to tell where the current development is being carried on, just by looking at branches and the commit log, which cannot be done now.

This is a somewhat important module, IMHO, and this issue deserve more attention. As I said, the current release is broken for most new users.

I applied the patch successfully against 7.x-2.x-dev found here:

https://www.drupal.org/node/131984/release

I do agree this module should either live on d.o. or github...not great having outdated/broken version here.

I have to do some cleaning next days that I think I'll have some time, I'll try to solve this mess asap. Any volunteers welcome though.

Thank you guys.

@mcunningham, I have no problem in using GitHub and D.o infrastructure and same time (I mean staying in D.o only is preferable, but going GH is also ok). By using git, is easy to coordinate commits between the two repos, and handle development in both fronts. The problem arises when we have two disconnected repos as we have now. You'll have to resort to manual patching and cherry-picked commits to bring everything in sync. This is not an easy task.

@urwen, I volunteer to help in any task that is going to help us move forward. Just let me know what you need!

@mxwright, thanks for the update.

@mxwright Thanks for pushing this forward. I was looking again at your patch.

1. The new variables need to be added to google_cse_uninstall() (would be the same for my patch in #13).
2. I wouldn't use markup as keys for the settings in Layout of Search Engine, as logic and presentation should be separated.

Just for information of everyone, the patch in #33 applies cleanly to the commit tagged "7.x-2.0-alpha1" in D.o repository.

2. I wouldn't use markup as keys for the settings in Layout of Search Engine, as logic and presentation should be separated.

I second that. This is the first thing that grabbed my attention when reviewing the patch.

BTW, see #2540256: Make git repositories standard compliant and in sync for an in-depth analysis of the D.o/GH repo differences -- and what should be done to bring them in sync. I hope the maintainers sort out this branch hell ASAP, as the current situation makes contribution difficult.

ok, first of all, thanks for the feedback. I am doing some house keeping. I have to say that when you clone the code it clearly says that current branch is 2.2, but agree on doing some cleaning.

Code is now merged in branch 2.3, which I'll create as default and will merge any other improvements that we have left, if that's ok with everyone. I don't want to add more confusion, but is something is wrong we can go back easily to 2.2 and start again.

Github... Let's forget about that. It probably made sense some time ago, when the development of this module was quite active from our side, but not anymore as we don't commit as many improvements as we use to do. I don't mind to create patches and respect D.o workflow.

Let's progress from here. Thanks again.

Sorry, I meant 7.x-2.x. That is the default branch and the one to commit against, just merged it.

The new implementation of GSE V2 API seems to have broken the search box block. This is because there is no way to inform the search engine what the query param is. If you look at the API spec (https://developers.google.com/custom-search/docs/element), you'll see it is now set with a queryParameterName value on the component. So for <gcse:search> it should be <gcse:search queryParameterName="query">.

The update also seems to remove passing the query param as a GET param, and I cannot find any way that the search page is supposed to receive it instead. In 7.x-2.1, there was a 301 redirect in google_cse_search_execute() that would take the POST params and convert them to GET params.

Hi @pianomansam ,

could you confirm if the previous tag (7.x-2.1) works ok? That way I'll roll back to that one as the default for the 7.x and leave the development branch pending to fix this.

@urwen, I wish I could successfully test 7.x-2.1, but it looks like the V1 API is starting to be phased out. I'm getting this error from Chrome:

Refused to display 'http://www.google.com/cse?cx=XXXXXXXXXXXXXX&cof=FORID%…0%26cof%3DFORID%253A11%26sitesearch%3D&siteurl=XXXXXXX' in a frame because it set 'X-Frame-Options' to 'SAMEORIGIN'.

@urwen, thank for your promptly reply! As of using GitHub, as I said, I think that it is a great tool, but you have to reserve energy to bridge the differences in workflow. The most important thing to remember is: if you decide to go GH again, it will be OK, just remember to clone here and push there so that both repos have the same history!

@pianomansam,

The new implementation of GSE V2 API seems to have broken the search box block. This is because there is no way to inform the search engine what the query param is. If you look at the API spec (https://developers.google.com/custom-search/docs/element), you'll see it is now set with a queryParameterName value on the component. So for it should be .

The update also seems to remove passing the query param as a GET param, and I cannot find any way that the search page is supposed to receive it instead. In 7.x-2.1, there was a 301 redirect in google_cse_search_execute() that would take the POST params and convert them to GET params.

Patch is now committed do 2.3, so please open new issues to track this, because these problems are unrelated to (even though may be introduced by) this patch. Thanks.

@urwen, I wish I could successfully test 7.x-2.1, but it looks like the V1 API is starting to be phased out. I'm getting this error from Chrome:

IFRAME CSEs are not supported anymore by Google. Old CSEs still work, but in newly created CSEs you are not given an option to use IFRAMEs. I have mentioned a few comments above that the module is not working for new CSEs anymore -- and that's what makes this issue so urgent.

@flaviovs let's keep it simple, one year ago made sense for us. Now we are not contributing that often, so we can focus on drupal workflow for this module

I'll be closing the issue as suggested, given that it's a different problem. There are a couple of coding issues in the comments so if anyone wants to create a new patch on top of the 2.x version please. I though it was more urgent to have things rolling.

Thank you

Ok, thanks for the feedback. I am working on the issues right now, and will keep you informed in the issue queue.

Just a note regarding changing the Query Parameter Name: it seems to have moved inside Google CSE's interface from the "Get the code" page to the "Search features > Websearch Settings > Query Parameter Name" (last field).
The interface is a bit extensive, so it took me a while to find it. I hope this helps others.