Merge branch 'master' of http://git.dd:3000/AppStd/Modules
This commit is contained in:
commit
4d7cb6ad4f
@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
|
||||
' übernehmen, indem Sie "*" eingeben:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("2.3.5.1")>
|
||||
<Assembly: AssemblyFileVersion("2.3.5.1")>
|
||||
<Assembly: AssemblyVersion("2.3.5.2")>
|
||||
<Assembly: AssemblyFileVersion("2.3.5.2")>
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
Public Class Queries
|
||||
Public Class DD_ECM
|
||||
Public Class ThirdPartyModules
|
||||
Public Const GdPictureLicense As String = "SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'"
|
||||
Public Const GdPictureLicense As String = "SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE' AND ACTIVE = 1"
|
||||
End Class
|
||||
|
||||
Public Class Connections
|
||||
Public Const AllConnections As String = "SELECT * FROM TBDD_CONNECTION"
|
||||
Public Const AllConnections As String = "SELECT * FROM TBDD_CONNECTION AND AKTIV = 1"
|
||||
End Class
|
||||
End Class
|
||||
End Class
|
||||
|
||||
@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
|
||||
' übernehmen, indem Sie "*" eingeben:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("1.9.4.0")>
|
||||
<Assembly: AssemblyFileVersion("1.9.4.0")>
|
||||
<Assembly: AssemblyVersion("1.9.5.0")>
|
||||
<Assembly: AssemblyFileVersion("1.9.5.0")>
|
||||
|
||||
@ -890,10 +890,13 @@ Public Class Windream
|
||||
''' <param name="SearchFilePath">Path of a search file (*.wdf)</param>
|
||||
''' <param name="DocIdIndexName">Index containing the Document-ID</param>
|
||||
''' <returns>A datatable of the results with columns PATH and DOCID</returns>
|
||||
Public Function GetSearchDocuments(SearchFilePath As String, DocIdIndexName As String) As DataTable
|
||||
Public Function GetSearchDocuments(SearchFilePath As String, Optional DocIdIndexName As String = "") As DataTable
|
||||
Dim oDatatable As New DataTable
|
||||
oDatatable.Columns.Add("PATH", GetType(String))
|
||||
oDatatable.Columns.Add("DOCID", GetType(Integer))
|
||||
If DocIdIndexName = "" Then
|
||||
DocIdIndexName = "Dokument-ID"
|
||||
End If
|
||||
|
||||
If TestSessionLoggedIn() = False Then
|
||||
Return oDatatable
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user