flickcurl.h   flickcurl.h 
skipping to change at line 1154 skipping to change at line 1154
char *originalsecret; char *originalsecret;
char *ticketid; char *ticketid;
} flickcurl_upload_status; } flickcurl_upload_status;
/** /**
* flickcurl_search_params: * flickcurl_search_params:
* @user_id: The NSID of the user who's photo to search (or "me" or NULL). * @user_id: The NSID of the user who's photo to search (or "me" or NULL).
* @tags: A comma-delimited list of tags (or NULL) * @tags: A comma-delimited list of tags (or NULL)
* @tag_mode: Either 'any' for an OR combination of tags, or 'all' for an A ND combination. Defaults to 'any' if not specified (or NULL) * @tag_mode: Either 'any' for an OR combination of tags, or 'all' for an A ND combination. Defaults to 'any' if not specified (or NULL)
* @text: Free text search (or NULL) * @text: Free text search (or NULL)
* @min_upload_date: Minimum upload date as a unix timestamp (or NULL) * @min_upload_date: Minimum upload date as a unix timestamp (or 0)
* @max_upload_date: Maximum upload date as a unix timestamp (or NULL) * @max_upload_date: Maximum upload date as a unix timestamp (or 0)
* @min_taken_date: Minimum taken date in the form of a mysql datetime (or NULL) * @min_taken_date: Minimum taken date in the form of a mysql datetime (or NULL)
* @max_taken_date: Maximum taken date in the form of a mysql datetime (or NULL) * @max_taken_date: Maximum taken date in the form of a mysql datetime (or NULL)
* @license: Comma-separated list of photo licenses (or NULL) * @license: Comma-separated list of photo licenses (or NULL)
* @sort: The order in which to sort returned photos. Defaults to date-post ed-desc. The possible values are: date-posted-asc, date-posted-desc, date-t aken-asc, date-taken-desc, interestingness-desc, interestingness-asc, and r elevance (or NULL) * @sort: The order in which to sort returned photos. Defaults to date-post ed-desc. The possible values are: date-posted-asc, date-posted-desc, date-t aken-asc, date-taken-desc, interestingness-desc, interestingness-asc, and r elevance (or NULL)
* @privacy_filter: Return photos only matching a certain privacy level. * @privacy_filter: Return photos only matching a certain privacy level.
* @bbox: A comma-delimited list of 4 values defining the Bounding Box of t he area that will be searched. * @bbox: A comma-delimited list of 4 values defining the Bounding Box of t he area that will be searched.
* @accuracy: Recorded accuracy level of the location information. Current range is 1-16 * @accuracy: Recorded accuracy level of the location information. Current range is 1-16
* @safe_search: Safe search setting: 1 safe, 2 moderate, 3 restricted. * @safe_search: Safe search setting: 1 safe, 2 moderate, 3 restricted (or
* @content_type: Content Type setting: 1 for photos only, 2 for screenshot 0).
s only, 3 for 'other' only, 4 for all types. (or NULL) * @content_type: Content Type setting: 1 for photos only, 2 for screenshot
s only, 3 for 'other' only, 4 for all types. (or 0)
* @machine_tags: Machine tag search syntax * @machine_tags: Machine tag search syntax
* @machine_tag_mode: Either 'any' for an OR combination of tags, or 'all' for an AND combination. Defaults to 'any' if not specified. * @machine_tag_mode: Either 'any' for an OR combination of tags, or 'all' for an AND combination. Defaults to 'any' if not specified.
* @group_id: The id of a group who's pool to search. If specified, only m atching photos posted to the group's pool will be returned. (or NULL) * @group_id: The id of a group who's pool to search. If specified, only m atching photos posted to the group's pool will be returned. (or NULL)
* @extras: A comma-delimited list of extra information to fetch for each r * @extras: A comma-delimited list of extra information to fetch for each r
eturned record. Currently supported fields are: <code>license</code>, <code eturned record. Currently supported fields are: <code>license</code>, <code
>date_upload</code>, <code>date_taken</code>, <code>owner_name</code>, <cod >date_upload</code>, <code>date_taken</code>, <code>owner_name</code>, <cod
e>icon_server</code>, <code>original_format</code>, <code>last_update</code e>icon_server</code>, <code>original_format</code>, <code>last_update</code
>, <code>geo</code>, <code>tags</code>, <code>machine_tags</code>, <code>o_ >, <code>geo</code>, <code>tags</code>, <code>machine_tags</code>, <code>o_
dims</code>, <code>views</code>, <code>media</code>. (or NULL) dims</code>, <code>views</code>, <code>media</code>, <code>path_alias</code
* @per_page: Number of photos to return per page. If this argument is omit >, <code>url_sq</code>, <code>url_t</code>, <code>url_s</code>, <code>url_m
ted, it defaults to 100. The maximum allowed value is 500. (or NULL) </code>, <code>url_o</code>. (or NULL)
* @page: The page of results to return. If this argument is omitted, it de * @per_page: Number of photos to return per page. If this argument is omit
faults to 1. (or NULL) ted, it defaults to 100. The maximum allowed value is 500. (or 0)
* @page: The page of results to return. If this argument is omitted, it de
faults to 1. (or 0)
* @place_id: A Flickr place id. (only used if bbox argument isn't present) . Experimental. Geo queries require some sort of limiting agent in order t o prevent the database from crying. This is basically like the check agains t "parameterless searches" for queries without a geo component. A tag, fo r instance, is considered a limiting agent as are user defined min_date_tak en and min_date_upload parameters - If no limiting factor is passed we retu rn only photos added in the last 12 hours (though we may extend the limit i n the future) (or NULL) * @place_id: A Flickr place id. (only used if bbox argument isn't present) . Experimental. Geo queries require some sort of limiting agent in order t o prevent the database from crying. This is basically like the check agains t "parameterless searches" for queries without a geo component. A tag, fo r instance, is considered a limiting agent as are user defined min_date_tak en and min_date_upload parameters - If no limiting factor is passed we retu rn only photos added in the last 12 hours (though we may extend the limit i n the future) (or NULL)
* @media: "photos" or "videos" (or NULL) * @media: "photos" or "videos" (or NULL)
* @has_geo: non-0 if a photo has been geotagged (or 0) * @has_geo: non-0 if a photo has been geotagged (or 0)
* @lat: A valid latitude, in decimal format, for doing radial geo queries (or ignored if radius is 0.0) * @lat: A valid latitude, in decimal format, for doing radial geo queries (or ignored if radius is 0.0)
* @lon: A valid longitude, in decimal format, for doing radial geo queries (or ignored if radius is 0.0) * @lon: A valid longitude, in decimal format, for doing radial geo queries (or ignored if radius is 0.0)
* @radius: A valid radius used for geo queries, greater than zero and less than 20 miles (or 32 kilometers), for use with point-based geo queries. Th e default value is 5 (km) (or 0.0 for not used) * @radius: A valid radius used for geo queries, greater than zero and less than 20 miles (or 32 kilometers), for use with point-based geo queries. Th e default value is 5 (km) (or 0.0 for not used)
* @radius_units: The unit of measure when doing radial geo queries. Valid options are "mi" (miles) and "km" (kilometers). The default is "km" (or NUL L) * @radius_units: The unit of measure when doing radial geo queries. Valid options are "mi" (miles) and "km" (kilometers). The default is "km" (or NUL L)
* @contacts: (Experimental) Requires @user_id field be set and limits quer ies to photos beloing to that user's photos. Valid arguments are 'all' or 'ff' for just friends and family. * @contacts: (Experimental) Requires @user_id field be set and limits quer ies to photos beloing to that user's photos. Valid arguments are 'all' or 'ff' for just friends and family.
* @woe_id: A 32-bit identifier that uniquely represents spatial entities. * @woe_id: A 32-bit identifier that uniquely represents spatial entities.
(not used if bbox argument is present). Same restrictions as @place_id (or (not used if bbox argument is present). Same restrictions as @place_id (or
<0) 0)
* @geo_context: A numeric value representing the photo's geotagginess beyo
nd latitude and longitude. The current list of context IDs is 0: not define
d, 1: indoors and 2: outdoors. Geo queries require some sort of limiting a
gent in order to prevent the database from crying (or 0)
* @is_commons: Limit the scope of the search to only photos that are part
of the Flickr Commons project. Default is false (or 0)
* *
* Search parameters for flickcurl_photos_search() * Search parameters for flickcurl_photos_search()
*/ */
typedef struct { typedef struct {
char* user_id; char* user_id;
char* tags; char* tags;
char* tag_mode; char* tag_mode;
char* text; char* text;
int min_upload_date; int min_upload_date;
int max_upload_date; int max_upload_date;
skipping to change at line 1214 skipping to change at line 1216
int page; int page;
char* place_id; char* place_id;
char* media; char* media;
int has_geo; int has_geo;
double lat; double lat;
double lon; double lon;
double radius; double radius;
char* radius_units; char* radius_units;
char* contacts; char* contacts;
int woe_id; int woe_id;
int geo_context;
int is_commons;
} flickcurl_search_params; } flickcurl_search_params;
/** /**
* flickcurl_size: * flickcurl_size:
* @label: label * @label: label
* @width: width in pixels * @width: width in pixels
* @height: height in pixels * @height: height in pixels
* @source: raw image source URL * @source: raw image source URL
* @url: url of photo page * @url: url of photo page
* @media: 'photo' or 'video' * @media: 'photo' or 'video'
 End of changes. 5 change blocks. 
18 lines changed or deleted 29 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/