6c224db38fb1c11535e1da9c7eaae6655268f96d tdreszer Fri Sep 16 14:52:19 2011 -0700 Should have been 'revoked', not 'rejected'. diff --git src/hg/lib/fileUi.c src/hg/lib/fileUi.c index b57cc50..952608e 100644 --- src/hg/lib/fileUi.c +++ src/hg/lib/fileUi.c @@ -862,31 +862,31 @@ // Get an mdbObj list of all that belong to this track and have a fileName char buf[256]; safef(buf,sizeof(buf),"%s=%s %s=?",MDB_VAR_COMPOSITE,tdb->track,MDB_VAR_FILENAME); struct mdbByVar *mdbVars = mdbByVarsLineParse(buf); struct mdbObj *mdbList = mdbObjsQueryByVars(conn,mdbTable,mdbVars); // Now get Indexes But be sure not to duplicate entries in the list!!! safef(buf,sizeof(buf),"%s=%s %s= %s!=",MDB_VAR_COMPOSITE,tdb->track,MDB_VAR_FILEINDEX,MDB_VAR_FILENAME); mdbVars = mdbByVarsLineParse(buf); mdbList = slCat(mdbList, mdbObjsQueryByVars(conn,mdbTable,mdbVars)); mdbObjRemoveHiddenVars(mdbList); hFreeConn(&conn); if (mdbList) { - (void)mdbObjsFilter(&mdbList,"objStatus","rejected",TRUE); + (void)mdbObjsFilter(&mdbList,"objStatus","revoked",TRUE); (void)mdbObjsFilter(&mdbList,"objStatus","replaced",TRUE); } if (slCount(mdbList) == 0) { warn("No files specified in metadata for: %s\n%s",tdb->track,tdb->longLabel); return; } // Verify file existance and make fileList of those found struct fileDb *fileList = NULL; // Will contain found files int fileCount = filesFindInDir(db, &mdbList, &fileList, NULL, 0, NULL); assert(fileCount == slCount(fileList)); @@ -935,31 +935,31 @@ //mdbObjsFree(&mdbList); } int fileSearchResults(char *db, struct sqlConnection *conn, struct slPair *varValPairs, char *fileType) // Prints list of files in downloads directories matching mdb search terms. Returns count { struct sqlConnection *connLocal = conn; if (conn == NULL) connLocal = hAllocConn(db); struct mdbObj *mdbList = mdbObjRepeatedSearch(connLocal,varValPairs,FALSE,TRUE); if (conn == NULL) hFreeConn(&connLocal); if (mdbList) { - (void)mdbObjsFilter(&mdbList,"objStatus","rejected",TRUE); + (void)mdbObjsFilter(&mdbList,"objStatus","revoked",TRUE); (void)mdbObjsFilter(&mdbList,"objStatus","replaced",TRUE); } if (slCount(mdbList) == 0) { printf("<DIV id='filesFound'><BR>No files found.<BR></DIV><BR>\n"); return 0; } // Now sort mdbObjs so that composites will stay together and lookup of files will be most efficient mdbObjsSortOnVars(&mdbList, MDB_VAR_COMPOSITE); mdbObjRemoveHiddenVars(mdbList); #define FOUND_FILE_LIMIT 1000 struct fileDb *fileList = NULL; // Will contain found files