Textpattern CMS support forum

You are not logged in. Register | Login | Help

#11 2005-09-20 23:47:53

Elenita
Member
From: Falls Church, VA
Registered: 2004-05-16
Posts: 407
Website

Re: [issue] Feeds and Character entities

> zem wrote:

> Your atom.php file has a conflict, probably because you’d made some local edits. You need to edit it manually

I’ve been updating directly from svn, and the only changes I’ve made after running <code>svn update</code> is rm -f textpattern/config.php.default textpattern/setup/</code>. I haven’t touched atom.php, rss.php, publish.php or anything related.

Any other ideas?

Last edited by Elenita (2005-09-20 23:48:43)

Offline

#12 2005-09-21 00:31:27

Sencer
Developer emeritus
From: cgn, de
Registered: 2004-03-23
Posts: 1,803
Website

Re: [issue] Feeds and Character entities

sigh, yet there are conflict markers in your file, put there by subversion. The error message that php spits out is very clear on this.

run one of the following to see changes:
svn st
svn diff

Then use
svn revert -R *

to revert all files to exactly how they are in the repository (make a backup first).

Or better yet: Try using the download-versions, you can download and extract it from the command-line as well with just a single line, and it will give you less trouble and free you from having to learn how to use subversion.

Offline

#13 2005-09-21 01:18:43

zem
Developer emeritus
From: Melbourne, Australia
Registered: 2004-04-08
Posts: 2,579
Website

Re: [issue] Feeds and Character entities

I’ve been updating directly from svn, and the only changes I’ve made after running svn update is rm -f textpattern/config.php.default textpattern/setup/. I haven’t touched atom.php, rss.php, publish.php or anything related.

Take a look at the file. this page explains how to find the conflict markers. That’ll show you what was different. It might be as simple as a whitespace change (tabs to spaces or similar).

svn doesn’t add conflict markers unless something changed.


Alex
tstate

Offline

#14 2005-09-21 01:56:01

Elenita
Member
From: Falls Church, VA
Registered: 2004-05-16
Posts: 407
Website

Re: [issue] Feeds and Character entities

Thanks for all your help, guys, but…

<blockquote>sigh, yet there are conflict markers in your file, put there by subversion. The error message that php spits out is very clear on this.

run one of the following to see changes:
svn st
svn diff</blockquote>

Infuriatingly, this didn’t help me (and I know it should have). Output from iTerm:

<blockquote><code>username@server$ pwd
/home/username/public_html/textpattern
username@server$ cd ../
username@server$ svn diff
svn: Working copy ‘textpattern/setup’ is missing or not locked
username@server$ </code></blockquote>

<code>cat publish/atom.php > Untitled.txt</code> didn’t reveal any error markers, either. I can’t explain it.

In the end, I ended up copying the source of atom.php and rss.php from the trac file browser into empty files on my local machine, uploading them to my server with sftp, and overwriting the already existing files. That seems, more or less, to have solved the problems I was experiencing earlier.

Both <a href=“http://feedvalidator.org/check.cgi?url=http%3A%2F%2Fwww.penumbrae.com%2F%3Frss%3D1”>RSS messy</a> and <a href=“http://feedvalidator.org/check.cgi?url=http%3A%2F%2Fwww.penumbrae.com%2Frss%2F”>RSS clean</a> validate (yay!). Atom, however, is <a href=“http://feedvalidator.org/check.cgi?url=http%3A%2F%2Fwww.penumbrae.com%2F%3Fatom%3D1”>giving me different errors</a> than it was this morning.

Offline

#15 2005-09-21 02:17:29

phiw13
Plugin Author
From: Japan
Registered: 2004-02-27
Posts: 1,633
Website

Re: [issue] Feeds and Character entities

Elenita,
You could have gone through a possibly safer route: delete the offending file (atom.php), and run svn update again. It will replace the file with a clean one from the repository. I’ve done that multiple times when messing up with files.

Note that, since updating to rev 921, my atom feed doesn’t validate either, but I haven’t investigated this yet.

Offline

#16 2005-09-21 02:53:20

zem
Developer emeritus
From: Melbourne, Australia
Registered: 2004-04-08
Posts: 2,579
Website

Re: [issue] Feeds and Character entities

Checking out directly into a live public_html directory is dangerous. Check out to a separate directory and use ‘svn export’ instead, as mentioned in the svn faq. e.g:

$ svn co http://svn.textpattern.com/development/4.0/ staging/
$ svn export --force staging/ public_html/

Or, if you’re not making any changes yourself:

$ svn export --force http://svn.textpattern.com/development/4.0/ public_html/

That will overwrite the contents of any files that already exist in public_html (including .htaccess). If you need to keep certain changes, use the first method, and ‘svn remove’ the file from your staging area before exporting.


Alex
tstate

Offline

#17 2005-11-13 20:11:30

rayray
New Member
Registered: 2005-06-07
Posts: 8

Re: [issue] Feeds and Character entities

I’ve been having this same exact problem with needmorenotes.com for many months. We’re up to 4.0.2 and the problem still persists. Raw entities showing up instead of the correct characters. I see it, in fact, on the TextDrive blog feed itself. It’s terrible! Definitely what I’m experiencing is that it happens often, but sometimes only once per entity in a feed. That is, if a curly left apostrophe is shown twice, I see the entity code, but later in the feed the character shows up correctly!

Offline

#18 2005-11-13 20:47:52

zem
Developer emeritus
From: Melbourne, Australia
Registered: 2004-04-08
Posts: 2,579
Website

Re: [issue] Feeds and Character entities

Ray,

This is probably a different problem. Please post a new thread with some details.


Alex
tstate

Offline

Board footer

Powered by FluxBB