Subversion Repositories DevTools

Rev

Rev 7137 | Rev 7169 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 7137 Rev 7163
Line 2565... Line 2565...
2565 
                    p.mBuildTime = buildTime;
 2565 
                    p.mBuildTime = buildTime;
2566
2566
2567 
                    //  If this package is to be replaced by a planned package then
 2567 
                    //  If this package is to be replaced by a planned package then
2568 
                    //  insert some of the current packages attributes
 2568 
                    //  insert some of the current packages attributes
2569 
                    //  Otherwise, add the the package to the package collection
 2569 
                    //  Otherwise, add the the package to the package collection
2570 
                    //
 2570 
                    //  TODO - Not sure this code is in use anymore
2571 
 
 2571 
 
2572 
                    Package plannedPackage = findPackage(p.mAlias, packageCollection);
 2572 
                    Package plannedPackage = findPackage(p.mAlias, packageCollection);
2573 
                    if ( plannedPackage == NULL_PACKAGE )
 2573 
                    if ( plannedPackage == NULL_PACKAGE )
2574 
                    {
 2574 
                    {
2575 
                        mLogger.info("queryPackageVersions rset8 no planned package {}", pv_id);
 2575 
                        mLogger.info("queryPackageVersions rset8 no planned package {}", pv_id);
Line 2621... Line 2621...
2621 
                    String v_ext = rset9.getString("v_ext","");
 2621 
                    String v_ext = rset9.getString("v_ext","");
2622 
 
 2622 
 
2623 
                    Package p = findPackage(pv_id, packageCollection);
 2623 
                    Package p = findPackage(pv_id, packageCollection);
2624 
                    if ( p != NULL_PACKAGE )
 2624 
                    if ( p != NULL_PACKAGE )
2625 
                    {
 2625 
                    {
2626 
                        p.mDependencyCollection.add(pkg_name + v_ext);
 - 
 
2627 
                        p.mDependencyIDCollection.add(dpv_id);
 2626 
                        p.addDependency(pkg_name + v_ext, dpv_id );
2628 
                    }
 2627 
                    }
2629 
 
 2628 
 
2630 
                }
 2629 
                }
2631 
                mLogger.debug("queryPackageVersions: stmt9 processing complete");
 2630 
                mLogger.debug("queryPackageVersions: stmt9 processing complete");
2632 
 
 2631 
 
Line 3206... Line 3205...
3206 
            {
 3205 
            {
3207 
                String dpv_name = rset2.mustGetKeyString("pkg_name");
 3206 
                String dpv_name = rset2.mustGetKeyString("pkg_name");
3208 
                String dpv_ext = rset2.getString("v_ext","");
 3207 
                String dpv_ext = rset2.getString("v_ext","");
3209 
                int    dpvId = rset2.mustGetInt("pv_id");
 3208 
                int    dpvId = rset2.mustGetInt("pv_id");
3210
3209
3211 
                p.mDependencyCollection.add(dpv_name + dpv_ext);
 3210 
                p.addDependency(dpv_name + dpv_ext, dpvId);
3212 
                p.mDependencyIDCollection.add(dpvId);
 - 
 
3213 
            }
 3211 
            }
3214 
 
 3212 
 
3215 
            rset2.close();
 3213 
            rset2.close();
3216 
            stmt2.close();
 3214 
            stmt2.close();
3217 
 
 3215 
 
Line 3509... Line 3507...
3509 
                    String v_ext = rset.getString("v_ext","");
 3507 
                    String v_ext = rset.getString("v_ext","");
3510 
                    String vcs_tag = rset.getString("vcsTag","");
 3508 
                    String vcs_tag = rset.getString("vcsTag","");
3511 
 
 3509 
 
3512 
                    Package p = new Package(0, pv_id, pkg_name, pkg_version, v_ext, pkg_name + "." + pkg_version, vcs_tag, 'x');
 3510 
                    Package p = new Package(0, pv_id, pkg_name, pkg_version, v_ext, pkg_name + "." + pkg_version, vcs_tag, 'x');
3513 
                    resultset.add(p);
 3511 
                    resultset.add(p);
3514 
                    pkg.mDependencyCollection.add(p.mAlias);
 3512 
                    pkg.addDependency(p.mAlias, -1);
3515 
                }
 3513 
                }
3516 
 
 3514 
 
3517 
                rset.close();
 3515 
                rset.close();
3518 
                stmt.close();
 3516 
                stmt.close();
3519 
            }
 3517 
            }