Subversion Repositories DevTools

Rev

Rev 3911 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 3911 Rev 3947
Line 61... Line 61...
61 
        "        BomName       => "& Quote(rsQry("bom_name")) &","& VBNewLine &_
 61 
        "        BomName       => "& Quote(rsQry("bom_name")) &","& VBNewLine &_
62 
        "        BranchName    => "& Quote(rsQry("branch_name")) &","& VBNewLine &_
 62 
        "        BranchName    => "& Quote(rsQry("branch_name")) &","& VBNewLine &_
63 
        "        NodeName      => "& Quote(rsQry("node_name")) &","& VBNewLine &_
 63 
        "        NodeName      => "& Quote(rsQry("node_name")) &","& VBNewLine &_
64 
        "        OsName        => "& Quote(rsQry("os_name")) &","& VBNewLine &_
 64 
        "        OsName        => "& Quote(rsQry("os_name")) &","& VBNewLine &_
65 
        "        ProjectName   => "& Quote(rsQry("proj_name")) &","& VBNewLine &_
 65 
        "        ProjectName   => "& Quote(rsQry("proj_name")) &","& VBNewLine &_
66 
        "        _ForceVersion => "& Quote("{}") & ","& VBNewLine &_
 66 
        "        _ForceVersion => "& "{}" & ","& VBNewLine &_
67 
        "        _NoAdd        => "& Quote("{}") & VBNewLine &_
 67 
        "        _NoAdd        => "& "{}" & VBNewLine &_
68 
        ");"& VBNewLine & VBNewLine
68 
        ");"& VBNewLine & VBNewLine
69
69
70 
	returnString = returnString &_
 70 
	returnString = returnString &_
71 
	"$pkgmnt::G_NodeSBOMVersion = "& Quote(rsQry("sbom_version")) &";"& VBNewLine & VBNewLine &_
 71 
	"$pkgmnt::G_NodeSBOMVersion = "& Quote(rsQry("sbom_version")) &";"& VBNewLine & VBNewLine &_
72 
	"$pkgmnt::G_NodeName = "&        Quote(rsQry("node_name")) &";"& VBNewLine & VBNewLine
 72 
	"$pkgmnt::G_NodeName = "&        Quote(rsQry("node_name")) &";"& VBNewLine & VBNewLine
Line 74... Line 74...
74 
	OraDatabase.Parameters.Remove "OS_ID"
74 
	OraDatabase.Parameters.Remove "OS_ID"
75
75
76 
	rsQry.Close
 76 
	rsQry.Close
77 
	Set rsQry = Nothing
 77 
	Set rsQry = Nothing
78
78
79
- 
 
80 
	OraDatabase.Parameters.Add "OS_ID", nOsId,	ORAPARM_INPUT, ORATYPE_NUMBER
79 
	OraDatabase.Parameters.Add "OS_ID", nOsId,	ORAPARM_INPUT, ORATYPE_NUMBER
81
80
82 
	Set rsQry = OraDatabase.DbCreateDynaset( GetQuery("OsProcessConfig.sql"), ORADYN_DEFAULT )
81 
	Set rsQry = OraDatabase.DbCreateDynaset( GetQuery("OsProcessConfig.sql"), ORADYN_DEFAULT )
83
82
84
- 
 
85 
	If rsQry.Recordcount <> 0 Then
 83 
	If rsQry.Recordcount <> 0 Then
86 
		returnString = returnString &_
 84 
		returnString = returnString &_
87 
		"%pkgmnt::G_NodeProcessHash = ("& VBNewLine
85 
		"%pkgmnt::G_NodeProcessHash = ("& VBNewLine
88 
	Else
 86 
	Else
89 
		returnString = returnString &_
 87 
		returnString = returnString &_
90 
		"%pkgmnt::G_NodeProcessHash = ("
 88 
		"%pkgmnt::G_NodeProcessHash = ("
91
- 
 
92 
	End If
 89 
	End If
93
90
94 
	While (NOT rsQry.BOF) AND (NOT rsQry.EOF)
 91 
	While (NOT rsQry.BOF) AND (NOT rsQry.EOF)
95 
		PkgHealthTag = rsQry("pkg_health_tag")
 92 
		PkgHealthTag = rsQry("pkg_health_tag")
96 
		CmdInterface = rsQry("cmd_interface")
 93 
		CmdInterface = rsQry("cmd_interface")
97 
		Owner = rsQry("pkg_owner")
 94 
		Owner = rsQry("pkg_owner")
98 
		IsInterface = rsQry("is_interface")
 95 
		IsInterface = rsQry("is_interface")
