Added preview_attempts column to resource table to prevent the same resources being targeted by create_previews script

git-svn-id: http://svn.resourcespace.org/svn/resourcespace@3633 c08608d7-6e46-0410-86ca-f2a6f1370df5

Author: nbraddy

batch/create_previews.php

@@ -97,7 +97,7 @@ function sigint_handler()
 
 
 // We fetch the list of resources to process.
-$resources=sql_query("SELECT resource.ref, resource.file_extension FROM resource WHERE resource.has_image = 0");
+$resources=sql_query("SELECT resource.ref, resource.file_extension, resource.preview_attempts FROM resource WHERE resource.has_image = 0 and resource.archive = 0 and resource.ref>0");
 
 foreach($resources as $resource) // For each resources
   {
@@ -137,12 +137,12 @@ function sigint_handler()
 	    }
 
       // Processing resource.
-      echo sprintf("Processing resource n°%d.\n", $resource['ref']);
+      echo sprintf("Processing resource id " . $resource['ref'] . " - preview attempt #" . $resource['preview_attempts'] . "\n");
 
       $start_time = microtime(true);
 
       // For each fork, we need a new connection to database.
-		if ($use_mysqli){
+	if ($use_mysqli){
 			$db=mysqli_connect($mysql_server,$mysql_username,$mysql_password,$mysql_db);
 		} else {
 			mysql_connect($mysql_server,$mysql_username,$mysql_password);
@@ -164,7 +164,15 @@ function sigint_handler()
 					}
 				}
 			}
-      create_previews($resource['ref'], false, $resource['file_extension']);
+		if ($resource['preview_attempts']<5 and $resource['file_extension']!="") 
+		{
+		create_previews($resource['ref'], false, $resource['file_extension']);
+		echo sprintf("Processed resource %d in %01.2f seconds.\n", $resource['ref'], microtime(true) - $start_time);
+		}
+	else
+		{
+		echo sprintf("Skipped resource " . $resource['ref'] . " - maximum attempts reached or nonexistent file extension. \n");
+		}
 
       echo sprintf("Processed resource %d in %01.2f seconds.\n", $resource['ref'], microtime(true) - $start_time);
 

dbstruct/table_resource.txt

@@ -34,3 +34,4 @@ mapzoom,int(11),YES,,,
 disk_usage,int(11),YES,,,
 disk_usage_last_updated,datetime,YES,,,
 file_size,int(11),YES,,,
+preview_attempts,int(11),YES,,,

include/image_processing.php

@@ -553,9 +553,9 @@ function create_previews($ref,$thumbonly=false,$extension="jpg",$previewonly=fal
 
 	# File checksum (experimental) - disabled for now
 	if (!$previewonly) {generate_file_checksum($ref,$extension);}
-
 	# first reset preview tweaks to 0
 	sql_query("update resource set preview_tweaks = '0|1' where ref = '$ref'");
+	
 
 	# pages/tools/update_previews.php?previewbased=true
 	# use previewbased to avoid touching original files (to preserve manually-uploaded preview images
@@ -722,7 +722,7 @@ function create_previews($ref,$thumbonly=false,$extension="jpg",$previewonly=fal
 			# flag database so a thumbnail appears on the site
 			if ($alternative==-1) # not for alternatives
 				{
-				sql_query("update resource set has_image=1,preview_extension='jpg',file_modified=now() where ref='$ref'");
+				sql_query("update resource set has_image=1,preview_extension='jpg',preview_attempts=0,file_modified=now() where ref='$ref'");
 				}
 			}
 		}
@@ -912,9 +912,16 @@ function create_previews_using_im($ref,$thumbonly=false,$extension="jpg",$previe
 			{
 			extract_mean_colour($target,$ref);
 			# flag database so a thumbnail appears on the site
-			sql_query("update resource set has_image=1,preview_extension='jpg',file_modified=now() where ref='$ref'");
+			sql_query("update resource set has_image=1,preview_extension='jpg',preview_attempts=0,file_modified=now() where ref='$ref'");
+			}
+		else
+			{
+			if(!$target)
+				{
+				$preview_attempts=sql_value("select preview_attempts as value from resource where ref=" . $ref, 0);
+				sql_query("update resource set preview_attempts=" . ($preview_attempts+1) . " where ref='$ref'");
+				}
 			}
-
 		return true;
 		}
 	else

pages/edit.php

@@ -212,8 +212,15 @@
 		tweak_preview_images($ref,0,0.7,$resource["preview_extension"]);
 		break;
 		case "restore":
-		create_previews($ref,false,$resource["file_extension"]);
-		refresh_collection_frame();
+		if ($enable_thumbnail_creation_on_upload)
+			{
+			create_previews($ref,false,$resource["file_extension"]);
+			refresh_collection_frame();
+			}
+		else
+			{
+			sql_query("update resource set preview_attempts=0, has_image=0 where ref='$ref'");
+			}
 		break;
 		}