Merge branch 'master' into whiskerbook

WildMeOrg · Oct 26, 2023 · 7fd3f3f · 7fd3f3f
2 parents fd23d4f + 0105883
commit 7fd3f3f
Showing 1 changed file with 23 additions and 0 deletions.
diff --git a/src/main/webapp/import.jsp b/src/main/webapp/import.jsp
@@ -616,6 +616,7 @@ try{
 		int numWithACMID=0;
 		int numAllowedIA=0;
 		int numDetectionComplete=0;
+		ArrayList<MediaAsset> invalidMediaAssets=new ArrayList<MediaAsset>();
 		for(MediaAsset asset:allAssets){
 			if(asset.getAcmId()!=null)numWithACMID++;
 			
@@ -625,6 +626,10 @@ try{
 			}
 			else if(asset.validateSourceImage()){numAllowedIA++;myShepherd.updateDBTransaction();}
 			
+			if(asset.isValidImageForIA() == null || !asset.isValidImageForIA().booleanValue()){
+				invalidMediaAssets.add(asset);
+			}
+			
 			
 			if(asset.getDetectionStatus()!=null && (asset.getDetectionStatus().equals("complete")||asset.getDetectionStatus().equals("pending"))) numDetectionComplete++;
 		}
@@ -634,6 +639,24 @@ try{
 		<ul>
 			<li>Number with acmIDs: <%=numWithACMID %></li>
 			<li>Number valid for image analysis: <%=numAllowedIA %></li>
+
+			<%
+			if("complete".equals(itask.getStatus()) && invalidMediaAssets.size()>0){
+			%>
+			<li>Number invalid for image analysis: <%=invalidMediaAssets.size()%>
+					<ol>
+					<%
+					for(MediaAsset inv_asset:invalidMediaAssets){
+					%>
+						<li><a target="_blank" href="obrowse.jsp?type=MediaAsset&id=<%=inv_asset.getId() %>"><%=inv_asset.getId() %></a></li>
+					<%
+					}
+					%>
+					</ol>
+				</li>
+			<%
+			}
+			%>
 			<li>Number that have completed detection: <%=numDetectionComplete %></li>
 		</ul>
 	</p>