99 
		PkgName = rsQry("pkg_name")
 96 
		PkgName = rsQry("pkg_name")
100
97
101 
 
 - 
 
102
- 
 
103 
		returnString = returnString &_
 98 
		returnString = returnString &_
104 
			Quote(PkgHealthTag) &" => {"& VBNewLine &_
 99 
			Quote(PkgHealthTag) &" => {"& VBNewLine &_
105 
            "        CmdInterface  => "& Quote(CmdInterface) &","& VBNewLine &_
 100 
            "        CmdInterface  => "& Quote(CmdInterface) &","& VBNewLine &_
106 
            "        IsInterface   => "& Quote(IsInterface) &","& VBNewLine &_
 101 
            "        IsInterface   => "& Quote(IsInterface) &","& VBNewLine &_
107 
            "        Pkg           => "& Quote(PkgName) &","& VBNewLine &_
 102 
            "        Pkg           => "& Quote(PkgName) &","& VBNewLine &_
Line 128... Line 123...
128 
 
 123 
 
129 
	OraDatabase.Parameters.Add "OS_ID", nOsId,	ORAPARM_INPUT, ORATYPE_NUMBER
124 
	OraDatabase.Parameters.Add "OS_ID", nOsId,	ORAPARM_INPUT, ORATYPE_NUMBER
130
125
131 
	Set rsQry = OraDatabase.DbCreateDynaset( GetQuery ("ExportOsProductList.sql"), ORADYN_DEFAULT )
 126 
	Set rsQry = OraDatabase.DbCreateDynaset( GetQuery ("ExportOsProductList.sql"), ORADYN_DEFAULT )
132
127
- 
 
 128 
	If rsQry.Recordcount <> 0 Then
133 
	returnString = returnString &_
 129 
		returnString = returnString &_
134 
	"%pkgmnt::G_NodePkgHash = ("& VBNewLine
130 
		"%pkgmnt::G_NodePkgHash = ("& VBNewLine
135
131
136 
	While (NOT rsQry.BOF) AND (NOT rsQry.EOF)
 132 
	    While (NOT rsQry.BOF) AND (NOT rsQry.EOF)
137 
		If IsNull(rsQry("sunos_electronic_name")) Then
 133 
		    If IsNull(rsQry("sunos_electronic_name")) Then
138 
			PkgName = rsQry("pkg_name")
 134 
			    PkgName = rsQry("pkg_name")
139 
		Else
 135 
		    Else
140 
			PkgName = rsQry("sunos_electronic_name")
136 
			    PkgName = rsQry("sunos_electronic_name")
141 
		End If
 137 
		    End If
142
138
143 
		PkgVersion = rsQry("pkg_version")
 139 
		    PkgVersion = rsQry("pkg_version")
144 
		Ext = rsQry("v_ext")
 140 
		    Ext = rsQry("v_ext")
145 
		Description = rsQry("pv_description")
 141 
		    Description = rsQry("pv_description")
146
142
147 
		If InStr(1, PkgName, "ERG") = 1 Or InStr(1, PkgName, "VIX") = 1 Or PkgName = "AceTao"  Then
 143 
		    If InStr(1, PkgName, "ERG") = 1 Or InStr(1, PkgName, "VIX") = 1 Or PkgName = "AceTao"  Then
148 
			PkgFlag = "T"
 144 
			    PkgFlag = "T"
149 
			VersionFlag = "T"
 145 
			    VersionFlag = "T"
150 
		Else
 146 
		    Else
151 
			PkgFlag = "F"
 147 
			    PkgFlag = "F"
152 
			VersionFlag = "F"
148 
			    VersionFlag = "F"
153 
		End If
 149 
		    End If
154
150
155 
		' Format Description
 151 
		    ' Format Description
156 
		If NOT IsNull(Description) Then
 152 
		    If NOT IsNull(Description) Then
157 
			Description = Replace ( Description, VBNewLine, "" )
 153 
			    Description = Replace ( Description, VBNewLine, "" )
