|
|
|
@@ -1,12 +1,10 @@ |
|
|
|
package models |
|
|
|
|
|
|
|
import ( |
|
|
|
"code.gitea.io/gitea/modules/log" |
|
|
|
"code.gitea.io/gitea/modules/timeutil" |
|
|
|
"errors" |
|
|
|
"fmt" |
|
|
|
"sort" |
|
|
|
"strconv" |
|
|
|
"xorm.io/builder" |
|
|
|
) |
|
|
|
|
|
|
|
@@ -195,7 +193,7 @@ func SearchDatasetByCondition(opts *SearchDatasetOptions, cond builder.Cond) (Da |
|
|
|
datasets := make(DatasetList, 0, opts.PageSize) |
|
|
|
selectColumnsSql := "distinct dataset.id,dataset.title, dataset.status, dataset.category, dataset.description, dataset.download_times, dataset.license, dataset.task, dataset.release_id, dataset.user_id, dataset.repo_id, dataset.created_unix,dataset.updated_unix,dataset.num_stars" |
|
|
|
|
|
|
|
count, err := sess.Select("distinct dataset.id").Join("INNER", "repository", "repository.id = dataset.repo_id"). |
|
|
|
count, err := sess.Distinct("dataset.id").Join("INNER", "repository", "repository.id = dataset.repo_id"). |
|
|
|
Join("INNER", "attachment", "attachment.dataset_id=dataset.id"). |
|
|
|
Where(cond).Count(new(Dataset)) |
|
|
|
|
|
|
|
@@ -217,7 +215,6 @@ func SearchDatasetByCondition(opts *SearchDatasetOptions, cond builder.Cond) (Da |
|
|
|
if err = datasets.loadAttributes(sess); err != nil { |
|
|
|
return nil, 0, fmt.Errorf("LoadAttributes: %v", err) |
|
|
|
} |
|
|
|
log.Warn("datasetcout:" + strconv.FormatInt(count, 10)) |
|
|
|
|
|
|
|
return datasets, count, nil |
|
|
|
} |
|
|
|
|