Merge the 5.0 CCK support back into the 4.0 branch

I fixed some issues when porting this to 5.0 and need to merge them into the 4.0 branch.
Mainly the regexp escaping was causing some problems because the escaped string instead of the original find string was getting stored in the table.

Also, the method used to get cck field names doesn't work for all cck field types.