158 
			Description = Replace ( Description, """", "" )
 154 
			    Description = Replace ( Description, """", "" )
159 
		End if
 155 
		    End if
160
156
161 
		' Format Extension
 157 
		    ' Format Extension
162 
		If NOT IsNull(Ext) Then
 158 
		    If NOT IsNull(Ext) Then
163 
			' Remove first dot from extension
 159 
			    ' Remove first dot from extension
164 
			If InStr( 1, Ext, "." ) = 1 Then
 160 
			    If InStr( 1, Ext, "." ) = 1 Then
165 
				Ext = Right( Ext, Len(Ext) - 1 )
 161 
				    Ext = Right( Ext, Len(Ext) - 1 )
166 
			End If
 162 
			    End If
167
163
168 
		End If
 164 
		    End If
169
165
170 
 
 166 
 
171
167
172 
		returnString = returnString &_
 168 
		    returnString = returnString &_
173 
			Quote(PkgName) &" => {"& VBNewLine &_
 169 
			    Quote(PkgName) &" => {"& VBNewLine &_
174 
            "          CheckVersionFlag  => "& Quote(VersionFlag) &","& VBNewLine &_
 170 
                "          CheckVersionFlag  => "& Quote(VersionFlag) &","& VBNewLine &_
175 
            "          ERGPkgFlag        => "& Quote(PkgFlag) &","& VBNewLine
 171 
                "          ERGPkgFlag        => "& Quote(PkgFlag) &","& VBNewLine
176
172
177 
		returnString = returnString &_
 173 
		    returnString = returnString &_
178 
            "          PkgDesc           => "& Quote(Description) &","& VBNewLine
 174 
                "          PkgDesc           => "& Quote(Description) &","& VBNewLine
179
175
180 
		If IsNull(Ext) Then
 176 
		    If IsNull(Ext) Then
181 
			returnString = returnString &_
 177 
			    returnString = returnString &_
182 
	            "          PkgProjAcronym    => "& Quote("???") & ","&  VBNewLine &_
 178 
	                "          PkgProjAcronym    => "& Quote("???") & ","&  VBNewLine &_
183 
				"          PkgVersion        => "& Quote(PkgVersion) &  VBNewLine
 179 
				    "          PkgVersion        => "& Quote(PkgVersion) &  VBNewLine
184 
		Else
 180 
		    Else
185 
			returnString = returnString &_
 181 
			    returnString = returnString &_
186 
            	"          PkgProjAcronym    => "& Quote(Ext) &","&  VBNewLine &_
 182 
            	    "          PkgProjAcronym    => "& Quote(Ext) &","&  VBNewLine &_
187 
				"          PkgVersion        => "& Quote(Left(PkgVersion, Len(PkgVersion) - Len(Ext) - 1 )) &  VBNewLine
 183 
				    "          PkgVersion        => "& Quote(Left(PkgVersion, Len(PkgVersion) - Len(Ext) - 1 )) &  VBNewLine
188 
		End If
 184 
		    End If
- 
 
 185
189
186
- 
 
 187 
               returnString = returnString &_
- 
 
 188 
		        "	},"& VBNewLine
190
189
191 
           returnString = returnString &_
 - 
 
192 
		    "	},"& VBNewLine
 - 
 
193
190
194
191
- 
 
 192 
		    rsQry.MoveNext()
- 
 
 193 
	    WEnd
- 
 
 194
- 
 
 195 
	    ' Format final output
- 
 
 196 
	    If NOT IsNull(returnString) Then
- 
 
 197 
		    returnString = Left ( returnString, InStrRev( returnString, "," ) - 1 ) & VBNewLine
- 
 
 198 
	    End If
195
199
- 
 
 200 
	    returnString = returnString &_
- 
 
 201 
	    ");" & VBNewLine & VBNewLine
- 
 
 202
- 
 
 203 
	Else
- 
 
 204 
		returnString = returnString &_
196 
		rsQry.MoveNext()
 205 
		"%pkgmnt::G_NodePkgHash = ();"
197 
	WEnd
 206 
	End If
- 
 
 207
198
208
199 
	OraDatabase.Parameters.Remove "OS_ID"
 209 
	OraDatabase.Parameters.Remove "OS_ID"
200
210
201 
	rsQry.Close
 211 
	rsQry.Close
202 
	Set rsQry = Nothing
 212 
	Set rsQry = Nothing
203
213
204
214
205 
	' Format final output
 - 
 
206 
	If NOT IsNull(returnString) Then
 - 
 
207 
		returnString = Left ( returnString, InStrRev( returnString, "," ) - 1 ) & VBNewLine
 - 
 
208 
	End If
 - 
 
209
- 
 
210 
	returnString = returnString &_
 - 
 
211 
	");" & VBNewLine & VBNewLine & "1;" & VBNewLine
215 
	returnString = returnString & VBNewLine & VBNewLine & "1;" & VBNewLine
212
- 
 
213
216
214 
	' Return string
217 
	' Return string
215 
	GenerateOsSpec = returnString
 218 
	GenerateOsSpec = returnString
216
219
217 
End Function
 220 
End Function