diff --git a/PROMS/SQL/PROMS2010.SQL b/PROMS/SQL/PROMS2010.SQL index 9294e642..49fb5aff 100644 --- a/PROMS/SQL/PROMS2010.SQL +++ b/PROMS/SQL/PROMS2010.SQL @@ -13017,8 +13017,6 @@ RETURNS @FoundContents TABLE WITH EXECUTE AS OWNER AS BEGIN -Declare @SearchString2 nvarchar(200) -Set @SearchString2 = case when @CaseSensitive = 2 then Cast(@SearchString as nvarchar(200)) else 'IGNORE_FULL_TEXT_SEARCH' end Set @SearchString = .dbo.vefn_FixSearchString(@SearchString) IF isnull(@SearchString,'')='' BEGIN @@ -13066,19 +13064,6 @@ ELSE ((isnull(@StepTypeList,'') = '' and dbo.vefn_AllSections(C.Type)>=10000) or ((dbo.vefn_AllSections(C.Type) in (Select ID from vefn_SplitInt(@StepTypeList,','))))) END - ELSE -- @CaseSensitive = 2 -- FullText Search - BEGIN - insert into @FoundContents - select C.ContentID from Contents C - left join Entries E on C.ContentID = E.ContentID - left join Documents D on E.DocID = D.DocID - where - (CONTAINS(C.text, @SearchString2) OR CONTAINS(D.DocAscii, @SearchString2)) - AND - ((isnull(@StepTypeList,'') = '' and dbo.vefn_AllSections(C.Type)>=10000) - or - ((dbo.vefn_AllSections(C.Type) in (Select ID from vefn_SplitInt(@StepTypeList,','))))) - END END RETURN END @@ -15614,8 +15599,6 @@ Declare @DelimNumber char(1) Set @DelimNumber=char(17) Declare @DelimStep char(1) Set @DelimStep='.' -Declare @SearchString2 nvarchar(200) -Set @SearchString2 = case when @CaseSensitive = 2 then Cast(@SearchString as nvarchar(200)) else 'IGNORE_FULL_TEXT_SEARCH' end Set @SearchString = .dbo.vefn_FixSearchString(@SearchString) begin with Itemz(DVPath, [Level], [ParentID], [Ordinal], [ItemID], [PreviousID], [FromType], [ContentID], [DTS], [UserID], [LastChanged],[pContentID], @@ -15706,10 +15689,8 @@ select DvPath, Path, I.[Level],I.[FromType],I.[Ordinal], I.[ParentID], I.[ItemID (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 = 0 AND .dbo.vefn_RemoveExtraText(C.Text,@IncludeLinks, @IncludeRtfFormatting, @IncludeSpecialCharacters) like @SearchString Collate SQL_Latin1_General_CP1_CI_AS) - OR (@CaseSensitive = 2 AND CONTAINS(C.text, @SearchString2)) OR (@CaseSensitive = 1 AND D.DocAscii like @SearchString Collate SQL_Latin1_General_CP1_CS_AS) OR (@CaseSensitive = 0 AND D.DocAscii like @SearchString Collate SQL_Latin1_General_CP1_CI_AS) - OR (@CaseSensitive = 2 AND CONTAINS(D.DocAscii, @SearchString2)) ) AND ((isnull(@StepTypeList,'') = '' and dbo.vefn_AllSections(C.Type)>=10000) diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 6100f23b..fdd6fdfd 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -920,7 +920,7 @@ namespace Volian.Print.Library XOffset = hls1.XOffset + hls1.Width / 2 - Width / 2; // xoffset if AER column int colR = int.Parse(formatInfo.MyStepSectionLayoutData.ColRTable.Split(",".ToCharArray())[itemInfo.ColumnMode]); float xLowerLimit = 6; // Adjusted for HLP VE-PROMS - float xUpperLimit = hls1.XOffset + hls1.Width + colR * itemInfo.ColumnMode + 18; // Adjusted for HLP VE-PROMS + float xUpperLimit = hls1.XOffset + hls1.Width + colR * itemInfo.ColumnMode; // 20110429 RHM Adjusted for RNO Tables Removed +18; // Adjusted for HLP VE-PROMS if (!aerTableOrFigure && itemInfo.RNOLevel == 0) // Centered Table of Figure { // adjust for RNO @@ -987,7 +987,7 @@ namespace Volian.Print.Library cbMess = itemInfo.MyContent.UserID; else if (myPageHelper.ChangeBarDefinition.MyChangeBarText == PrintChangeBarText.DateChgID) { - string fmtDate = itemInfo.DTS.ToShortDateString(); + string fmtDate = itemInfo.MyContent.DTS.ToShortDateString(); if (fmtDate.Length != 10) // need to add zeros { if (fmtDate.IndexOf("/") == 1)