Fix for ALF-9086 "RINF 52: Lucene Removal: Fix FileFolderService search methods"

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29546 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Steven Glover
2011-08-04 12:31:45 +00:00
parent 4b507ee7d8
commit 7d30b7b050
13 changed files with 311 additions and 38 deletions

View File

@@ -944,6 +944,10 @@
<if test="prop1qnameId != null and prop2qnameId != null and prop3qnameId != null">
left join alf_node_properties prop3 on (prop3.node_id = childNode.id and prop3.qname_id = #{prop3qnameId})
</if>
<if test="pattern != null">
join alf_node_properties prop4 on (prop4.node_id = childNode.id)
join alf_qname qname on (prop4.qname_id = qname.id and qname.id = #{namePropertyQNameId})
</if>
where
assoc.parent_node_id = #{parentNodeId}
<if test="childNodeTypeQNameIds != null">
@@ -952,6 +956,9 @@
#{item}
</foreach>
</if>
<if test="pattern != null">
and prop4.string_value like #{pattern}
</if>
<if test="prop1qnameId == null and auditableProps == false">
<include refid="alfresco.node.select_ChildAssoc_OrderBy"/>
</if>
@@ -968,6 +975,10 @@
alf_child_assoc assoc
join alf_node childNode on (childNode.id = assoc.child_node_id)
join alf_store childStore on (childStore.id = childNode.store_id)
<if test="pattern != null">
join alf_node_properties prop4 on (prop4.node_id = childNode.id)
join alf_qname qname on (prop4.qname_id = qname.id and qname.id = #{namePropertyQNameId})
</if>
where
assoc.parent_node_id = #{parentNodeId}
<if test="childNodeTypeQNameIds != null">
@@ -976,6 +987,9 @@
#{item}
</foreach>
</if>
<if test="pattern != null">
and prop4.string_value like #{pattern}
</if>
<include refid="alfresco.node.select_ChildAssoc_OrderBy"/>
</select>