[Andro-hacker] SF.net SVN: andro:[1207] trunk/andro/application/androBuild.php

[<dor...@us...>]

Revision: 1207
          http://andro.svn.sourceforge.net/andro/?rev=1207&view=rev
Author:   dorgan1983
Date:     2009-01-30 16:15:09 +0000 (Fri, 30 Jan 2009)

Log Message:
-----------
ok one final change and we should be go to go.

Modified Paths:
--------------
    trunk/andro/application/androBuild.php

Modified: trunk/andro/application/androBuild.php
===================================================================
--- trunk/andro/application/androBuild.php	2009-01-30 15:56:43 UTC (rev 1206)
+++ trunk/andro/application/androBuild.php	2009-01-30 16:15:09 UTC (rev 1207)
@@ -174,6 +174,13 @@
         'md5'=>md5_file( $parm['DIR_PUB']."lib/".$specboot ),
         'fullpath'=>$parm['DIR_PUB']."lib/".$specboot
     );
+    
+    if ( isset( $parm['INST'] ) ) {
+        $app = str_replace( '_' .$parm['INST'], '', $parm['APPLICATION'] );
+    } else {
+        $app = $parm['APPLICATION'];
+    }
+    
     if ($parm["SPEC_LIST"]<>"") {
         $speclist = explode(",",$parm["SPEC_LIST"]);
         foreach ($speclist as $spec) {
@@ -195,10 +202,9 @@
         $this->LogEntry("Instance tracking table doesnt exist yet...ignoring until next build");
         return true;
     }
-
     foreach( $checksums as $checksum ) {
         $query = "SELECT checksum,skey FROM " .ddTable_idResolve( 'instance_spec_checksums' ) ." WHERE 
-            application=" .SQLFC( $parm['APP'] ) ." AND spec_name=" .SQLFC( $checksum['file'] )
+            application=" .SQLFC( $app ) ." AND spec_name=" .SQLFC( $checksum['file'] )
             .( isset( $parm['INST'] ) ? " AND instance=" .SQLFC( $parm['INST'] ) : '' );
         $row = SQL_OneRow( $query );
 
@@ -217,7 +223,7 @@
         } else {
             $this->LogEntry( 'Entry for ' .$checksum['file']  .' not found' );
             $checksum_entry = array(
-                'application'=>$parm['APP'],
+                'application'=>$app,
                 'instance'=>( isset( $parm['INST'] ) ? $parm['INST'] : '' ),
                 'spec_name'=>$checksum['file'],
                 'checksum'=>md5_file( $checksum['fullpath'] )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.