Subversion Repositories DevTools

Rev

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

Rev 317 Rev 361
Line 297... Line 297...
297 
            }
 297 
            }
298 
            $sth->finish();
 298 
            $sth->finish();
299 
        }
 299 
        }
300 
        else
 300 
        else
301 
        {
 301 
        {
302 
        Error("Execute failure: getGlobal" );
 302 
        Error("Execute failure: getGlobal", $m_sqlstr );
303 
        }
 303 
        }
304 
    }
 304 
    }
305 
    else
 305 
    else
306 
    {
 306 
    {
307 
        Error("Prepare failure: getGlobal" );
 307 
        Error("Prepare failure: getGlobal" );
Line 326... Line 326...
326 
    # if we are not or cannot connect then return 0 as we have not found anything
 326 
    # if we are not or cannot connect then return 0 as we have not found anything
327 
    connectRM( \$RM_DB) unless $RM_DB;
 327 
    connectRM( \$RM_DB) unless $RM_DB;
328 
 
 328 
 
329 
    # First get details from pv_id
 329 
    # First get details from pv_id
330 
 
 330 
 
331 
    my $m_sqlstr = "SELECT rc.RCON_ID, rc.RTAG_ID, rc.GBE_ID, rc.DAEMON_HOSTNAME, " .
 331 
    my $m_sqlstr = "SELECT rc.RCON_ID, rc.RTAG_ID, rc.GBE_ID, bm.DISPLAY_NAME, " .
332 
                          "rc.DAEMON_MODE, rc.GBE_BUILDFILTER, rt.RTAG_NAME, " .
 332 
                          "rc.DAEMON_MODE, rc.GBE_BUILDFILTER, rt.RTAG_NAME, " .
333 
                          "p.PROJ_NAME, rt.OFFICIAL" .
 333 
                          "p.PROJ_NAME, rt.OFFICIAL".
334 
                    " FROM release_manager.release_config rc, release_manager.RELEASE_TAGS rt, release_manager.PROJECTS p" .
 334 
                    " FROM release_manager.release_config rc, " .
- 
 
 335 
                           "release_manager.RELEASE_TAGS rt, " .
- 
 
 336 
                           "release_manager.PROJECTS p, " .
- 
 
 337 
                           "release_manager.BUILD_MACHINE_CONFIG bm " .
335 
                    " WHERE      rt.RTAG_ID = rc.RTAG_ID " .
 338 
                    " WHERE      rt.RTAG_ID = rc.RTAG_ID " .
336 
                            "AND rt.PROJ_ID = p.PROJ_ID " .
 339 
                            "AND rt.PROJ_ID = p.PROJ_ID " .
337 
                            "AND rt.OFFICIAL != 'A' " .
 340 
                            "AND rt.OFFICIAL != 'A' " .
338 
                            "AND rt.OFFICIAL != 'Y' "
 341 
                            "AND rt.OFFICIAL != 'Y' " .
- 
 
 342 
                            "AND rc.GBE_ID = bm.GBE_ID " .
- 
 
 343 
                            "AND rc.DAEMON_HOSTNAME is not null" .
339 
                            ;
 344 
                            "";
340 
 
 345 
 
341 
    my $sth = $RM_DB->prepare($m_sqlstr);
 346 
    my $sth = $RM_DB->prepare($m_sqlstr);
342 
    if ( defined($sth) )
 347 
    if ( defined($sth) )
343 
    {
 348 
    {
344 
        if ( $sth->execute( ) )
 349 
        if ( $sth->execute( ) )
Line 363... Line 368...
363 
                        next unless ( defined $opt_rtag{$rtag_id} );
 368 
                        next unless ( defined $opt_rtag{$rtag_id} );
364 
                    }
 369 
                    }
365 
 
 370 
 
366 
                    my %data;
 371 
                    my %data;
367 
                    $data{rcon_id}  = $rcon_id;
 372 
                    $data{rcon_id}  = $rcon_id;
368 
                    $data{hostname} = $hostname;
 - 
 
369 
                    $data{hostname} = $hostname;
 373 
                    $data{hostname} = $hostname || 'Unknown';
370 
                    $data{hostmode} = $hostmode;
 374 
                    $data{hostmode} = $hostmode;
371 
                    $data{filter}   = $filter;
 375 
                    $data{filter}   = $filter;
372 
 
 376 
 
373 
                    $rc{$rtag_id}{$rcon_id} = \%data;
 377 
                    $rc{$rtag_id}{$rcon_id} = \%data;
374 
 
 378 
 
Line 383... Line 387...
383 
            }
 387 
            }
384 
            $sth->finish();
 388 
            $sth->finish();
385 
        }
 389 
        }
386 
        else
 390 
        else
387 
        {
 391 
        {
388 
        Error("Execute failure: GetConfigData" );
 392 
        Error("Execute failure: GetConfigData", $m_sqlstr, $sth->errstr() );
389 
        }
 393 
        }
390 
    }
 394 
    }
391 
    else
 395 
    else
392 
    {
 396 
    {
393 
        Error("Prepare failure: GetConfigData" );
 397 
        Error("Prepare failure: GetConfigData" );