Drupal 6 Port
Rob Loach - October 5, 2007 - 06:54
| Project: | Flickr |
| Version: | 6.x-1.x-dev |
| Component: | Code |
| Category: | task |
| Priority: | normal |
| Assigned: | Unassigned |
| Status: | closed |
Description
Now that the Drupal 6 betas are coming out, it's time to start thinking about porting the Flickr module to Drupal 6.
#1
Here's a patch to update the main Flickr module. Anyone else working on this?
#2
HorsePunchKid, thanks for working on this. what are your thoughts on #124403 it seems like it'd be a good feature to add before forking for D6...
#3
Hmmmm, looks like there are big things going on there. I'd say once that gets committed, I can merge those features into this patch. In the meantime, I don't mind chasing the progress of the dev version (e.g. those last few patches that got committed). At this point, I'm just kind of working on this to get more experience with D6 development.
This patch gets the filter and block working. The flickr_sets module is sort of working but definitely needs work. In particular, I need to learn how to do more sophisticated authorization with the new menu system and iron out some kinks with the wildcards.
Will update against the cvs head soon...
#4
This patch is up to date with the recent improvements in CVS head, and tags are now sort of working. There are menu (e.g. weird local task behavior) and access control problems (e.g. blocked users' photos) to work out still, and a couple of errors to track down.
#5
Steven, what branch/tag of the Flickr module should your patch be applied against? It has a couple of rejects against the DRUPAL-5 branch:
$ cvs checkout -r DRUPAL-5 -d flickr contributions/modules/flickr$ cd flickr
$ wget http://drupal.org/files/issues/flickr-6.x-1.x_port_4.patch
$ patch -p0 < flickr-6.x-1.x_port_4.patch
patching file block/flickr_block.info
patching file block/flickr_block.module
Hunk #1 FAILED at 192.
1 out of 1 hunk FAILED -- saving rejects to file block/flickr_block.module.rej
patching file field/flickrfield.info
patching file filter/flickr_filter.info
patching file filter/flickr_filter.module
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n] y
Hunk #1 FAILED at 12.
Hunk #2 FAILED at 103.
2 out of 2 hunks FAILED -- saving rejects to file filter/flickr_filter.module.rej
patching file flickr.admin.inc
patching file flickr.inc
patching file flickr.info
patching file flickr.install
Hunk #1 FAILED at 2.
1 out of 1 hunk FAILED -- saving rejects to file flickr.install.rej
patching file flickr.module
patching file sets/flickr_sets.info
patching file sets/flickr_sets.module
patching file tags/flickr_tags.info
patching file tags/flickr_tags.module
#6
Also, Steven, would you mind posting your patched 6.x version of the module as a zip file - this would get more eyeballs on it to shake out any bugs, as most people won't go to the trouble of trying to patch it from CVS.
#7
Hi there, Arto. I think the patch should have applied to the CVS head. I'll check it out in the next few hours and see if I can make sure that's the case. I'm trying to use a bzr repo inside my CVS checkout in order to keep track of changes; I could easily have mucked it up somehow.
Good idea to post the zip file. Just beware that even if it appears to work, it may well not be ready for production use. For example, some of the access checks which were embedded in the menu logic haven't gotten ported over yet.
#8
Bazaar is so great! This patch should apply cleanly to CVS head. I haven't double checked it, but I did update to head and then merge back in my changes.
#9
Looking forward to this working in D6! May have some time to help in the next few days...
#10
subscribe
#11
subscribing
#12
Here's a somewhat minor update. The patch should apply against the current HEAD again. It cleans up a few warnings and restores the permission behavior. I'm sitll getting this notice on some of the pages under
/flickr/<userid>:notice: Undefined offset: 3 in .../includes/menu.inc on line 568.Something to do with how I defined the menus, I'm sure, but I can't seem to track down the problem. It must be some kind of conflict between one menu item expecting parameters in positions 1 and 3 and another item only expecting a parameter in position 1. There are also some "local task" menu items that always appear but in fact should only appear if the last parameter is defined, and I'm not quite sure how to manage that yet.
I still haven't touched the CCK module, aside from updating the info file.
#13
subscribe
#14
once we get this straightened out i'm going to go ahead and commit it. any new development will happen in 6.x and need to be backported.
#15
Any idea when we'll see the 6.x version?
not sure how to apply the patch with what you've provided
S>
#16
I re-opened HEAD and copied in the latest version from DRUPAL-5. Tried to apply this patch:
amorton@minivac:~/Sites/d6/sites/all/modules/flickr% patch -p0 -i flickr-6.x-1.x_port_12.patchpatching file flickr.admin.inc
patching file block/flickr_block.info
Hunk #1 succeeded at 1 with fuzz 1.
patching file block/flickr_block.module
patching file field/flickrfield.info
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file field/flickrfield.info.rej
patching file filter/flickr_filter.info
Hunk #1 succeeded at 1 with fuzz 1.
patching file filter/flickr_filter.module
patching file flickr.inc
patching file flickr.info
patching file flickr.install
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file flickr.install.rej
patching file flickr.module
patching file sets/flickr_sets.info
Hunk #1 succeeded at 1 with fuzz 1.
patching file sets/flickr_sets.module
patching file tags/flickr_tags.info
Hunk #1 succeeded at 1 with fuzz 1.
patching file tags/flickr_tags.module
#17
I updated to head and reapplied the differences. This patch seems to apply cleanly. I made an effort to get the CCK field working again, but it's going to take a lot more work; things are dramatically different in 6 and not documented all that well yet.
#18
This version should fix those lingering menu problems, so as far as I know, this is working quite well except for the CCK field. No promises on that one.
#19
i'm going to go ahead and commit this so people can start testing the module out. report any other problems in follow up issues.
#20
Sounds good. I'll open an issue for the CCK field port. Could you add a component for it in the project? I notice the other sub-modules have them.
#21
sure, just added one.
#22
Automatically closed -- issue fixed for two weeks with no activity.