boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

fix for image size field values (must be multi-valued)

Browse Source
pull/23/head
Michael Peter Christen 9 years ago
parent 5744342fec
commit 151ccd50a9
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File

18
source/net/yacy/search/schema/CollectionConfiguration.java
Unescape View File

@ -917,15 +917,23 @@ public class CollectionConfiguration extends SchemaConfiguration implements Seri
if (document.getContentDomain() == ContentDomain.IMAGE) { if (document.getContentDomain() == ContentDomain.IMAGE) {
// add image pixel size if known // add image pixel size if known
Iterator<ImageEntry> imgit = document.getImages().values().iterator(); Iterator<ImageEntry> imgit = document.getImages().values().iterator();
if (imgit.hasNext()) { List<Integer> heights = new ArrayList<>();
List<Integer> widths = new ArrayList<>();
List<Integer> pixels = new ArrayList<>();
while (imgit.hasNext()) {
ImageEntry img = imgit.next(); ImageEntry img = imgit.next();
int imgpixels = (img.height() < 0 || img.width() < 0) ? -1 : img.height() * img.width(); int imgpixels = (img.height() < 0 || img.width() < 0) ? -1 : img.height() * img.width();
if (imgpixels > 0) { if (imgpixels > 0 && (allAttr || (contains(CollectionSchema.images_height_val) && contains(CollectionSchema.images_width_val) && contains(CollectionSchema.images_pixel_val)))) {
if (allAttr || contains(CollectionSchema.images_height_val)) add(doc, CollectionSchema.images_height_val, img.height()); heights.add(img.height());
if (allAttr || contains(CollectionSchema.images_width_val)) add(doc, CollectionSchema.images_width_val, img.width()); widths.add(img.width());
if (allAttr || contains(CollectionSchema.images_pixel_val)) add(doc, CollectionSchema.images_pixel_val, imgpixels); pixels.add(imgpixels);
} }
} }
if (heights.size() > 0) {
add(doc, CollectionSchema.images_height_val, heights);
add(doc, CollectionSchema.images_width_val, widths);
add(doc, CollectionSchema.images_pixel_val, pixels);
}
if (allAttr || contains(CollectionSchema.images_text_t)) { if (allAttr || contains(CollectionSchema.images_text_t)) {
add(doc, CollectionSchema.images_text_t, content); // the content may contain the exif data from the image parser add(doc, CollectionSchema.images_text_t, content); // the content may contain the exif data from the image parser

Write Preview
Loading…
Cancel
Save