Subversion Repositories DevTools

Rev

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

Rev 7186 Rev 7201
Line 3497... Line 3497...
3497 
			ResultSet rset = stmt.executeQuery();
 3497 
			ResultSet rset = stmt.executeQuery();
3498 
 
 3498 
 
3499 
			while( rset.next() )
 3499 
			while( rset.next() )
3500 
			{
 3500 
			{
3501 
				// Previous Version of this package, without the project suffix
 3501 
				// Previous Version of this package, without the project suffix
3502 
				String pkg_prevVersion = rset.getString("pkg_version");
 3502 
				String pkgPrevVersion = rset.getString("pkg_version");
3503 
				if (pkg_prevVersion != null)
3503 
				if (pkgPrevVersion != null)
3504 
				{
 3504 
				{
3505 
					String pkg_prevVext = rset.getString("v_ext");
 3505 
					String pkgPrevVext = rset.getString("v_ext");
3506 
					if (pkg_prevVext != null)
3506 
					if (pkgPrevVext != null)
3507 
					{
 3507 
					{
3508 
						int endindex = pkg_prevVersion.length() - pkg_prevVext.length();
 3508 
						int endindex = pkgPrevVersion.length() - pkgPrevVext.length();
3509 
						if ( endindex > 0 )
 3509 
						if ( endindex > 0 )
3510 
						{
 3510 
						{
3511 
							baseVersion = pkg_prevVersion.substring(0, endindex);
 3511 
							baseVersion = pkgPrevVersion.substring(0, endindex);
3512 
						}
 3512 
						}
3513 
					}
 3513 
					}
3514 
				}
 3514 
				}
3515
3515
3516 
				// Only want the first entry
 3516 
				// Only want the first entry
Line 3545... Line 3545...
3545 
     *
3545 
     *
3546 
     *   This function is called recursively
 3546 
     *   This function is called recursively
3547 
     */
 3547 
     */
3548 
    private void traverseDependencies(PackageCollection packageCollection, Package pkg, boolean checkCollection, ListIterator<Package> listIterator) throws SQLException, Exception
 3548 
    private void traverseDependencies(PackageCollection packageCollection, Package pkg, boolean checkCollection, ListIterator<Package> listIterator) throws SQLException, Exception
3549 
    {
 3549 
    {
3550 
// TODO - this needs some work and some testing
- 
 
3551 
        mLogger.debug("traverseDependencies {}", checkCollection);
 3550 
        mLogger.debug("traverseDependencies {}", checkCollection);
3552 
        boolean pvIdInCollection = false;
 3551 
        boolean pvIdInCollection = false;
3553 
 
 3552 
 
3554 
        if ( checkCollection )
 3553 
        if ( checkCollection )
3555 
        {
 3554 
        {
Line 3583... Line 3582...
3583 
                stmt.setFetchSize(1000);
 3582 
                stmt.setFetchSize(1000);
3584 
                RmResultSet rset = new RmResultSet(stmt.executeQuery(),"traverseDependencies");
 3583 
                RmResultSet rset = new RmResultSet(stmt.executeQuery(),"traverseDependencies");
3585 
 
 3584 
 
3586 
                while (rset.next())
 3585 
                while (rset.next())
3587 
                {
 3586 
                {
3588 
                    int pv_id = rset.mustGetKeyInt("pv_id");
 3587 
                    int pvId = rset.mustGetKeyInt("pv_id");
3589 
                    String pkg_name = rset.mustGetString("pkg_name");
 3588 
                    String pkgName = rset.mustGetString("pkg_name");
3590 
                    String pkg_version = rset.mustGetString("pkg_version");
 3589 
                    String pkgVersion = rset.mustGetString("pkg_version");
3591 
                    String v_ext = rset.getString("v_ext","");
 3590 
                    String vExt = rset.getString("v_ext","");
3592 
                    String vcs_tag = rset.getString("vcsTag","");
 3591 
                    String vcsTag = rset.getString("vcsTag","");
3593 
 
 3592 
 
3594 
                    Package p = new Package(0, pv_id, pkg_name, pkg_version, v_ext, pkg_name + "." + pkg_version, vcs_tag, 'x');
 3593 
                    Package p = new Package(0, pvId, pkgName, pkgVersion, vExt, pkgName + "." + pkgVersion, vcsTag, 'x');
3595 
                    resultset.add(p);
 3594 
                    resultset.add(p);
3596 
                    pkg.addDependency(p.mAlias, -1);
 3595 
                    pkg.addDependency(p.mAlias, -1);
3597 
                }
 3596 
                }
3598 
 
 3597 
 
3599 
                rset.close();
 3598 
                rset.close();