diff options
| author | Jean-Pierre Ledure <jp@ledure.be> | 2015-11-22 11:44:50 +0100 |
|---|---|---|
| committer | Jean-Pierre Ledure <jp@ledure.be> | 2015-11-22 11:44:50 +0100 |
| commit | 960fdcbabe48cd426b78c9dcac66afa21d655883 (patch) | |
| tree | b7091263c8c35ed1c8bba1e646e52cc74657405a /wizards/source/access2base/Database.xba | |
| parent | 9cd20bc273c651097122e5e265bb1b342983203f (diff) | |
Access2Base - OutputStringToHTML review
Addition of "<a id= ...>" tag pattern
Typos
Change-Id: Id03e6224dc91249a9e6246ff94a80427ae76a86e
Diffstat (limited to 'wizards/source/access2base/Database.xba')
| -rw-r--r-- | wizards/source/access2base/Database.xba | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/wizards/source/access2base/Database.xba b/wizards/source/access2base/Database.xba index 4d605d0588c5..ddca57f3cedd 100644 --- a/wizards/source/access2base/Database.xba +++ b/wizards/source/access2base/Database.xba @@ -1109,7 +1109,7 @@ Const cstMaxRows = 200 vTdClass() = _AddArray(vTdClass, "char") Print #piFile, " <td" & _OutputClassToHTML(vTdClass) & ">" & _OutputStringToHTML(vDataCell) & "</td>" Case Else - Print #piFile, " <td" & _OutputClassToHTML(vTdClass) & ">" & _CStr(vDataCell) & "</td" + Print #piFile, " <td" & _OutputClassToHTML(vTdClass) & ">" & _CStr(vDataCell) & "</td>" End Select End If Next i @@ -1131,7 +1131,8 @@ Error_Function: TraceError(TRACEWARNING, Err, "_OutputDataToHTML", Erl) _OutputDataToHTML = False Resume Exit_Function -End Function +End Function ' _OutputDataToHTML + REM ----------------------------------------------------------------------------------------------------------------------- Private Function _OutputDateToHTML(ByVal psDate As Date) As String ' Converts input date to HTML compatible string @@ -1184,7 +1185,7 @@ Dim i As Integer, l As Long vPatterns = Array( _ "&quot;", "&amp;", "&apos;", "&lt;", "&gt;", "&nbsp;" _ , "<pre>", "</pre>", "<br>" _ - , "<a href=""", "</a>", "<img src=""" _ + , "<a href=""", "<a id=""", "</a>", "<img src=""" _ , "<b>", "</b>", "<u>", "</u>", "<i>", "</i>" _ ) @@ -1210,14 +1211,14 @@ Dim i As Integer, l As Long ' Process hyperlink patterns and keep others If Len(sPattern) > 0 Then Select Case LCase(sPattern) - Case "<a href=""", "<img src=""" + Case "<a href=""", "<a id=""", "<img src=""" ' Up to next quote, url-encode lNextQuote = 0 lUrl = lPattern + Len(sPattern) lNextQuote = InStr(lUrl, psString, """", 1) If lNextQuote = 0 Then lNextQuote = Len(psString) ' Should not happen but, if quoted string not closed ... sUrl = Mid(psString, lUrl, lNextQuote - lUrl) - sOutput = sOutput & sPattern & ConvertToUrl(sUrl) & """" + sOutput = sOutput & sPattern & Iif(sPattern = "<a id=""", sUrl, ConvertToUrl(sUrl)) & """" lCurrentChar = lNextQuote + 1 bQuote = False bTagEnd = False |