port to Drupal 4.7.0

February 7:
This patch does not apply cleanly to the tarball downloaded from http://messze.net/files/subscription-cvs-211005.tgz

It is appliable to CVS HEAD version but doses not works correctly.

/user/2/subscriptions


* user warning: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'condition,cid) VALUES (3,2,'node','a:1:{s:4:\"type\";s:5:\"story query: INSERT INTO subscription_subscriptions (sid,uid,object,condition,cid) VALUES (3,2,'node','a:1:{s:4:\"type\";s:5:\"story\";}',2) in /data/www/alkozpont.net/alkozpontnet/root/includes/database.mysql.inc on line 120.
* user warning: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'condition' at line 1 query: SELECT s.*,c.name,c.id FROM subscription_subscriptions s LEFT JOIN subscription_channels c ON s.cid=c.cid WHERE s.uid = 2 ORDER BY uid, cid, object, condition in /data/www/alkozpont.net/alkozpontnet/root/includes/database.mysql.inc on line 120.


Mea culpa. Forgot to patch mysql scheme definiton.

1. patch http://messze.net/files/subscription-cvs-211005.tgz with the mysql patch
http://drupal.org/files/issues/subscription_1.patch

2. apply this patch.

3. read error messages before sending bugreports. :)

Am I applying this patch wrong, or doing something else goofy?
I did the following:

1) Downloaded http://messze.net/files/subscription-cvs-211005.tgz

2)
$ patch < subscription_1.patch
patching file subscription.module
patching file subscription.mysql

3)
$ patch < subscription-4.7.0.patch
patching file subscription.module
Hunk #1 FAILED at 121.
Hunk #2 succeeded at 140 with fuzz 1 (offset -1 lines).
Hunk #3 FAILED at 242.
Hunk #4 FAILED at 517.
Hunk #5 succeeded at 601 (offset -5 lines).
Hunk #6 succeeded at 629 with fuzz 2 (offset -5 lines).
Hunk #7 FAILED at 650.
4 out of 7 hunks FAILED -- saving rejects to file subscription.module.rej

I'm goofy 2

I recieved the same errors as the last comment (kayfish) when attempting to test the patch. Reviewing all the comments seems to indicate some confusion concerning the process. We have two versions of drupal (4.6 and 4.7), two sources of subscription.module (drupal cvs and messze cvs), and two patches (subscription_1.patch and subscription-4.7.0.patch). I suspect I'm are mixing this deck in ways that stops my ability to test the patch.

Please provide a clear set of steps identifing which version of drupal, which module and which patches and their locations. I look forward to helping you test this patch(s).

Even better
Update subscription CVS version in drupal, create a single patch (not two) and identify which version of durpal (ex 4.7 beta 6 or current drupal cvs) we are to test against. This is closer to the standard process for testing patches in drupal (as far as I understand it) and would help facilitate testing.

This looks potentially like a great module. Thanks for all your effort.

my platform - drupal 4.7 beta 5, php 5, mysql 5, FC 5

Funny, some of my post #4 was somehow cutoff in the last week or so.
I wonder where it went.

kayfish - your correct - it seems as though your post was modified. I think this is the same error as you had prior to the editing of your post. This is from my records and I tried a couple different mixes of drupal, module and patches. So I hope it helpful.

1) Downloaded http://messze.net/files/subscription-cvs-211005.tgz

unpack

OR are we supposed to download the CVS subscriptions

2)
$ patch < subscription_1.patch
patching file subscription.module
patching file subscription.mysql

3)
$ patch < subscription-4.7.0.patch
patching file subscription.module
Hunk #1 FAILED at 121.
Hunk #2 succeeded at 140 with fuzz 1 (offset -1 lines).
Hunk #3 FAILED at 242.
Hunk #4 FAILED at 517.
Hunk #5 succeeded at 601 (offset -5 lines).
Hunk #6 succeeded at 629 with fuzz 2 (offset -5 lines).
Hunk #7 FAILED at 650.
4 out of 7 hunks FAILED -- saving rejects to file subscription.module.rej

To reiterate. I would like to test this patch, but we need some clarification on the process. I suspect the issue may be simply a bad mix of drupal versions, versions of the module combined with multiple patches.

kayfish,

My last post was also trucated. Here is another try, but I will drop some internal coding, changing it to the word 'with'.

Just to reiterate. We seem to have several module sources and several patches. A simple complete step by step process may clear up the confusion by some of use that would be happy to test this port.

The process that I tried - which failed
1) Downloaded http://messze.net/files/subscription-cvs-211005.tgz

unpack

OR are we supposed to download the CVS subscriptions

2)
$ patch with subscription_1.patch
patching file subscription.module
patching file subscription.mysql

3)
$ patch with subscription-4.7.0.patch
patching file subscription.module
Hunk #1 FAILED at 121.
Hunk #2 succeeded at 140 with fuzz 1 (offset -1 lines).
Hunk #3 FAILED at 242.
Hunk #4 FAILED at 517.
Hunk #5 succeeded at 601 (offset -5 lines).
Hunk #6 succeeded at 629 with fuzz 2 (offset -5 lines).
Hunk #7 FAILED at 650.
4 out of 7 hunks FAILED -- saving rejects to file subscription.module.rej

Thx,

I commited it to cvs repo, so everybody could test it