Closed (fixed)
Project:
Location
Version:
6.x-3.x-dev
Component:
Code
Priority:
Normal
Category:
Task
Assigned:
Unassigned
Reporter:
Created:
17 Nov 2006 at 22:31 UTC
Updated:
26 Feb 2007 at 17:17 UTC
Jump to comment: Most recent file
Hello,
I haven't even tested this, but it's a patch that attempts to bring Location up to 5.0. I just followed the handbook update page line by line.
There are a couple of TODOs that I added and a couple of changes I made (particularly to t() strings) that are not strictly related to 5.0 upgrade, so my apologies for clouding the patch with those.
I wanted to get it out here before anyone else spends time doing similar work. I also removed the .mysql file since that file is no longer necessary (right?).
| Comment | File | Size | Author |
|---|---|---|---|
| #38 | location_georss.patch | 1.92 KB | geodaniel |
| #37 | location.module_patch | 869 bytes | francisu |
| #34 | location_help_link.patch | 5.94 KB | drewish |
| #33 | location-settings-link.patch | 1.36 KB | geodaniel |
| #23 | location.port.patch | 34.43 KB | ankur |
Comments
Comment #1
simeI'm only using location sparingly, but I can say that this patch applies without error.
Installs without error and allows me to update the settings.
Comment #2
webchickSome additional fixes:
- Changed "form_render" to "drupal_render"
- Fixed some errors with t()s still using % resulting in HTML in the string.
- Removed extra admin/settings/location path.
- Added drupal_get_form + callback arguments syntax for settings pages.
Marking code needs work because:
- The location search form is still messed up
- I'm not seeing location fields on node edit pages
- Haven't tested user locations yet, but I'm reasonably positive they won't work.
Unfortunately, I've used up my allotted time to port this module, so hopefully someone else can take it home the rest of the way.
Comment #3
m3avrck commentedSubscribing to issue, I may be able to provide some help soon.
Comment #4
AjK commentedSubscribing to issue as I have been tasked with :-
If anyone is working on this right now, please let me know, it may save me a whole bunch of time ;)
Comment #5
AjK commentedThis needed doing also http://drupal.org/node/64279#node-type-settings
Patch re-rolled to include
Comment #6
bdragon commentedSubscribing
Comment #7
michaelfavia commentedrerolled to include location and location_views info files with a dependency on views and remove the help items as appropriate. Someone may want to add version information. Additionally i just noticed that "/admin/settings/location/geocoding/us/google" does not work. I'll take a look into this but patches welcome.
Comment #8
michaelfavia commentedmy mistake. patch was reversed. this is updated and the right direction. sorry for the spam.
Comment #9
Colin Brumelle commentedsubscribing
Comment #10
jasonwhat commentedSo is there a 5.0 version available?
Comment #11
Zack Rosen commentedsubscribing
Comment #12
seanrsubscribing
I'll be testing the patch over the next week or two.
And should the priority maybe be bumped up a bit? It's getting awful late in the 5.0 development cycle to not have such a crucial module ported...
Comment #13
ankur commentedI'd recommend a pause on further work for this task as I am currently working on a feature request from a client that involves enabling multiple locations for users/nodes. I don't know how much it will invalidate the hours of work already spent on the port patches, but if it ends up changing the module too much, I'll take the port on myself.
-Ankur
Comment #14
seanrI think too long a pause is unacceptable. If you want to fork it for the client and come back to this later, fine, but a lot of us need this sooner rather than later. We want to be able to use Drupal 5.0 for our new clients in the next political cycle (since it'll almost certainly be released within the next month or two) and a significant delay in this module would really kill us as we use it on every one of our sites.
Comment #15
gregglesSeanr - I think you propose a reasonable path:
Include a basic upgrade as Location-5--1 and then include this new feature as Location-5--2. Simple enough and that's why we have the new release system that dww built for us!
However, if you feel passionately about this the best way to make it happen is not to discuss the priority nor the needs of your clients but instead test, modify, and reroll the patch. If we have a fully functional tested patch sitting in this issue I assume Ankur would apply it and make the branch/tag as you request. As it stands, there are lots of TODOs and at least a few areas that are untested. So, let's get cracking on finishing it off and testing it on a variety of sites and THEN we can discuss the exact roadmap for Location.
Comment #16
m3avrck commentedI agree with Greg's approach.
It also might not be too unreasonable to see if anyone else is interested in being a maintainer with Ankur -- I know that would help alleviate the long pauses for everyone. I'm not sure if anyone can/wants to do that nor if Ankur wants that, but just thought I'd throw that suggestion out there :-)
Comment #17
seanrThanks. I'll be doing this this week.
BTW, Merry Christmas!
Comment #18
m3avrck commentedMultiple locations patch has landed, resume patch for 5 now??
Comment #19
drewish commentedi'm all for getting this going. location is the only module on my site that hasn't been updated.
Comment #20
hickory commentedMe too; we really need a DRUPAL-5 branch, and these changes are all pretty basic.
Comment #21
ankur commentedPorting and branching to DRUPAL-5 is the next priority. My personal deadline for it is the end of MLK Day (Monday Jan 15th), though most likely it will be done before that.
I actually plan on doing some work on it tonight. I don't suspect that it should take more than an hour or two over 3-4 weeknights.
-Ankur
Comment #22
designerbrent commentedSubscribing to follow
Comment #23
ankur commentedSo, I've committed the attached as the current patch to HEAD to bring location upto 5.0. However, I wanna give it a day or two of testing before I branch it for 5.0 in CVS. All other new features and whatnot will be considered once the existing functionality is verified as bug-free (or at least as bug-free as the latest 4.7 version). In anycase, I added some extra stuff to the port patch when I discovered a couple of minor errors (such as the missing display of locations in the node-view because of changes to nodeapi).
In anycase, if anyone finds something broken in this HEAD version that wasn't broken in 4.7, please report it here. I'll give it 2-3 days before the next commit (if one is necessary) before branching to DRUPAL-5.
To greggles, webchick, and michaelfavia, I want to give you guys a big thanks for submitting the patches. Because of recent changes made to 4.7/HEAD, the patches you guys submitted wouldn't apply directly via the UNIX 'patch' utility, but it still saved me hours of time since I was just able to go thru the diffs manually and apply them by hand.
Comment #24
ankur commentedAck. I left AjK out of the list of people to thank for submitting patches.
Comment #25
ankur commentedHey! Where did everyone go? Thought people's intense desire to see this thing ported and branched asap would yield some testers...
Comment #26
karens commentedankur, I haven't had time up to now, but I want to get location_views ported, so I'll be testing soon , hopefully
Comment #27
drewish commentedankur, i've got it up on a test site (http://scratch.kpsu.org/) but a separate login bug has kept my users from logging in to really test it.
Comment #28
karens commentedA small item on the .info file - you should add
Also, do you want to declare a package for location? Are there enough location-related modules for that to make sense?
Comment #29
karens commentedI've run into problems in the configuration area, setting up 'map links' and 'geocoding options'. The values aren't getting saved, and in the setup area for geocoding I'm getting extra blank lines. I've set up two countries, Canada and the US, if anyone wants to try to replicate the problems. I'm trying to find a way to get it working but no luck so far.
There is also still some use of $_POST['op'] in various places and that no longer works.
Also found a form_render on line 324 of location.module that needs to be changed to drupal_render.
I'll try to provide a patch if I can get it working, but in case someone else gets to it first, those are issues I ran into so far.
Comment #30
karens commentedJust reporting back that other than the configuration problems, this seems to be working in 5.x. I've tried out both node and user locations.
Only one small issue, not enough to hold off on a port. The css needs some work. The node edit form is messy looking in a reasonably wide screen, the fields float together, which is fine except the labels sometimes get separated from their fields and the descriptions get tacked on to the right side of input fields instead of taking up their own lines on the form.
Comment #31
karens commentedI'm too quick to hit the enter key. I meant to mention that I now have the cvs version of Location Views updated for 5.x and I tested that, too, and the Views integration seems to be working.
Comment #32
geodaniel commentedI think it'd be good to group location-related modules into a 'Location' package - we have location, location views, gmap, georss, kml, and maybe a few more mapping related modules down the line.
Comment #33
geodaniel commentedThere is also an issue with adding links to the description fields in forms, in that they're not rendered as links but just as plain text. See one of the content type forms, under 'Country names' field for an example.
Attached it a patch that should fix this link based on http://drupal.org/node/64279#t-placeholders
Comment #34
drewish commentedTaking geodaniel's hint, I started looking at the links in t()'s and found a few issues.
Comment #35
geodaniel commentedThanks drewish, looks like a better solution than my patch. Before going with the method in my patch I was attempting to do something similar but without using the url() function, which meant that it wasn't working without clean URLs.
Comment #36
ankur commentedI used the patches above to fix up the t() calls, but the forms for map links and geocoding still need some work. Regrettably, this will take another day.
-Ankur
Comment #37
francisu commentedSearch by location had a small bug, an extra drupal_get_form() in location_search_get_form().
Patch is attached.
Comment #38
geodaniel commentedAnkur, I just noticed a mistake in the GeoRSS bits: the tag should be geo:long, not geo:lon (attached patch removes the old commented out lines around there too)
Comment #39
bdragon commentedsubscribing
Comment #40
gregglesI think it's time for a branch for 5.x, a new release node, and closing this issue.
The patches in #37 and #38 can become their own issues - the bulk of updating for 5.x seems to be done based upon some very light testing I just did.
Also, francisu, you've got whitespace changes in your patch which I personally don't like to see mixed in with other patches - though I'm not the maintainer...
Comment #41
francisu commentedPatch in comment #37 was moved to
http://drupal.org/node/113943
sans whitespace.
Comment #42
geodaniel commentedand the one from #38 is covered by a proposed patch at http://drupal.org/node/86624
Comment #43
ankur commentedRe: Comment #40 -- It is true that this module is mostly ported, but in your light testing you should've come across the fact that the search function does not work. I don't intend to branch for 5.0 until I can get this search function to work as it did in 4.7. I don't want my name on something that doesn't do what it advertizes. If someone is interested in looking at the search function and putting in a patch, please by all means do so. I'm interested myself, but only end up w/ 5-10 hrs a week to spare for this task.
-Ankur
Comment #44
francisu commentedSee comment #37 about the search function; I ran into this issue in my testing and provided a patch. There may be more testing required beyond what I patched, but for sure the change I made was necessary.
I also opened a separate issue about this at the request of the opener of this issue.
Seems like a lot of work for a one-line fix, but I'm happy to do what's required to make things better.
Comment #45
gregglesI didn't encounter the search problem because I don't use location search.
My point is that with a branch we get more testers and eyeballs to help with the process of finding these last issues. You can name it something like "5.x--1.alpha" or "5.x--1.may-kill-babies"if you want so it is clear that the code is not up to your standards.
Comment #46
stella commentedsubscribing
Comment #47
jhm commentedsubscribing
Comment #48
brendon commentedsubscribing
Comment #49
darren ohIt took me a good bit of searching to discover that HEAD was being developed for Drupal 5. If the current problems are specific to Drupal 5, we should move the files from HEAD a DRUPAL-5 branch so that people can test it with Drupal 5 and contribute patches. There's no need to create a release until it's fixed.
Comment #50
stanbroughl commentedsubscribing
Comment #51
geodaniel commentedLocation module is now branched from HEAD as DRUPAL-5 (I've not branched anything under contrib).
Ankur is snowed under and asked me to branch, and I should be able to put some time in to testing patches and thing in the near future too. Let's get it up to a releasable state and then create the release node for it.
Comment #52
bcn commentedsubscribing...
Comment #53
reeljustice commentedI have a difficult time finding the "Head" and "Drupal - 5" locations. Would someone please put a link here and LIST the files which should be downloaded for testing. If you don't mind, would someone please do that for GMap also?
I found the CVS and showed "dead" files in GMap, didn't find it in location. Knowing all the different places to go and what to look for are a bit confusing to me.
Thank you.
Joel
Comment #54
hickory commentedreeljustice: if you wait a little while the autopackaged 5.x-dev version should show up for download from the project page.
Comment #55
reeljustice commentedOK, I think I figured it out.
Go to CVS for the module http://cvs.drupal.org/viewcvs/drupal/contributions/modules/location/?onl...
Look down below the listing of files to a DROP DOWN which allows to see the various categories --- Head, Branch, Drupal 5
I would assume, for testing purposes in Drupal 5 we would download the files in the Drupal 5 list.
I've read a bit about installing the "contributed" modules into a new directory /sites/all/modules or something of the sort. Should the install of the listed modules be in the "regular" modules folder or in the "new" modules folder?
Thanks,
Joel
Comment #56
webchickHonestly, imo with as wide-spread as this module is, it's way very important to get good testers.
I'd highly recommend creating a 5.1.x-dev release, and in the release notes clearly stating that THIS IS ONLY FOR TESTING PURPOSES or whatever. The vast majority of people who use this module every day are not going to be able to figure out CVS, and thus you're going to get only developers testing and hey, we miss stuff. :)
However, it would make it much easier to make this distinction if there were "official" releases for the 4.7.x and 4.6.x branches, and the dev snapshot releases were unpublished.
Comment #57
webchickreeljustice: to answer your question, it doesn't matter, but it's recommended to put contrib modules in sites/all/modules so that they're separate from the core stuff. When time comes to upgrade, you just save your "sites" and "files" folders aside, blow away the old files and replace with the new ones, and set the sites/files folders back.
As opposed to having to go through a huge list in the modules directory and try and remember "which of these modules were core modules again?"
Comment #58
geodaniel commentedThanks for the input webchick. Based on your advice I've created a release node for 5.x.1.x-dev which will be available as soon as the packaging script is run.
Comment #59
gregglesIn that case I think we should close this issue (and I did so).
There's no more patches to be applied that reside solely in this issue and the _basic_ work is done. Other issues can and should be brought up in their own specific threads.
Comment #60
reeljustice commentedI don't know if you guys have seen this, but it is a pretty powerful implementation of Google Maps as a graphical type search http://www.recreation.gov/browseMapsRecGov.do?topTabIndex=CampgroundMap
The government implemented a significant portion of this within the past couple of weeks. This is the part of the US Governement where you book your camping/RV reservations in federal campgrounds.
My goal is to implement a similar type process using GMap, Location and anything else needed. At any rate, what I think is an exciting method of "searching".
Comment #61
(not verified) commented