Skip to content

Bdeboe refinements #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 2, 2018
Merged

Bdeboe refinements #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f8906f9
minor refinement to similarity logic
bdeboe Feb 8, 2018
b907f1d
add CHARSET parameter
bdeboe Feb 8, 2018
daa27d1
Set encoding for ttf and woff files
eduard93 May 31, 2018
a22f00e
Enforce utf-8 in API
eduard93 Jun 1, 2018
3c95b6a
Do not serve everything as utf-8
eduard93 Jun 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions src/cls/EntityBrowser/API.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,9 +395,16 @@ IsSimilar(tOriginIndex, tDestIndex, mode="")

set similar = 1
for posO = 1:1:pEntityTokens(tOriginIndex,0) {
set similar = 0
set similar = 0, length = $l(pEntityTokens(tOriginIndex,posO))
for posD = 1:1:pEntityTokens(tDestIndex,0) {
set similar = ''$find(pEntityTokens(tDestIndex,posD),pEntityTokens(tOriginIndex,posO))

// for single-character tokens, require starting position
if length=1 {
set similar = ($e(pEntityTokens(tDestIndex,posD),1,length)=pEntityTokens(tOriginIndex,posO))
} else {
set similar = ''$find(pEntityTokens(tDestIndex,posD),pEntityTokens(tOriginIndex,posO))
}

quit:similar
}
quit:'similar
Expand Down Expand Up @@ -459,4 +466,11 @@ ClassMethod TokenizeString(Output pTokens, pString As %String)
}
}

/// Enforce utf-8
ClassMethod %ProcessResult(pSC As %Status, pResult As %DynamicObject = "") As %Status [ Internal ]
{
set %response.CharSet = "utf-8"
quit ##super(pSC, pResult)
}

}
2 changes: 1 addition & 1 deletion src/cls/EntityBrowser/ServeXData.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Parameter Files As CONFIGVALUE;
Parameter Encoding As %String = "utf-8";

/// List of mime types second parts (delimited by slash), which will Encoding be set for.
Parameter UseEncodingFor = {$LB("html", "css", "javascript", "plain")};
Parameter UseEncodingFor = {$LB("html", "css", "javascript", "plain", "ttf", "woff")};

/// A generator for Files parameter.
ClassMethod FillFiles() As %Status [ CodeMode = objectgenerator ]
Expand Down