Changeset 14156 for trunk


Ignore:
Timestamp:
06/11/12 18:30:14 (12 years ago)
Author:
Daniela Dorner
Message:
small fix for entries where only one of the new checksums is filled
Location:
trunk/Mars/datacenter/db
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Mars/datacenter/db/fact_runinfo.php

    r14149 r14156  
    194194            $_GET["if(fHasDrsFile=0,\"N\",fDrsStep)"]=$first?"Off":"";
    195195
    196         if (empty($_GET["if(!isnull(fCheckSum)+!isnull(fDataSum),Concat(fCheckSum,\"/\",fDataSum),Concat(fMd5sumRaw,\"/\",fMd5sumRawZip))"]))
    197             $_GET["if(!isnull(fCheckSum)+!isnull(fDataSum),Concat(fCheckSum,\"/\",fDataSum),Concat(fMd5sumRaw,\"/\",fMd5sumRawZip))"]=$first?"Off":"";
     196        if (empty($_GET["if(isnull(fCheckSum)+isnull(fDataSum),Concat(fMd5sumRaw,\"/\",fMd5sumRawZip),Concat(fCheckSum,\"/\",fDataSum))"]))
     197            $_GET["if(isnull(fCheckSum)+isnull(fDataSum),Concat(fMd5sumRaw,\"/\",fMd5sumRawZip),Concat(fCheckSum,\"/\",fDataSum))"]=$first?"Off":"";
    198198
    199199        if (empty($_GET["fRunTypeName"]))
    … …  
    286286        CheckBox("fCompileTime",                     "compiled");
    287287        CheckBox("fRevisionNumber",                  "rev#");
    288         CheckBox("if(!isnull(fCheckSum)+!isnull(fDataSum),Concat(fCheckSum,\"/\",fDataSum),Concat(fMd5sumRaw,\"/\",fMd5sumRawZip))",  "checksum");
     288        CheckBox("if(isnull(fCheckSum)+isnull(fDataSum),Concat(fMd5sumRaw,\"/\",fMd5sumRawZip),Concat(fCheckSum,\"/\",fDataSum))",  "checksum");
    289289
    290290        printf("  </tr>\n");

  • trunk/Mars/datacenter/db/factdefs.php

    r14149 r14156  
    1818     "Run"                              => "Run",
    1919     "fRunTypeName"                     => "RunType",
    20      "if(!isnull(fCheckSum)+!isnull(fDataSum),Concat(fCheckSum,\"/\",fDataSum),Concat(fMd5sumRaw,\"/\",fMd5sumRawZip))" => "checksum",
     20     "if(isnull(fCheckSum)+isnull(fDataSum),Concat(fMd5sumRaw,\"/\",fMd5sumRawZip),Concat(fCheckSum,\"/\",fDataSum))" => "checksum",
    2121     "fROI"                             => "roi",
    2222     "fROITimeMarker"                   => "roi-tm",
Note: See TracChangeset for help on using the changeset viewer.