From a2511b56009cc01ab9150e860e3833a8b0f97453 Mon Sep 17 00:00:00 2001 From: Michael Peter Christen Date: Wed, 4 Sep 2013 10:47:18 +0200 Subject: [PATCH] turned images_alt_txt back to images_alt_sxt because it is not necessary to index the alt text. Indexed image Text is in images_text_t --- defaults/solr.collection.schema | 2 +- source/net/yacy/search/query/QueryGoal.java | 1 - source/net/yacy/search/query/SearchEvent.java | 2 +- source/net/yacy/search/schema/CollectionConfiguration.java | 2 +- source/net/yacy/search/schema/CollectionSchema.java | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/defaults/solr.collection.schema b/defaults/solr.collection.schema index b1ce9665f..4e6aef38d 100644 --- a/defaults/solr.collection.schema +++ b/defaults/solr.collection.schema @@ -249,7 +249,7 @@ images_urlstub_sxt images_protocol_sxt ## all image link alt tag -images_alt_txt +images_alt_sxt ## size of images:height images_height_val diff --git a/source/net/yacy/search/query/QueryGoal.java b/source/net/yacy/search/query/QueryGoal.java index 4c2ddbd2f..745bbb2ac 100644 --- a/source/net/yacy/search/query/QueryGoal.java +++ b/source/net/yacy/search/query/QueryGoal.java @@ -252,7 +252,6 @@ public class QueryGoal { // combine these queries for all relevant fields q.append(" AND ("); - q.append('(').append(CollectionSchema.images_alt_txt.getSolrFieldName()).append(':').append(w).append("^20.0) OR "); q.append('(').append(CollectionSchema.images_text_t.getSolrFieldName()).append(':').append(w).append("^10.0) OR "); q.append('(').append(CollectionSchema.text_t.getSolrFieldName()).append(':').append(w).append(')'); q.append(')'); diff --git a/source/net/yacy/search/query/SearchEvent.java b/source/net/yacy/search/query/SearchEvent.java index 384b70d30..3d0dfea47 100644 --- a/source/net/yacy/search/query/SearchEvent.java +++ b/source/net/yacy/search/query/SearchEvent.java @@ -1414,7 +1414,7 @@ public final class SearchEvent { // check if the match was made in the url or in the image links if (ms == null) throw new MalformedURLException("nUll"); SolrDocument doc = ms.getNode().getDocument(); - Collection alt = doc.getFieldValues(CollectionSchema.images_alt_txt.getSolrFieldName()); + Collection alt = doc.getFieldValues(CollectionSchema.images_alt_sxt.getSolrFieldName()); Collection img = doc.getFieldValues(CollectionSchema.images_urlstub_sxt.getSolrFieldName()); Collection prt = doc.getFieldValues(CollectionSchema.images_protocol_sxt.getSolrFieldName()); if (img != null) { diff --git a/source/net/yacy/search/schema/CollectionConfiguration.java b/source/net/yacy/search/schema/CollectionConfiguration.java index cc12fb3ad..a72598c7c 100644 --- a/source/net/yacy/search/schema/CollectionConfiguration.java +++ b/source/net/yacy/search/schema/CollectionConfiguration.java @@ -606,7 +606,7 @@ public class CollectionConfiguration extends SchemaConfiguration implements Seri if (allAttr || contains(CollectionSchema.imagescount_i)) add(doc, CollectionSchema.imagescount_i, imagesc.size()); if (allAttr || contains(CollectionSchema.images_protocol_sxt)) add(doc, CollectionSchema.images_protocol_sxt, protocolList2indexedList(imgprots)); if (allAttr || contains(CollectionSchema.images_urlstub_sxt)) add(doc, CollectionSchema.images_urlstub_sxt, imgstubs); - if (allAttr || contains(CollectionSchema.images_alt_txt)) add(doc, CollectionSchema.images_alt_txt, imgalts); + if (allAttr || contains(CollectionSchema.images_alt_sxt)) add(doc, CollectionSchema.images_alt_sxt, imgalts); if (allAttr || contains(CollectionSchema.images_height_val)) add(doc, CollectionSchema.images_height_val, imgheights); if (allAttr || contains(CollectionSchema.images_width_val)) add(doc, CollectionSchema.images_width_val, imgwidths); if (allAttr || contains(CollectionSchema.images_pixel_val)) add(doc, CollectionSchema.images_pixel_val, imgpixels); diff --git a/source/net/yacy/search/schema/CollectionSchema.java b/source/net/yacy/search/schema/CollectionSchema.java index dd0c666cb..ef09662c1 100644 --- a/source/net/yacy/search/schema/CollectionSchema.java +++ b/source/net/yacy/search/schema/CollectionSchema.java @@ -123,7 +123,7 @@ public enum CollectionSchema implements SchemaDeclaration { images_text_t(SolrType.text_general, true, true, false, false, true, "all text/words appearing in image alt texts or the tokenized url"), images_urlstub_sxt(SolrType.string, true, true, true, false, true, "all image links without the protocol and '://'"), images_protocol_sxt(SolrType.string, true, true, true, false, false, "all image link protocols"), - images_alt_txt(SolrType.text_general, true, true, true, false, true, "all image link alt tag"), + images_alt_sxt(SolrType.string, true, true, true, false, true, "all image link alt tag"), // no need to index this; don't turn it into a txt field; use images_text_t instead images_height_val(SolrType.num_integer, true, true, true, false, false, "size of images:height"), images_width_val(SolrType.num_integer, true, true, true, false, false, "size of images:width"), images_pixel_val(SolrType.num_integer, true, true, true, false, false, "size of images as number of pixels (easier for a search restriction than with and height)"),