fa5814468fee9631cc8c9fb992e0c520bc0929a1 tdreszer Fri Jan 14 09:57:59 2011 -0800 dateUnrestricted should be grey not hidden, when file is already ripened. diff --git src/hg/lib/fileUi.c src/hg/lib/fileUi.c index dfae66a..f5b00d4 100644 --- src/hg/lib/fileUi.c +++ src/hg/lib/fileUi.c @@ -493,32 +493,33 @@ // Each of the pulled out mdb vars if (sortOrder) { for(ix=0;ixcount;ix++) { if (sameString("fileSize",sortOrder->column[ix])) { char niceNumber[128]; sprintWithGreekByte(niceNumber, sizeof(niceNumber), oneFile->fileSize); field = oneFile->sortFields[sortOrder->order[ix] - 1]; printf("%s",field,niceNumber); } else { field = oneFile->sortFields[sortOrder->order[ix] - 1]; - if (sameString("dateUnrestricted",sortOrder->column[ix]) && dateIsOld(field,"%F")) - field = NULL; + if (sameString("dateUnrestricted",sortOrder->column[ix]) && field && dateIsOld(field,"%F")) + printf("%s",field); + else printf("%s",field?field:"  "); if (!sameString("fileType",sortOrder->column[ix])) mdbObjRemoveVars(oneFile->mdb,sortOrder->column[ix]); // Remove this from mdb now so that it isn't displayed in "extras' } } } #ifndef INCLUDE_FILENAMES else #endif///ndef INCLUDE_FILENAMES { // fileName printf("%s",oneFile->fileName); //// FIXME: " The "..." encapsulation could be rebuilt so it could be called here //printf(" ...", // oneFile->mdb->obj,oneFile->mdb->obj); //printf("",oneFile->mdb->obj); @@ -686,59 +687,68 @@ columnCount++; #endif///defn INCLUDE_FILENAMES printf("Additional Details\n"); columnCount++; printf("\n"); // Now the files... printf("\n"); for(oneFile = fileList;oneFile!= NULL;oneFile=oneFile->next) { char *field = NULL; printf(""); // TODO: BUILD IN THE CLASSES TO ALLOW FILTERBOXES TO WORK!!! // Download button - printf(""); + printf(""); field = mdbObjFindValue(oneFile->mdb,"composite"); assert(field != NULL); printf("", hDownloadsServer(),db,ENCODE_DCC_DOWNLOADS, field?field:"  ", oneFile->fileName, oneFile->fileName); printf(""); printf(""); +//#define SHOW_FOLDER_FRO_COMPOSITE_DOWNLOADS +#ifdef SHOW_FOLDER_FRO_COMPOSITE_DOWNLOADS field = mdbObjFindValue(oneFile->mdb,"composite"); if (field) { // TODO Look up trackDb.fileSortOrder. If found, then offer "folder" icon with link to page + // Instead, always offer hgFileUi link and have hgFileUi figure out what to do + printf("  ", db,field,field); } +#endif///def SHOW_FOLDER_FRO_COMPOSITE_DOWNLOADS puts(""); // Each of the pulled out mdb vars for(onePair=varValPairs; onePair != NULL; onePair=onePair->next) { field = mdbObjFindValue(oneFile->mdb,onePair->name); printf("%s",field?field:"  "); mdbObjRemoveVars(oneFile->mdb,onePair->name); // Remove this from mdb now so that it isn't displayed in "extras' } char niceNumber[128]; sprintWithGreekByte(niceNumber, sizeof(niceNumber), oneFile->fileSize); printf("%s",niceNumber); printf("%s",oneFile->fileType?oneFile->fileType:"  "); field = mdbObjFindValue(oneFile->mdb,"dateSubmitted"); printf("%s",field?field:"  "); field = mdbObjFindValue(oneFile->mdb,"dateUnrestricted"); - printf("%s",field?dateIsOld(field,"%F")?"  ":field:"  "); + //printf("%s",field?dateIsOld(field,"%F")?"  ":field:"  "); + if(field) + printf("%s",dateIsOld(field,"%F")?" style='color: #BBBBBB;'":"",field); + else + printf("  "); #ifdef INCLUDE_FILENAMES printf("%s",oneFile->fileName); #endif///def INCLUDE_FILENAMES // Extras grant=Bernstein; lab=Broad; dataType=ChipSeq; setType=exp; control=std; mdbObjRemoveVars(oneFile->mdb,"dateSubmitted dateUnrestricted fileName fileIndex composite project dccInternalNotes"); // Remove this from mdb now so that it isn't displayed in "extras' mdbObjReorderVars(oneFile->mdb,"grant lab dataType cell treatment antibody protocol replicate view",FALSE); // Bring to front mdbObjReorderVars(oneFile->mdb,"subId submittedDataVersion dateResubmitted dataVersion setType inputType controlId tableName",TRUE); // Send to back field = mdbObjVarValPairsAsLine(oneFile->mdb,TRUE); printf("%s",field?field:"  "); printf("\n"); } printf("\n");