improve zpm-contents performance

diff --git a/zpm-contents b/zpm-contents
index ff607fbb0b24726e84767aa7d461f347f92bdd4a..ea9e3cdd134a7b84a233ff3d61c05b1916339c13 100755 (executable)
--- a/zpm-contents
+++ b/zpm-contents
@@ -67,6 +67,7 @@ cols=${cols%,}
 
 {
        printf '.separator " "\n'
+#      printf '.echo on\n'
        printf 'select %s\n' "$cols"
 
        if [ $pkgonly -eq 0 ]; then
@@ -82,7 +83,14 @@ cols=${cols%,}
                fi
                printf "else path end as path\n"
        fi
-       printf 'from packagefiles_status PF left join elflibraries EL on EL.file = PF.hash\nwhere true\n'
+       printf "from packagefiles_pkgid PF\n"
+       if [ $showsoname -eq 1 ]; then
+               printf "left join elflibraries EL on EL.file = PF.hash\n"
+       fi
+       if [ -n "$status" ]; then
+               printf "join packages P on P.package = PF.package and P.version = PF.version and P.release = PF.release\n"
+       fi
+       printf "where true\n"
        if [ -n "$globlist" ]; then
                printf "and (%s)\n" "$globlist"
        fi
@@ -94,9 +102,9 @@ cols=${cols%,}
                exclude) printf "and configuration = 0\n" ;;
        esac
        if [ -n "$status" ]; then
-               printf "and status = '%s'\n" "$status"
+               printf "and P.status = '%s'\n" "$status"
        fi
-       printf 'order by pkgid,path\n'
+       printf 'order by package,version collate vercmp, release, path\n'
        printf ';\n'
 } | zpm shell $pkgfile
 #} | cat