Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

B2018-095 - A previous source safe update made an inadvertant change to 4 lines of the PROMSFixes. This has been corrected. The change had to do with embedded degree characters. This has been changed to use the nchar function which should eliminate futuer errors.

Browse Source
This commit is contained in:
Rich 2018-06-15 13:41:06 +00:00
parent f8256c3ce5
commit a0e479fb7a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PROMS/DataLoader/PROMSFixes.Sql
View File

@ -1960,8 +1960,8 @@ select DvPath, Path, I.[Level],I.[FromType],I.[Ordinal], I.[ParentID], I.[ItemID
(isnull(@SearchString,'')='' (isnull(@SearchString,'')=''
OR (@CaseSensitive = 1 AND .dbo.vefn_RemoveExtraText(C.Text,@IncludeLinks, @IncludeRtfFormatting, @IncludeSpecialCharacters) like @SearchString Collate SQL_Latin1_General_CP1_CS_AS) OR (@CaseSensitive = 1 AND .dbo.vefn_RemoveExtraText(C.Text,@IncludeLinks, @IncludeRtfFormatting, @IncludeSpecialCharacters) like @SearchString Collate SQL_Latin1_General_CP1_CS_AS)
OR (@CaseSensitive = 0 AND .dbo.vefn_RemoveExtraText(C.Text,@IncludeLinks, @IncludeRtfFormatting, @IncludeSpecialCharacters) like @SearchString Collate SQL_Latin1_General_CP1_CI_AS) OR (@CaseSensitive = 0 AND .dbo.vefn_RemoveExtraText(C.Text,@IncludeLinks, @IncludeRtfFormatting, @IncludeSpecialCharacters) like @SearchString Collate SQL_Latin1_General_CP1_CI_AS)
OR (@CaseSensitive = 1 AND Replace(D.DocAscii,'0','\''B0') like @SearchString Collate SQL_Latin1_General_CP1_CS_AS) OR (@CaseSensitive = 1 AND Replace(D.DocAscii,nchar(176),'\''B0') like @SearchString Collate SQL_Latin1_General_CP1_CS_AS)
OR (@CaseSensitive = 0 AND Replace(D.DocAscii,'0','\''B0') like @SearchString Collate SQL_Latin1_General_CP1_CI_AS) OR (@CaseSensitive = 0 AND Replace(D.DocAscii,nchar(176),'\''B0') like @SearchString Collate SQL_Latin1_General_CP1_CI_AS)
) )
AND AND
((isnull(@StepTypeList,'') = '' /*and dbo.vefn_AllSections(C.Type)>=10000*/) ((isnull(@StepTypeList,'') = '' /*and dbo.vefn_AllSections(C.Type)>=10000*/)
@ -3075,7 +3075,7 @@ ELSE
join Entries E on C.ContentID = E.ContentID join Entries E on C.ContentID = E.ContentID
join Documents D on E.DocID = D.DocID join Documents D on E.DocID = D.DocID
where where
(Replace(D.DocAscii,'0','\''B0') like @SearchString OR Replace(D.DocAscii,'0','\''B0') like @SearchStringx Collate SQL_Latin1_General_CP1_CI_AS) (Replace(D.DocAscii,nchar(176),'\''B0') like @SearchString OR Replace(D.DocAscii,nchar(176),'\''B0') like @SearchStringx Collate SQL_Latin1_General_CP1_CI_AS)
AND AND
((isnull(@StepTypeList,'') = '' /*and dbo.vefn_AllSections(C.Type)>=10000*/) ((isnull(@StepTypeList,'') = '' /*and dbo.vefn_AllSections(C.Type)>=10000*/)
or ((dbo.vefn_AllSections(C.Type) in (Select ID from vefn_SplitInt(@StepTypeList,','))))) or ((dbo.vefn_AllSections(C.Type) in (Select ID from vefn_SplitInt(@StepTypeList,',')))))
@ -3102,7 +3102,7 @@ ELSE
join Entries E on C.ContentID = E.ContentID join Entries E on C.ContentID = E.ContentID
join Documents D on E.DocID = D.DocID join Documents D on E.DocID = D.DocID
where where
(Replace(D.DocAscii,'0','\''B0') like @SearchString OR Replace(D.DocAscii,'0','\''B0') like @SearchStringx Collate SQL_Latin1_General_CP1_CS_AS) (Replace(D.DocAscii,nchar(176),'\''B0') like @SearchString OR Replace(D.DocAscii,nchar(176),'\''B0') like @SearchStringx Collate SQL_Latin1_General_CP1_CS_AS)
AND AND
((isnull(@StepTypeList,'') = '' /*and dbo.vefn_AllSections(C.Type)>=10000*/) ((isnull(@StepTypeList,'') = '' /*and dbo.vefn_AllSections(C.Type)>=10000*/)
or ((dbo.vefn_AllSections(C.Type) in (Select ID from vefn_SplitInt(@StepTypeList,','))))) or ((dbo.vefn_AllSections(C.Type) in (Select ID from vefn_SplitInt(@StepTypeList,',')))))