[Archive-access-cvs] SF.net SVN: archive-access:[2554] trunk/archive-access/projects/nutchwax/ imagesearch/src

[<mi...@us...>]

Revision: 2554
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2554&view=rev
Author:   miklosh
Date:     2008-08-16 11:50:24 +0000 (Sat, 16 Aug 2008)

Log Message:
-----------
Changed to using metadata keys defined in ImageSearch.java.

Modified Paths:
--------------
    trunk/archive-access/projects/nutchwax/imagesearch/src/java/org/archive/nutchwax/imagesearch/ThumbnailGenerator.java
    trunk/archive-access/projects/nutchwax/imagesearch/src/web/jsp/results.jsp

Modified: trunk/archive-access/projects/nutchwax/imagesearch/src/java/org/archive/nutchwax/imagesearch/ThumbnailGenerator.java
===================================================================
--- trunk/archive-access/projects/nutchwax/imagesearch/src/java/org/archive/nutchwax/imagesearch/ThumbnailGenerator.java	2008-08-16 11:48:50 UTC (rev 2553)
+++ trunk/archive-access/projects/nutchwax/imagesearch/src/java/org/archive/nutchwax/imagesearch/ThumbnailGenerator.java	2008-08-16 11:50:24 UTC (rev 2554)
@@ -77,8 +77,8 @@
                 }
                 return null;
             }
-            metadata.add("width", Integer.toString(imageWidth));
-            metadata.add("height", Integer.toString(imageHeight));
+            metadata.add(ImageSearch.IMAGE_WIDTH_KEY, Integer.toString(imageWidth));
+            metadata.add(ImageSearch.IMAGE_HEIGHT_KEY, Integer.toString(imageHeight));
             // Do we need to scale down at all?
             if (thumbWidth > imageWidth && thumbHeight > imageHeight) {
                 thumbWidth = imageWidth;

Modified: trunk/archive-access/projects/nutchwax/imagesearch/src/web/jsp/results.jsp
===================================================================
--- trunk/archive-access/projects/nutchwax/imagesearch/src/web/jsp/results.jsp	2008-08-16 11:48:50 UTC (rev 2553)
+++ trunk/archive-access/projects/nutchwax/imagesearch/src/web/jsp/results.jsp	2008-08-16 11:50:24 UTC (rev 2554)
@@ -169,7 +169,8 @@
             Metadata meta = image.getMetadata();
             int sizeInt = Integer.parseInt(meta.get(ImageSearch.SIZE_KEY));
             size = Integer.toString((int)Math.round(sizeInt / 1024.0)) + "k";
-            dimensions = meta.get("width") + "x" + meta.get("height");
+            dimensions = meta.get(ImageSearch.IMAGE_WIDTH_KEY) + "x" + 
+                    meta.get(ImageSearch.IMAGE_HEIGHT_KEY);
             imgWidth = "";
         } else {
             size = "??k";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.