[Igarden-commit] Garden/source/Plugins PictureSearchPlugin.cp, 1.17.2.1, 1.17.2.2

[Jeffrey B. <jlb...@us...>]

Update of /cvsroot/igarden/Garden/source/Plugins
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv20627

Modified Files:
      Tag: Release_branch_v1
	PictureSearchPlugin.cp 
Log Message:
Add copyright annotations for Creative Commons compliance

Index: PictureSearchPlugin.cp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/Plugins/PictureSearchPlugin.cp,v
retrieving revision 1.17.2.1
retrieving revision 1.17.2.2
diff -C2 -d -r1.17.2.1 -r1.17.2.2
*** PictureSearchPlugin.cp	26 Dec 2006 02:09:56 -0000	1.17.2.1
--- PictureSearchPlugin.cp	9 Feb 2007 01:13:15 -0000	1.17.2.2
***************
*** 599,603 ****
  	XGXMLObject		*obj, *inner, *innerStart;
  	XGXMLData		*data, *bestData;
! 	const char		*namePtr;
  	const char		*val, *base, *boolVal;
  	long			picturesToDownload, n;
--- 599,603 ----
  	XGXMLObject		*obj, *inner, *innerStart;
  	XGXMLData		*data, *bestData;
! 	const char		*namePtr, *outerLicense = NULL;
  	const char		*val, *base, *boolVal;
  	long			picturesToDownload, n;
***************
*** 678,681 ****
--- 678,683 ----
  			linkStr = String("");
  		
+ 		outerLicense = data->GetArgValue("license");
+ 
  		innerStart = data->GetChild();
  		// Find out how many items need to be downloaded
***************
*** 777,786 ****
  				}
  				else
! 					rightStr = "";
! 
  				val = data->GetArgValue("by");
  				if(val != NULL)
  				{
! 					byStr = String(val);
  				}
  				else
--- 779,818 ----
  				}
  				else
! 				{
! 					const char	*version;
! 					
! 					val = data->GetArgValue("license");
! 					if(val == NULL)
! 						val = outerLicense;
! 					if(val != NULL && CIstrncmp(val, "cc-by-", 6) == 0)
! 					{
! 						version = val+6;
! 						rightStr =  "<a href=\"http://creativecommons.org/licenses/by/";
! 						rightStr += version;
! 						rightStr += "\"/>";
! 						rightStr += "Creative Commons Attribution ";
! 						rightStr += version;
! 						rightStr += "</a>";
! 					}
! 					else
! 						rightStr = "";
! 				}
! 				
  				val = data->GetArgValue("by");
  				if(val != NULL)
  				{
! 					const char *val2;
! 					
! 					val2 = data->GetArgValue("byURL");
! 					if(val2 != NULL)
! 					{
! 						byStr = "<a href=\"";
! 						byStr += val2;
! 						byStr += "\">";
! 						byStr += val;
! 						byStr += "</a>";
! 					}
! 					else
! 						byStr = String(val);
  				}
  				else