WebSVN – DevTools – Diff – /ManagerSuite/Release_Manager/trunk/web/rep_new_versions_json.asp

     '   Set someVar  = oJSON.Collection()       (Will create an empty collection)
     '   obj(field) = data                       (Will create a hash entry)
     '   newObj = oJSON.AddToCollection( obj )   (Will create an array)
     Dim lastPvid : lastPvid = 0
-    Dim extraData
+    Dim pvid, lastItem
-    Dim extraIdx
+    Dim childCount, pType
-    Dim pvid
     Set oJSON.data("aaData") = oJSON.Collection()
+    lastItem = null
     While (NOT rsQry.BOF) AND (NOT rsQry.EOF)
         pvid = rsQry("PV_ID")
-        If pvid <> lastPvid Then
+        If lastPvid <> pvid Then
-            ' This is a new entry
+            childCount = 0
-            lastPvid = pvid
+            pType = 0
+        Else
+            childCount = childCount + 1
+            pType = 2
+        End If
-            Set newitem = oJSON.AddToCollection(oJSON.data("aaData"))
+        Set newitem = oJSON.AddToCollection(oJSON.data("aaData"))
-            newitem(0)= rsQry("PV_ID")
+        newitem(0)= rsQry("PV_ID")
-            newitem(1)= rsQry("VIEW_NAME")
+        newitem(1)= rsQry("VIEW_NAME")
-            newitem(2)= rsQry("PKG_ID")
+        newitem(2)= rsQry("PKG_ID")
-            newitem(3)= rsQry("PKG_NAME")
+        newitem(3)= rsQry("PKG_NAME")
-            newitem(4)= rsQry("PKG_VERSION")
+        newitem(4)= rsQry("PKG_VERSION")
-            newitem(5)= rsQry("V_EXT")
+        newitem(5)= rsQry("V_EXT")
-            newitem(6)= rsQry("CREATED_STAMP")
+        newitem(6)= rsQry("CREATED_STAMP")
-            newitem(7)= rsQry("NEW_PV_ID")
+        newitem(7)= rsQry("NEW_PV_ID")
-            newitem(8)= rsQry("NEW_PKG_VERSION")
+        newitem(8)= rsQry("NEW_PKG_VERSION")
-            newitem(9)= rsQry("NEW_CREATED_STAMP")
+        newitem(9)= rsQry("NEW_CREATED_STAMP")
-            extraIdx = 0
+        newitem(10)= pType
-        Else
-            ' Additional Data to be added
-            '   May need to add an array, before adding entries to the array
-            If extraIdx = 0 Then
+        newitem(11)= rsQry("NEW_AGE")
-                Set extraData = oJSON.Collection()
-                newitem.Add 10 ,extraData
+        newitem(12)= rsQry("ETYPE")
-            End If
-            Dim entry: Set entry = oJSON.Collection()
+        ' Is the last item a parent (Has children)
-            entry(0)= rsQry("NEW_PV_ID")
+        '   entry(10)
-            entry(1)= rsQry("NEW_PKG_VERSION")
+        '       0 - Is a parent without children
-            entry(2)= rsQry("NEW_CREATED_STAMP")
+        '       1 - Is a parent with children
-            extraData.Add extraIdx, entry
+        '       2 - Is a child
+        '
+        If childCount = 1 AND NOT isNULL(lastItem)  Then
-            extraIdx = extraIdx + 1
+            lastItem(10)= 1
         End If
+        ' If this is an entry of ETYPE of A, then we skip the next entry.
+        ' It will be repeat
+        If rsQry("ETYPE") = "A" Then
+            rsQry.MoveNext
+        End If
+       lastPvid = pvid
+       Set lastItem = newitem
        rsQry.MoveNext
     Wend
 End Sub

Subversion Repositories DevTools

(root)/ManagerSuite/Release_Manager/trunk/web/rep_new_versions_json.asp – Rev 6953 → 6970