10.01.2016
This commit is contained in:
@@ -59,7 +59,7 @@ Public Class ClassDOC_SEARCH
|
||||
|
||||
Dim SQL_DOC_SEARCH
|
||||
If CURRENT_SEARCH_TYPE = "ENTITY" Then
|
||||
SQL_DOC_SEARCH = String.Format("SELECT T.*," & vbNewLine & _
|
||||
SQL_DOC_SEARCH = String.Format("SELECT DISTINCT T.*," & vbNewLine & _
|
||||
"[dbo].[FNPMO_GET_CONTROL_VALUES_DOC_ENTITY] ({3},T.DocID,{0}) AS OPTION1," & vbNewLine & _
|
||||
"[dbo].[FNPMO_GET_CONTROL_VALUES_DOC_ENTITY] ({4},T.DocID,{0}) AS OPTION2," & vbNewLine & _
|
||||
"[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{0},'DOCIDX1') AS DOCIDX1," & vbNewLine & _
|
||||
@@ -97,7 +97,7 @@ Public Class ClassDOC_SEARCH
|
||||
End If
|
||||
|
||||
ElseIf CURRENT_SEARCH_TYPE = "RECORD" Then
|
||||
SQL_DOC_SEARCH = String.Format("SELECT T.* ," & vbNewLine & _
|
||||
SQL_DOC_SEARCH = String.Format("SELECT DISTINCT T.* ," & vbNewLine & _
|
||||
"ISNULL(T1.VALUE,'') AS OPTION1," & vbNewLine & _
|
||||
"ISNULL(T2.VALUE,'') AS OPTION2," & vbNewLine & _
|
||||
"ISNULL(T3.VALUE,'') AS OPTION3," & vbNewLine & _
|
||||
@@ -128,7 +128,6 @@ Public Class ClassDOC_SEARCH
|
||||
"LEFT JOIN TBPMO_CONTROL_VALUE T3 ON TRL.RECORD_ID = T3.RECORD_ID AND T3.CONTROL_ID = {4} " & vbNewLine & _
|
||||
"LEFT JOIN TBPMO_CONTROL_VALUE T4 ON TRL.RECORD_ID = T4.RECORD_ID AND T4.CONTROL_ID = {5} " & vbNewLine & _
|
||||
"WHERE TRL.RECORD_ID = {0} AND TR.FORM_ID = {1} AND TRIGHTS.dwUserOrGroupID = {6}", RECORD_ID, ENTITY_ID, OPTION1, OPTION2, OPTION3, OPTION4, USERID_FK_INT_ECM, USER_LANGUAGE, VALUE_CONF1, VALUE_CONF2, VALUE_CONF3, VALUE_CONF4)
|
||||
Return ClassDatabase.Return_Datatable(SQL_DOC_SEARCH, True)
|
||||
ElseIf CURRENT_SEARCH_TYPE = "FULLTEXT" Then
|
||||
Dim sqlft = SQL_FULLTEXT
|
||||
sqlft = sqlft.Replace("@FULLTEXT", CURRENT_FULLTEXT_PATTERN)
|
||||
@@ -154,7 +153,7 @@ Public Class ClassDOC_SEARCH
|
||||
"T.DocID IN ({5}" & vbNewLine & _
|
||||
"))", ENTITY_ID, USER_LANGUAGE, USERID_FK_INT_ECM, OPTION1, OPTION2, sqlft, CURRENT_FULLTEXT_PATTERN)
|
||||
ElseIf CURRENT_SEARCH_TYPE = "NODE_DOWN" Then
|
||||
SQL_DOC_SEARCH = String.Format("SELECT T.* ," & vbNewLine & _
|
||||
SQL_DOC_SEARCH = String.Format("SELECT DISTINCT T.* ," & vbNewLine & _
|
||||
"ISNULL(T1.VALUE,'') AS OPTION1," & vbNewLine & _
|
||||
"ISNULL(T2.VALUE,'') AS OPTION2," & vbNewLine & _
|
||||
"ISNULL(T3.VALUE,'') AS OPTION3," & vbNewLine & _
|
||||
@@ -430,7 +429,15 @@ Public Class ClassDOC_SEARCH
|
||||
Public Shared Function CREATE_DOC_RELATED_LINKS(DOC_ID As Integer, RECORD_ID As Integer)
|
||||
Try
|
||||
Dim execute = String.Format("EXEC [dbo].[PRPMO_DOC_CREATE_NEW_DOC] {0},{1},'{2}'", DOC_ID, RECORD_ID, USER_USERNAME)
|
||||
Return ClassDatabase.Execute_non_Query_withConn(execute, 1)
|
||||
If ClassDatabase.Execute_non_Query(execute) = True Then
|
||||
If LICENSE_SITE_PROXY = True And ClassProxy.MyPROXYConnectionString <> String.Empty Then
|
||||
execute = String.Format("EXEC [dbo].[PRPROXY_DOC_CREATE_NEW_DOC] {0},{1},'{2}'", DOC_ID, RECORD_ID, USER_USERNAME)
|
||||
ClassDatabase.Execute_non_Query(execute, True)
|
||||
Return True
|
||||
Else
|
||||
Return False
|
||||
End If
|
||||
End If
|
||||
Catch ex As Exception
|
||||
MsgBox("Unexpected Error in CREATE_DOC_RELATED_LINKS: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
|
||||
Return False
|
||||
|
||||
Reference in New Issue
Block a user