inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2025-09-10 14:11:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
77234: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76041: Support for ACE-2077    SOLR 4 - Store content, metadata doc & fields for reindex & highlighting
      - fix up to include content data id


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78090 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-07-23 16:44:52 +00:00
parent e63e7a3d7b
commit 233ed7edc1
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/client/ContentPropertyValue.java
View File

@@ -13,14 +13,16 @@ public class ContentPropertyValue extends PropertyValue
private long length; private long length;
private String encoding; private String encoding;
private String mimetype; private String mimetype;
private Long id;
public ContentPropertyValue(Locale locale, long length, String encoding, String mimetype) public ContentPropertyValue(Locale locale, long length, String encoding, String mimetype, Long id)
{ {
super(); super();
this.locale = locale; this.locale = locale;
this.length = length; this.length = length;
this.encoding = encoding; this.encoding = encoding;
this.mimetype = mimetype; this.mimetype = mimetype;
this.id = id;
} }
public String getEncoding() public String getEncoding()
@@ -43,10 +45,15 @@ public class ContentPropertyValue extends PropertyValue
return length; return length;
} }
public Long getId()
{
return id;
}
@Override @Override
public String toString() public String toString()
{ {
return "ContentPropertyValue [locale=" + locale + ", length=" + length + ", encoding=" return "ContentPropertyValue [locale=" + locale + ", length=" + length + ", encoding="
+ encoding + ", mimetype=" + mimetype + "]"; + encoding + ", mimetype=" + mimetype + ", id="+id+"]";
} }
} }

4
search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/client/SOLRAPIClient.java
View File

@@ -650,7 +650,9 @@ public class SOLRAPIClient
String encoding = o.has("encoding") ? o.getString("encoding") : null; String encoding = o.has("encoding") ? o.getString("encoding") : null;
String mimetype = o.has("mimetype") ? o.getString("mimetype") : null; String mimetype = o.has("mimetype") ? o.getString("mimetype") : null;
ret = new ContentPropertyValue(locale, size, encoding, mimetype); Long id = o.has("contentId") ? o.getLong("contentId") : null;
ret = new ContentPropertyValue(locale, size, encoding, mimetype, id);
} }
else else
{ {