Compare commits
No commits in common. "e3d16142ac646b2385f9bea83a7f140a67acb15f" and "c508255ab3aef8010afdcba245ce45d9394ab348" have entirely different histories.
e3d16142ac
...
c508255ab3
@ -2752,29 +2752,6 @@ namespace VEPROMS.CSLA.Library
|
|||||||
}
|
}
|
||||||
#endregion UnlinkEnhanced
|
#endregion UnlinkEnhanced
|
||||||
#region Search
|
#region Search
|
||||||
|
|
||||||
//CSM C2024-025 Removing the strange tall box characters that appear in the search results tree
|
|
||||||
//Create cleaned version of variable for use in DisplaySearch
|
|
||||||
//This is the Function that does the cleaning
|
|
||||||
public string CleanSearchString(string value)
|
|
||||||
{
|
|
||||||
// \u000C = PageBreak
|
|
||||||
// \u0009 = Tab
|
|
||||||
// \u160? = Hard Space
|
|
||||||
// \u0007 = Bell (Separates Parent Path and Child Path)
|
|
||||||
// \u0011 - Separates DisplayNumber & DisplayText of Step
|
|
||||||
|
|
||||||
if (value == null)
|
|
||||||
return null;
|
|
||||||
|
|
||||||
string tmp = value.Replace("\a", "\\").Replace("\u0007", "\\");
|
|
||||||
tmp = tmp.Replace("\u000C", " ").Replace("\u0009", " ").Replace(@"\u160?", " ").Replace("\u0011", " ");
|
|
||||||
|
|
||||||
if (tmp.StartsWith("\\"))
|
|
||||||
tmp = tmp.Substring(1);
|
|
||||||
return tmp;
|
|
||||||
}
|
|
||||||
|
|
||||||
internal string _SearchDVPath;
|
internal string _SearchDVPath;
|
||||||
public string SearchDVPath
|
public string SearchDVPath
|
||||||
{
|
{
|
||||||
@ -2790,10 +2767,6 @@ namespace VEPROMS.CSLA.Library
|
|||||||
return _SearchDVPath;
|
return _SearchDVPath;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//CSM C2024-025 Removing the strange tall box characters that appear in the search results tree
|
|
||||||
//Create cleaned version of variable for use in DisplaySearch
|
|
||||||
public string SearchDVPath_clean => CleanSearchString(SearchDVPath);
|
|
||||||
|
|
||||||
internal string _SearchPath;
|
internal string _SearchPath;
|
||||||
public string SearchPath
|
public string SearchPath
|
||||||
{
|
{
|
||||||
@ -2817,10 +2790,6 @@ namespace VEPROMS.CSLA.Library
|
|||||||
return _SearchPath;
|
return _SearchPath;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//CSM C2024-025 Removing the strange tall box characters that appear in the search results tree
|
|
||||||
//Create cleaned version of variable for use in DisplaySearch
|
|
||||||
public string SearchPath_clean => CleanSearchString(SearchPath);
|
|
||||||
|
|
||||||
public string ShortSearchPath
|
public string ShortSearchPath
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
@ -2831,9 +2800,6 @@ namespace VEPROMS.CSLA.Library
|
|||||||
return dtext;
|
return dtext;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//CSM C2024-025 Removing the strange tall box characters that appear in the search results tree
|
|
||||||
//Create cleaned version of variable for use in DisplaySearch
|
|
||||||
public string ShortSearchPath_clean => CleanSearchString(ShortSearchPath);
|
|
||||||
|
|
||||||
// B2021-076: Proms search results are not presented in order when printed to PDF
|
// B2021-076: Proms search results are not presented in order when printed to PDF
|
||||||
internal string _SearchDefaultSort;
|
internal string _SearchDefaultSort;
|
||||||
|
@ -66,7 +66,7 @@ namespace Volian.Controls.Library
|
|||||||
private Color saveGrpPanSearchResults;
|
private Color saveGrpPanSearchResults;
|
||||||
private ItemInfoList _SearchResults;
|
private ItemInfoList _SearchResults;
|
||||||
|
|
||||||
private string _DisplayMember = "SearchPath_clean";
|
private string _DisplayMember = "SearchPath";
|
||||||
private bool _OpenDocFromSearch;
|
private bool _OpenDocFromSearch;
|
||||||
private ROFSTLookup _MyROFSTLookup;
|
private ROFSTLookup _MyROFSTLookup;
|
||||||
private bool _LoadingList = false;
|
private bool _LoadingList = false;
|
||||||
@ -1745,7 +1745,7 @@ namespace Volian.Controls.Library
|
|||||||
}
|
}
|
||||||
|
|
||||||
// B2021-076: Proms search results are not presented in order when printed to PDF
|
// B2021-076: Proms search results are not presented in order when printed to PDF
|
||||||
if (_DisplayMember == "SearchPath_clean" || _DisplayMember == "ShortSearchPath_clean")
|
if (_DisplayMember == "SearchPath" || _DisplayMember == "ShortSearchPath")
|
||||||
{
|
{
|
||||||
cbSorted.Checked = false;
|
cbSorted.Checked = false;
|
||||||
cbSorted.Enabled = false;
|
cbSorted.Enabled = false;
|
||||||
@ -1880,10 +1880,10 @@ namespace Volian.Controls.Library
|
|||||||
switch (cmbResultsStyle.Text)
|
switch (cmbResultsStyle.Text)
|
||||||
{
|
{
|
||||||
case "Document Path":
|
case "Document Path":
|
||||||
_DisplayMember = "SearchDVPath_clean";
|
_DisplayMember = "SearchDVPath";
|
||||||
break;
|
break;
|
||||||
case "Step Path":
|
case "Step Path":
|
||||||
_DisplayMember = "ShortSearchPath_clean";
|
_DisplayMember = "ShortSearchPath";
|
||||||
break;
|
break;
|
||||||
case "Annotation Text":
|
case "Annotation Text":
|
||||||
_DisplayMember = "SearchAnnotationText";
|
_DisplayMember = "SearchAnnotationText";
|
||||||
@ -1892,7 +1892,7 @@ namespace Volian.Controls.Library
|
|||||||
_DisplayMember = "DisplayText";
|
_DisplayMember = "DisplayText";
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
_DisplayMember = "SearchPath_clean";
|
_DisplayMember = "SearchPath";
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
DisplayResults();
|
DisplayResults();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user