I was using the flag -p1, when I should have been using -p0. Basically, this controls how file names in the patch are mapped to your local SVN structure.
OK. Looking a bit more at the code, I updated my gallery to 441 (everything went fine). However, I had to add the old print function back in, as the imagemetadata function that replaced it didn't work properly. Something screwy with the javascript toggle function, which looks like "hides" the EXIF data from view until you click on the link. It errored out in Firefox. Might be something to take a peek at yourself if you have time.
So my current rev is 441, but I added the old function back in again for now.
Yeah, I saw that toggle function wasn't working, not sure why at the moment, but I will definitely take a look there to see what's going on.
EDIT: the header of the document specifys a script at /zen/scripts-common.js, but no file exists by that name. Presumably the toggle function would be defined in this file.
Is this something that was inadvertently left out of the current revision?
Beware, after applying the patch mentioned above, my zenphoto install is throwing a fatal error. It looks like part of the mapping code didn't get included.
I'm sure it's something I overlooked. Anyone know if the source for phooglelite.php is posted somewhere?
Re: the scripts-common.js. I saw that too. Probably an omission in the SVN code. I'm still trying to find where in the header that scripts-common.js is inserted in the code. Searching for scripts-common in the code pulled no results.
Found it. template-functions.php at the top. References:
`/**
* Print any Javascript required by zenphoto. Every theme should include this somewhere in its .
*/
function zenJavascript() {
if (zp_loggedin()) {
echo " n";
echo " n";
sajax_show_javascript();
echo " ";
}
echo " n";
}`
I'm going to remove the entry for now in my template-functions.php file so it works without errors. But that's why. I couldn't find the scripts-common.js in any of the older versions so it must have been something that was created but not tested or uploaded.
I just hacked up a quick toggle function, and attached it to your bug ticket.
Put the file in /zen/scripts-common.js and then re-enable that entry in your template functions, and the EXIF toggle should work just fine. You may have to switch back to the newer `printImageMetadata` function as well.
cool. i have the functionality working on my gallery now. the lightbox feature isn't there anymore, but at least i am relying on pure core code to make it work using the correct functions from SVN 441.
This would be the perfect thing for my roaming gnome site <www.gnomadic.org/gallery>, Any chance of getting this checked in soon? Has trisweb given someone svn commit access yet?
I got impatient and decided to try applying the patch myself... mistake I guess. The patch threw up a bunch of errors: willard@lemonaid ~/public_html/gallery $ patch -p0 -i trunk.zen.diff patching file themes/testing/album.php patching file themes/testing/image.php patching file zen/exif/makers/gps.php Hunk #1 FAILED at 95. Hunk #2 FAILED at 111. Hunk #3 FAILED at 128. Hunk #4 FAILED at 146. Hunk #5 FAILED at 238. 5 out of 5 hunks FAILED -- saving rejects to file zen/exif/makers/gps.php.rej patching file zen/functions.php Hunk #3 FAILED at 590. 1 out of 3 hunks FAILED -- saving rejects to file zen/functions.php.rej patching file zen/template-functions.php Hunk #1 FAILED at 44. Hunk #2 FAILED at 429. Hunk #3 FAILED at 640. 3 out of 3 hunks FAILED -- saving rejects to file zen/template-functions.php.rej can't find file to patch at input line 243 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |Index: zen/zp-config.php.example |=================================================================== |--- zen/zp-config.php.example (revision 441) |+++ zen/zp-config.php.example (working copy) -------------------------- File to patch:
Got it working using aitf311's files. Well sorta working, it seems to think the Lincoln Monument is in Algeria. Any idea why the pins are showing up in the completely wrong place?
See my reply to aitf311's thread -- the problem is with how the Google/Picassa geocoder is writing data to your files. Check out the Picassa Google discussion group for some (as yet inconclusive) discussion about the issue.
Most of the API for Phoogle Maps should work for Phoogle Maps Lite. I did a lot of editing to the library to clean it up, slim it down, etc. But it should be fairly compatible.
Comments
I was using the flag -p1, when I should have been using -p0. Basically, this controls how file names in the patch are mapped to your local SVN structure.
All is well, trunk successfully patched.
So my current rev is 441, but I added the old function back in again for now.
EDIT: the header of the document specifys a script at /zen/scripts-common.js, but no file exists by that name. Presumably the toggle function would be defined in this file.
Is this something that was inadvertently left out of the current revision?
I'm sure it's something I overlooked. Anyone know if the source for phooglelite.php is posted somewhere?
`/**
* Print any Javascript required by zenphoto. Every theme should include this somewhere in its .
*/
function zenJavascript() {
if (zp_loggedin()) {
echo " n";
echo " n";
sajax_show_javascript();
echo " ";
}
echo " n";
}`
I'm going to remove the entry for now in my template-functions.php file so it works without errors. But that's why. I couldn't find the scripts-common.js in any of the older versions so it must have been something that was created but not tested or uploaded.
Put the file in /zen/scripts-common.js and then re-enable that entry in your template functions, and the EXIF toggle should work just fine. You may have to switch back to the newer `printImageMetadata` function as well.
Yeah it looks like I just assumed that phooglelite was included. I've updated the entry on Trac to include phooglelite.
I wish I could get notified when this topic was updated (maybe I can?). I would *love* to generate more interest in maps and geotagging for ZP.
cool. i have the functionality working on my gallery now. the lightbox feature isn't there anymore, but at least i am relying on pure core code to make it work using the correct functions from SVN 441.
I got impatient and decided to try applying the patch myself... mistake I guess. The patch threw up a bunch of errors:
willard@lemonaid ~/public_html/gallery $ patch -p0 -i trunk.zen.diff
patching file themes/testing/album.php
patching file themes/testing/image.php
patching file zen/exif/makers/gps.php
Hunk #1 FAILED at 95.
Hunk #2 FAILED at 111.
Hunk #3 FAILED at 128.
Hunk #4 FAILED at 146.
Hunk #5 FAILED at 238.
5 out of 5 hunks FAILED -- saving rejects to file zen/exif/makers/gps.php.rej
patching file zen/functions.php
Hunk #3 FAILED at 590.
1 out of 3 hunks FAILED -- saving rejects to file zen/functions.php.rej
patching file zen/template-functions.php
Hunk #1 FAILED at 44.
Hunk #2 FAILED at 429.
Hunk #3 FAILED at 640.
3 out of 3 hunks FAILED -- saving rejects to file zen/template-functions.php.rej
can't find file to patch at input line 243
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: zen/zp-config.php.example
|===================================================================
|--- zen/zp-config.php.example (revision 441)
|+++ zen/zp-config.php.example (working copy)
--------------------------
File to patch:
Example: http://www.gnomadic.org/gallery/washington-dc/willard+3.jpg.php